Skip to content

Commit 3792f06

Browse files
author
kijai
committed
Added shaders for URP and changed default materials to use them
Created Shader graphs to replace the shaders not working in URP, main purpose is compatibility in AltSpaceVR -environment.
1 parent a001606 commit 3792f06

File tree

102 files changed

+31230
-445
lines changed

Some content is hidden

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

102 files changed

+31230
-445
lines changed

UnitySDK/.vsconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.ManagedGame"
5+
]
6+
}

UnitySDK/Assets/AltspaceUploader.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitySDK/Assets/AltspaceUploader/Temp.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

UnitySDK/Assets/Editor/DummyVERSION.txt.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitySDK/Assets/Scenes.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 249 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!29 &1
4+
OcclusionCullingSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_OcclusionBakeSettings:
8+
smallestOccluder: 5
9+
smallestHole: 0.25
10+
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
13+
--- !u!104 &2
14+
RenderSettings:
15+
m_ObjectHideFlags: 0
16+
serializedVersion: 9
17+
m_Fog: 0
18+
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
19+
m_FogMode: 3
20+
m_FogDensity: 0.01
21+
m_LinearFogStart: 0
22+
m_LinearFogEnd: 300
23+
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
24+
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
25+
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
26+
m_AmbientIntensity: 1
27+
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
29+
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
30+
m_HaloStrength: 0.5
31+
m_FlareStrength: 1
32+
m_FlareFadeSpeed: 3
33+
m_HaloTexture: {fileID: 0}
34+
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
35+
m_DefaultReflectionMode: 0
36+
m_DefaultReflectionResolution: 128
37+
m_ReflectionBounces: 1
38+
m_ReflectionIntensity: 1
39+
m_CustomReflection: {fileID: 0}
40+
m_Sun: {fileID: 705507994}
41+
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
42+
m_UseRadianceAmbientProbe: 0
43+
--- !u!157 &3
44+
LightmapSettings:
45+
m_ObjectHideFlags: 0
46+
serializedVersion: 12
47+
m_GIWorkflowMode: 1
48+
m_GISettings:
49+
serializedVersion: 2
50+
m_BounceScale: 1
51+
m_IndirectOutputScale: 1
52+
m_AlbedoBoost: 1
53+
m_EnvironmentLightingMode: 0
54+
m_EnableBakedLightmaps: 1
55+
m_EnableRealtimeLightmaps: 0
56+
m_LightmapEditorSettings:
57+
serializedVersion: 12
58+
m_Resolution: 2
59+
m_BakeResolution: 40
60+
m_AtlasSize: 1024
61+
m_AO: 0
62+
m_AOMaxDistance: 1
63+
m_CompAOExponent: 1
64+
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 0
66+
m_Padding: 2
67+
m_LightmapParameters: {fileID: 0}
68+
m_LightmapsBakeMode: 1
69+
m_TextureCompression: 1
70+
m_FinalGather: 0
71+
m_FinalGatherFiltering: 1
72+
m_FinalGatherRayCount: 256
73+
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 2
75+
m_BakeBackend: 1
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 500
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 2
83+
m_PVRDenoiserTypeDirect: 0
84+
m_PVRDenoiserTypeIndirect: 0
85+
m_PVRDenoiserTypeAO: 0
86+
m_PVRFilterTypeDirect: 0
87+
m_PVRFilterTypeIndirect: 0
88+
m_PVRFilterTypeAO: 0
89+
m_PVREnvironmentMIS: 0
90+
m_PVRCulling: 1
91+
m_PVRFilteringGaussRadiusDirect: 1
92+
m_PVRFilteringGaussRadiusIndirect: 5
93+
m_PVRFilteringGaussRadiusAO: 2
94+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
95+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
96+
m_PVRFilteringAtrousPositionSigmaAO: 1
97+
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
99+
m_LightProbeSampleCountMultiplier: 4
100+
m_LightingDataAsset: {fileID: 0}
101+
m_LightingSettings: {fileID: 0}
102+
--- !u!196 &4
103+
NavMeshSettings:
104+
serializedVersion: 2
105+
m_ObjectHideFlags: 0
106+
m_BuildSettings:
107+
serializedVersion: 2
108+
agentTypeID: 0
109+
agentRadius: 0.5
110+
agentHeight: 2
111+
agentSlope: 45
112+
agentClimb: 0.4
113+
ledgeDropHeight: 0
114+
maxJumpAcrossDistance: 0
115+
minRegionArea: 2
116+
manualCellSize: 0
117+
cellSize: 0.16666667
118+
manualTileSize: 0
119+
tileSize: 256
120+
accuratePlacement: 0
121+
maxJobWorkers: 0
122+
preserveTilesOutsideBounds: 0
123+
debug:
124+
m_Flags: 0
125+
m_NavMeshData: {fileID: 0}
126+
--- !u!1 &677856533
127+
GameObject:
128+
m_ObjectHideFlags: 0
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
serializedVersion: 6
133+
m_Component:
134+
- component: {fileID: 677856534}
135+
m_Layer: 14
136+
m_Name: Environment
137+
m_TagString: Untagged
138+
m_Icon: {fileID: 0}
139+
m_NavMeshLayer: 0
140+
m_StaticEditorFlags: 0
141+
m_IsActive: 1
142+
--- !u!4 &677856534
143+
Transform:
144+
m_ObjectHideFlags: 0
145+
m_CorrespondingSourceObject: {fileID: 0}
146+
m_PrefabInstance: {fileID: 0}
147+
m_PrefabAsset: {fileID: 0}
148+
m_GameObject: {fileID: 677856533}
149+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
150+
m_LocalPosition: {x: 0, y: 0, z: 0}
151+
m_LocalScale: {x: 1, y: 1, z: 1}
152+
m_Children:
153+
- {fileID: 705507995}
154+
m_Father: {fileID: 0}
155+
m_RootOrder: 0
156+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
157+
--- !u!1 &705507993
158+
GameObject:
159+
m_ObjectHideFlags: 0
160+
m_CorrespondingSourceObject: {fileID: 0}
161+
m_PrefabInstance: {fileID: 0}
162+
m_PrefabAsset: {fileID: 0}
163+
serializedVersion: 6
164+
m_Component:
165+
- component: {fileID: 705507995}
166+
- component: {fileID: 705507994}
167+
m_Layer: 14
168+
m_Name: Directional Light
169+
m_TagString: Untagged
170+
m_Icon: {fileID: 0}
171+
m_NavMeshLayer: 0
172+
m_StaticEditorFlags: 0
173+
m_IsActive: 1
174+
--- !u!108 &705507994
175+
Light:
176+
m_ObjectHideFlags: 0
177+
m_CorrespondingSourceObject: {fileID: 0}
178+
m_PrefabInstance: {fileID: 0}
179+
m_PrefabAsset: {fileID: 0}
180+
m_GameObject: {fileID: 705507993}
181+
m_Enabled: 1
182+
serializedVersion: 10
183+
m_Type: 1
184+
m_Shape: 0
185+
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
186+
m_Intensity: 1
187+
m_Range: 10
188+
m_SpotAngle: 30
189+
m_InnerSpotAngle: 21.80208
190+
m_CookieSize: 10
191+
m_Shadows:
192+
m_Type: 2
193+
m_Resolution: -1
194+
m_CustomResolution: -1
195+
m_Strength: 1
196+
m_Bias: 0.05
197+
m_NormalBias: 0.4
198+
m_NearPlane: 0.2
199+
m_CullingMatrixOverride:
200+
e00: 1
201+
e01: 0
202+
e02: 0
203+
e03: 0
204+
e10: 0
205+
e11: 1
206+
e12: 0
207+
e13: 0
208+
e20: 0
209+
e21: 0
210+
e22: 1
211+
e23: 0
212+
e30: 0
213+
e31: 0
214+
e32: 0
215+
e33: 1
216+
m_UseCullingMatrixOverride: 0
217+
m_Cookie: {fileID: 0}
218+
m_DrawHalo: 0
219+
m_Flare: {fileID: 0}
220+
m_RenderMode: 0
221+
m_CullingMask:
222+
serializedVersion: 2
223+
m_Bits: 4294967295
224+
m_RenderingLayerMask: 1
225+
m_Lightmapping: 1
226+
m_LightShadowCasterMode: 0
227+
m_AreaSize: {x: 1, y: 1}
228+
m_BounceIntensity: 1
229+
m_ColorTemperature: 6570
230+
m_UseColorTemperature: 0
231+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
232+
m_UseBoundingSphereOverride: 0
233+
m_UseViewFrustumForShadowCasterCull: 1
234+
m_ShadowRadius: 0
235+
m_ShadowAngle: 0
236+
--- !u!4 &705507995
237+
Transform:
238+
m_ObjectHideFlags: 0
239+
m_CorrespondingSourceObject: {fileID: 0}
240+
m_PrefabInstance: {fileID: 0}
241+
m_PrefabAsset: {fileID: 0}
242+
m_GameObject: {fileID: 705507993}
243+
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
244+
m_LocalPosition: {x: 0, y: 3, z: 0}
245+
m_LocalScale: {x: 1, y: 1, z: 1}
246+
m_Children: []
247+
m_Father: {fileID: 677856534}
248+
m_RootOrder: 0
249+
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}

