Skip to content

Commit 9b2594e

Browse files
Lewin WieneceLewin Wienece
Lewin Wienece
authored and
Lewin Wienece
committed
URP Support
+ URP version + Shaders for SkinnedMesh and default materials. + All others can be created in the Shader Graph. The nodes can simply be transferred for this purpose. closes mkrebser#14
1 parent 28b05a8 commit 9b2594e

File tree

70 files changed

+88340
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+88340
-460
lines changed

‎Assets/Demos.meta

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Demos/animtexturedemo/male_sprite.mat

+57-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,40 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7363897080892485132
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 0
316
--- !u!21 &2100000
417
Material:
5-
serializedVersion: 6
18+
serializedVersion: 8
619
m_ObjectHideFlags: 0
720
m_CorrespondingSourceObject: {fileID: 0}
821
m_PrefabInstance: {fileID: 0}
922
m_PrefabAsset: {fileID: 0}
1023
m_Name: male_sprite
11-
m_Shader: {fileID: 4800000, guid: c1eb8e85fa54ed549834254db217ef23, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON
24+
m_Shader: {fileID: -6465566751694194690, guid: 678d3526ada82654d850a9bb71b0e495,
25+
type: 3}
26+
m_Parent: {fileID: 0}
27+
m_ModifiedSerializedProperties: 0
28+
m_ValidKeywords:
29+
- PROCEDURAL_INSTANCING_ON
30+
m_InvalidKeywords: []
1331
m_LightmapFlags: 4
1432
m_EnableInstancingVariants: 1
1533
m_DoubleSidedGI: 0
1634
m_CustomRenderQueue: -1
1735
stringTagMap: {}
1836
disabledShaderPasses: []
37+
m_LockedProperties:
1938
m_SavedProperties:
2039
serializedVersion: 3
2140
m_TexEnvs:
@@ -43,6 +62,10 @@ Material:
4362
m_Texture: {fileID: 2800000, guid: 445014c91a8b0014996b51c3e03de0d9, type: 3}
4463
m_Scale: {x: 1, y: 1}
4564
m_Offset: {x: 0, y: 0}
65+
- _MainText:
66+
m_Texture: {fileID: 2800000, guid: 445014c91a8b0014996b51c3e03de0d9, type: 3}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
4669
- _MetallicGlossMap:
4770
m_Texture: {fileID: 0}
4871
m_Scale: {x: 1, y: 1}
@@ -55,8 +78,23 @@ Material:
5578
m_Texture: {fileID: 0}
5679
m_Scale: {x: 1, y: 1}
5780
m_Offset: {x: 0, y: 0}
81+
- unity_Lightmaps:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
- unity_LightmapsInd:
86+
m_Texture: {fileID: 0}
87+
m_Scale: {x: 1, y: 1}
88+
m_Offset: {x: 0, y: 0}
89+
- unity_ShadowMasks:
90+
m_Texture: {fileID: 0}
91+
m_Scale: {x: 1, y: 1}
92+
m_Offset: {x: 0, y: 0}
5893
m_Ints: []
5994
m_Floats:
95+
- PROCEDURAL_INSTANCING: 1
96+
- _BUILTIN_QueueControl: -1
97+
- _BUILTIN_QueueOffset: 0
6098
- _BumpScale: 1
6199
- _Cutoff: 0.624
62100
- _DetailNormalMapScale: 1
@@ -69,6 +107,9 @@ Material:
69107
- _Mode: 1
70108
- _OcclusionStrength: 1
71109
- _Parallax: 0.02
110+
- _QueueControl: 0
111+
- _QueueOffset: 0
112+
- _Smoothness: 0
72113
- _SmoothnessTextureChannel: 0
73114
- _SpecularHighlights: 1
74115
- _SrcBlend: 1
@@ -78,3 +119,16 @@ Material:
78119
- _Color: {r: 1, g: 1, b: 1, a: 1}
79120
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
80121
m_BuildTextureStacks: []
122+
--- !u!114 &4475421663983395782
123+
MonoBehaviour:
124+
m_ObjectHideFlags: 11
125+
m_CorrespondingSourceObject: {fileID: 0}
126+
m_PrefabInstance: {fileID: 0}
127+
m_PrefabAsset: {fileID: 0}
128+
m_GameObject: {fileID: 0}
129+
m_Enabled: 1
130+
m_EditorHideFlags: 0
131+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
132+
m_Name:
133+
m_EditorClassIdentifier:
134+
version: 7

‎Assets/Demos/billboarddemo/Explosion.mat

+57-3
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,26 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Explosion
11-
m_Shader: {fileID: 4800000, guid: 8dbde9d1c50cd2a45a46e0b66a4b080f, type: 3}
12-
m_ShaderKeywords:
11+
m_Shader: {fileID: -6465566751694194690, guid: 678d3526ada82654d850a9bb71b0e495,
12+
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
15+
m_ValidKeywords:
16+
- PROCEDURAL_INSTANCING_ON
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 4
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0
1621
m_CustomRenderQueue: -1
1722
stringTagMap: {}
1823
disabledShaderPasses: []
24+
m_LockedProperties:
1925
m_SavedProperties:
2026
serializedVersion: 3
2127
m_TexEnvs:
@@ -43,6 +49,10 @@ Material:
4349
m_Texture: {fileID: 2800000, guid: 28c24382bf069a942915f8a3f2adbbe8, type: 3}
4450
m_Scale: {x: 1, y: 1}
4551
m_Offset: {x: 0, y: 0}
52+
- _MainText:
53+
m_Texture: {fileID: 2800000, guid: 28c24382bf069a942915f8a3f2adbbe8, type: 3}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
4656
- _MetallicGlossMap:
4757
m_Texture: {fileID: 0}
4858
m_Scale: {x: 1, y: 1}
@@ -55,8 +65,23 @@ Material:
5565
m_Texture: {fileID: 0}
5666
m_Scale: {x: 1, y: 1}
5767
m_Offset: {x: 0, y: 0}
68+
- unity_Lightmaps:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_LightmapsInd:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_ShadowMasks:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
5880
m_Ints: []
5981
m_Floats:
82+
- PROCEDURAL_INSTANCING: 1
83+
- _BUILTIN_QueueControl: -1
84+
- _BUILTIN_QueueOffset: 0
6085
- _BumpScale: 1
6186
- _Cutoff: 0.5
6287
- _DetailNormalMapScale: 1
@@ -69,6 +94,9 @@ Material:
6994
- _Mode: 0
7095
- _OcclusionStrength: 1
7196
- _Parallax: 0.02
97+
- _QueueControl: 0
98+
- _QueueOffset: 0
99+
- _Smoothness: 0
72100
- _SmoothnessTextureChannel: 0
73101
- _SpecularHighlights: 1
74102
- _SrcBlend: 1
@@ -78,3 +106,29 @@ Material:
78106
- _Color: {r: 1, g: 1, b: 1, a: 1}
79107
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
80108
m_BuildTextureStacks: []
109+
--- !u!114 &5326828559936825535
110+
MonoBehaviour:
111+
m_ObjectHideFlags: 11
112+
m_CorrespondingSourceObject: {fileID: 0}
113+
m_PrefabInstance: {fileID: 0}
114+
m_PrefabAsset: {fileID: 0}
115+
m_GameObject: {fileID: 0}
116+
m_Enabled: 1
117+
m_EditorHideFlags: 0
118+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
119+
m_Name:
120+
m_EditorClassIdentifier:
121+
version: 7
122+
--- !u!114 &7425205755044027098
123+
MonoBehaviour:
124+
m_ObjectHideFlags: 11
125+
m_CorrespondingSourceObject: {fileID: 0}
126+
m_PrefabInstance: {fileID: 0}
127+
m_PrefabAsset: {fileID: 0}
128+
m_GameObject: {fileID: 0}
129+
m_Enabled: 1
130+
m_EditorHideFlags: 0
131+
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
132+
m_Name:
133+
m_EditorClassIdentifier:
134+
version: 0

‎Assets/Demos/crowddemo/crowddemo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void Start()
5353
for (int j = 0; j < N; j++)
5454
{
5555
var mesh = characters[Random.Range(0, characters.Count)];
56-
var anim = mesh.anim.namedAnimations["walk"];
56+
var anim = mesh.anim.namedAnimations["Mutant Walking"];
5757
instances[i, j] = new SkinnedMesh(mesh, this.m);
5858
instances[i, j].mesh.position = new Vector3(i, 0, j);
5959
instances[i, j].SetRadius(1.75f); // set large enough radius so model doesnt get culled to early

‎Assets/Demos/crowddemo/crowddemo.unity

+58-11
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -104,7 +104,7 @@ NavMeshSettings:
104104
serializedVersion: 2
105105
m_ObjectHideFlags: 0
106106
m_BuildSettings:
107-
serializedVersion: 2
107+
serializedVersion: 3
108108
agentTypeID: 0
109109
agentRadius: 0.5
110110
agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
117117
cellSize: 0.16666667
118118
manualTileSize: 0
119119
tileSize: 256
120-
accuratePlacement: 0
120+
buildHeightMesh: 0
121121
maxJobWorkers: 0
122122
preserveTilesOutsideBounds: 0
123123
debug:
@@ -139,6 +139,7 @@ GameObject:
139139
m_Component:
140140
- component: {fileID: 769542207}
141141
- component: {fileID: 769542206}
142+
- component: {fileID: 769542208}
142143
m_Layer: 0
143144
m_Name: Directional Light
144145
m_TagString: Untagged
@@ -215,18 +216,43 @@ Transform:
215216
m_PrefabInstance: {fileID: 0}
216217
m_PrefabAsset: {fileID: 0}
217218
m_GameObject: {fileID: 769542205}
219+
serializedVersion: 2
218220
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
219221
m_LocalPosition: {x: 0, y: 3, z: 0}
220222
m_LocalScale: {x: 1, y: 1, z: 1}
223+
m_ConstrainProportionsScale: 0
221224
m_Children: []
222225
m_Father: {fileID: 0}
223-
m_RootOrder: 1
224226
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
227+
--- !u!114 &769542208
228+
MonoBehaviour:
229+
m_ObjectHideFlags: 0
230+
m_CorrespondingSourceObject: {fileID: 0}
231+
m_PrefabInstance: {fileID: 0}
232+
m_PrefabAsset: {fileID: 0}
233+
m_GameObject: {fileID: 769542205}
234+
m_Enabled: 1
235+
m_EditorHideFlags: 0
236+
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
237+
m_Name:
238+
m_EditorClassIdentifier:
239+
m_Version: 3
240+
m_UsePipelineSettings: 1
241+
m_AdditionalLightsShadowResolutionTier: 2
242+
m_LightLayerMask: 1
243+
m_RenderingLayers: 1
244+
m_CustomShadowLayers: 0
245+
m_ShadowLayerMask: 1
246+
m_ShadowRenderingLayers: 1
247+
m_LightCookieSize: {x: 1, y: 1}
248+
m_LightCookieOffset: {x: 0, y: 0}
249+
m_SoftShadowQuality: 0
225250
--- !u!1001 &859989811
226251
PrefabInstance:
227252
m_ObjectHideFlags: 0
228253
serializedVersion: 2
229254
m_Modification:
255+
serializedVersion: 3
230256
m_TransformParent: {fileID: 0}
231257
m_Modifications:
232258
- target: {fileID: -8679921383154817045, guid: 854d98bccbe31984ab739fbc4e46a8df,
@@ -305,6 +331,9 @@ PrefabInstance:
305331
value: FloorPrototype64x01x64
306332
objectReference: {fileID: 0}
307333
m_RemovedComponents: []
334+
m_RemovedGameObjects: []
335+
m_AddedGameObjects: []
336+
m_AddedComponents: []
308337
m_SourcePrefab: {fileID: 100100000, guid: 854d98bccbe31984ab739fbc4e46a8df, type: 3}
309338
--- !u!1 &1302094765
310339
GameObject:
@@ -347,9 +376,17 @@ Camera:
347376
m_projectionMatrixMode: 1
348377
m_GateFitMode: 2
349378
m_FOVAxisMode: 0
379+
m_Iso: 200
380+
m_ShutterSpeed: 0.005
381+
m_Aperture: 16
382+
m_FocusDistance: 10
383+
m_FocalLength: 50
384+
m_BladeCount: 5
385+
m_Curvature: {x: 2, y: 11}
386+
m_BarrelClipping: 0.25
387+
m_Anamorphism: 0
350388
m_SensorSize: {x: 36, y: 24}
351389
m_LensShift: {x: 0, y: 0}
352-
m_FocalLength: 50
353390
m_NormalizedViewPortRect:
354391
serializedVersion: 2
355392
x: 0
@@ -383,12 +420,13 @@ Transform:
383420
m_PrefabInstance: {fileID: 0}
384421
m_PrefabAsset: {fileID: 0}
385422
m_GameObject: {fileID: 1302094765}
423+
serializedVersion: 2
386424
m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
387425
m_LocalPosition: {x: -5, y: 10, z: -5}
388426
m_LocalScale: {x: 1, y: 1, z: 1}
427+
m_ConstrainProportionsScale: 0
389428
m_Children: []
390429
m_Father: {fileID: 0}
391-
m_RootOrder: 0
392430
m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
393431
--- !u!114 &1302094769
394432
MonoBehaviour:
@@ -447,14 +485,14 @@ MonoBehaviour:
447485
m_EditorClassIdentifier:
448486
FrustumCullingCamera: {fileID: 1302094767}
449487
characters:
450-
- {fileID: 3156401128397487343, guid: 33a9547627899f24885a53dee4a37665, type: 3}
451-
- {fileID: 5040013727053430140, guid: bd56382a2d9437e4b8e61ca0f145692e, type: 3}
452-
- {fileID: 7175407052540882227, guid: 4c5b3c071117fdf44ac6be5383a44c92, type: 3}
453488
- {fileID: 6650295392987941564, guid: be2ea105ca16ffb41a68f369c0ea22de, type: 3}
454489
- {fileID: 3957205821883281005, guid: 4f16ecdb472ee6844bad6ac5bdaf8d24, type: 3}
455-
- {fileID: 7501894207592630563, guid: e13cdc0f3fcfc4d4e96798834d9d1220, type: 3}
456490
- {fileID: 4974531472248908850, guid: 38565903daf355249800ed6cc400c6b7, type: 3}
491+
- {fileID: 7175407052540882227, guid: 4c5b3c071117fdf44ac6be5383a44c92, type: 3}
492+
- {fileID: 7501894207592630563, guid: e13cdc0f3fcfc4d4e96798834d9d1220, type: 3}
493+
- {fileID: 3156401128397487343, guid: d0de9e6fd0be3314386391658abc962a, type: 3}
457494
- {fileID: 8250799916029583549, guid: 390599f86d74c41418ad9b57476aebb9, type: 3}
495+
- {fileID: 5040013727053430140, guid: bd56382a2d9437e4b8e61ca0f145692e, type: 3}
458496
floor: {fileID: 17339628}
459497
GlobalTimeSpeed: 1
460498
--- !u!4 &1747037101
@@ -464,10 +502,19 @@ Transform:
464502
m_PrefabInstance: {fileID: 0}
465503
m_PrefabAsset: {fileID: 0}
466504
m_GameObject: {fileID: 1747037099}
505+
serializedVersion: 2
467506
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
468507
m_LocalPosition: {x: -5.010328, y: 7.195896, z: 20.829222}
469508
m_LocalScale: {x: 1, y: 1, z: 1}
509+
m_ConstrainProportionsScale: 0
470510
m_Children: []
471511
m_Father: {fileID: 0}
472-
m_RootOrder: 2
473512
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
513+
--- !u!1660057539 &9223372036854775807
514+
SceneRoots:
515+
m_ObjectHideFlags: 0
516+
m_Roots:
517+
- {fileID: 1302094768}
518+
- {fileID: 769542207}
519+
- {fileID: 1747037101}
520+
- {fileID: 859989811}

0 commit comments

Comments
 (0)