Skip to content

Commit bbfea93

Browse files
committed
Convert fog scene to GLSL
1 parent 8f76532 commit bbfea93

15 files changed

+1863
-9
lines changed

Assets/ARRealismDemos/Common/Prefabs/Help Balloon Prefab.prefab

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ MonoBehaviour:
5454
m_GameObject: {fileID: 149502823605771983}
5555
m_Enabled: 1
5656
m_EditorHideFlags: 0
57-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
57+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
5858
m_Name:
5959
m_EditorClassIdentifier:
6060
m_Material: {fileID: 0}
6161
m_Color: {r: 0.101960786, g: 0.4509804, b: 0.9098039, a: 1}
6262
m_RaycastTarget: 1
63+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
64+
m_Maskable: 1
6365
m_OnCullStateChanged:
6466
m_PersistentCalls:
6567
m_Calls: []
@@ -72,6 +74,7 @@ MonoBehaviour:
7274
m_FillClockwise: 1
7375
m_FillOrigin: 0
7476
m_UseSpriteMesh: 0
77+
m_PixelsPerUnitMultiplier: 1
7578
--- !u!1 &149502824436600457
7679
GameObject:
7780
m_ObjectHideFlags: 0
@@ -143,7 +146,7 @@ MonoBehaviour:
143146
m_GameObject: {fileID: 149502824436600457}
144147
m_Enabled: 1
145148
m_EditorHideFlags: 0
146-
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
149+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
147150
m_Name:
148151
m_EditorClassIdentifier:
149152
m_UiScaleMode: 1
@@ -156,6 +159,7 @@ MonoBehaviour:
156159
m_FallbackScreenDPI: 96
157160
m_DefaultSpriteDPI: 96
158161
m_DynamicPixelsPerUnit: 1
162+
m_PresetInfoIsWorld: 0
159163
--- !u!114 &149502824436600436
160164
MonoBehaviour:
161165
m_ObjectHideFlags: 0
@@ -165,7 +169,7 @@ MonoBehaviour:
165169
m_GameObject: {fileID: 149502824436600457}
166170
m_Enabled: 1
167171
m_EditorHideFlags: 0
168-
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
172+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
169173
m_Name:
170174
m_EditorClassIdentifier:
171175
m_IgnoreReversedGraphics: 1
@@ -255,12 +259,14 @@ MonoBehaviour:
255259
m_GameObject: {fileID: 1012392674360085338}
256260
m_Enabled: 1
257261
m_EditorHideFlags: 0
258-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
262+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
259263
m_Name:
260264
m_EditorClassIdentifier:
261265
m_Material: {fileID: 0}
262266
m_Color: {r: 0.101960786, g: 0.4509804, b: 0.9098039, a: 1}
263267
m_RaycastTarget: 1
268+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
269+
m_Maskable: 1
264270
m_OnCullStateChanged:
265271
m_PersistentCalls:
266272
m_Calls: []
@@ -273,6 +279,7 @@ MonoBehaviour:
273279
m_FillClockwise: 1
274280
m_FillOrigin: 0
275281
m_UseSpriteMesh: 0
282+
m_PixelsPerUnitMultiplier: 1
276283
--- !u!1 &1150226634560663655
277284
GameObject:
278285
m_ObjectHideFlags: 0
@@ -367,12 +374,14 @@ MonoBehaviour:
367374
m_GameObject: {fileID: 1401262256703014703}
368375
m_Enabled: 1
369376
m_EditorHideFlags: 0
370-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
377+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
371378
m_Name:
372379
m_EditorClassIdentifier:
373380
m_Material: {fileID: 0}
374381
m_Color: {r: 0.101960786, g: 0.4509804, b: 0.9098039, a: 1}
375382
m_RaycastTarget: 1
383+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
384+
m_Maskable: 1
376385
m_OnCullStateChanged:
377386
m_PersistentCalls:
378387
m_Calls: []
@@ -385,6 +394,7 @@ MonoBehaviour:
385394
m_FillClockwise: 1
386395
m_FillOrigin: 0
387396
m_UseSpriteMesh: 0
397+
m_PixelsPerUnitMultiplier: 1
388398
--- !u!1 &8972591262785579898
389399
GameObject:
390400
m_ObjectHideFlags: 0
@@ -439,12 +449,14 @@ MonoBehaviour:
439449
m_GameObject: {fileID: 8972591262785579898}
440450
m_Enabled: 1
441451
m_EditorHideFlags: 0
442-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
452+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
443453
m_Name:
444454
m_EditorClassIdentifier:
445455
m_Material: {fileID: 0}
446456
m_Color: {r: 0.101960786, g: 0.4509804, b: 0.9098039, a: 1}
447457
m_RaycastTarget: 1
458+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
459+
m_Maskable: 1
448460
m_OnCullStateChanged:
449461
m_PersistentCalls:
450462
m_Calls: []
@@ -457,6 +469,7 @@ MonoBehaviour:
457469
m_FillClockwise: 1
458470
m_FillOrigin: 0
459471
m_UseSpriteMesh: 0
472+
m_PixelsPerUnitMultiplier: 1
460473
--- !u!1 &8992942066872914571
461474
GameObject:
462475
m_ObjectHideFlags: 0
@@ -511,17 +524,19 @@ MonoBehaviour:
511524
m_GameObject: {fileID: 8992942066872914571}
512525
m_Enabled: 1
513526
m_EditorHideFlags: 0
514-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
527+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
515528
m_Name:
516529
m_EditorClassIdentifier:
517530
m_Material: {fileID: 0}
518531
m_Color: {r: 1, g: 1, b: 1, a: 1}
519532
m_RaycastTarget: 1
533+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
534+
m_Maskable: 1
520535
m_OnCullStateChanged:
521536
m_PersistentCalls:
522537
m_Calls: []
523538
m_FontData:
524-
m_Font: {fileID: 12800000, guid: f66655b38428d40769e9e41ee237cbdc, type: 3}
539+
m_Font: {fileID: 12800000, guid: 50a50753ba3b4487e93b75cafa4a9518, type: 3}
525540
m_FontSize: 14
526541
m_FontStyle: 0
527542
m_BestFit: 1
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: FogSceneButton
11+
m_Shader: {fileID: 4800000, guid: 5f79292c781b5469a9105e8cbac16efa, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _AlphaTex:
23+
m_Texture: {fileID: 2800000, guid: f03a0cfd36f8e4f6082873fcab9b5bc8, type: 3}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _BumpMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 2800000, guid: 68f5403e6b5ab4126b9b5ef93893f652, type: 3}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _OcclusionMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _ParallaxMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
m_Floats:
63+
- _BumpScale: 1
64+
- _Cutoff: 0.5
65+
- _DetailNormalMapScale: 1
66+
- _DstBlend: 0
67+
- _GlossMapScale: 1
68+
- _Glossiness: 0.5
69+
- _GlossyReflections: 1
70+
- _Metallic: 0
71+
- _Mode: 0
72+
- _OcclusionStrength: 1
73+
- _Parallax: 0.02
74+
- _SmoothnessTextureChannel: 0
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _UVSec: 0
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _Color: {r: 1, g: 1, b: 1, a: 1}
81+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
m_BuildTextureStacks: []

Assets/ARRealismDemos/DemoCarousel/Materials/FogSceneButton.mat.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.

0 commit comments

Comments
 (0)