UnitySDK/Assets/Scenes/SampleScene.unity.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitySDK/Assets/TiltBrush/Assets/Brushes/Basic/CoarseBristles/CoarseBristles_15.mat

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: CoarseBristles_15
10-
m_Shader: {fileID: 4800000, guid: 76dc2f7fe973ede4bbbedfc291269c84, type: 3}
11+
m_Shader: {fileID: -6465566751694194690, guid: 52520deaab18aa84986e102463fa4a65, type: 3}
1112
m_ShaderKeywords: _EMISSION
12-
m_LightmapFlags: 1
13+
m_LightmapFlags: 2
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
1516
m_CustomRenderQueue: -1
@@ -18,6 +19,14 @@ Material:
1819
m_SavedProperties:
1920
serializedVersion: 3
2021
m_TexEnvs:
22+
- Texture2D_1:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- Texture2D_7cc1569ec5ab475ebef759959328b817:
27+
m_Texture: {fileID: 2800000, guid: 511e136566fbfc241b63ff2207dbcafe, type: 3}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2130
- _BumpMap:
2231
m_Texture: {fileID: 0}
2332
m_Scale: {x: 1, y: 1}
@@ -54,7 +63,20 @@ Material:
5463
m_Texture: {fileID: 0}
5564
m_Scale: {x: 1, y: 1}
5665
m_Offset: {x: 0, y: 0}
66+
- unity_Lightmaps:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
70+
- unity_LightmapsInd:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- unity_ShadowMasks:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
5778
m_Floats:
79+
- Vector1_7683367b3a324d5397407217add23608: 1
5880
- _BumpScale: 1
5981
- _Cutoff: 0.25
6082
- _DetailNormalMapScale: 1
@@ -72,5 +94,7 @@ Material:
7294
- _UVSec: 0
7395
- _ZWrite: 1
7496
m_Colors:
97+
- Color_2ca6888f8e6b4df4838a0a56190ca5f2: {r: 1, g: 1, b: 1, a: 0}
7598
- _Color: {r: 1, g: 1, b: 1, a: 1}
7699
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
100+
m_BuildTextureStacks: []

0 commit comments

Comments
 (0)