Skip to content

Commit 63a7b8f

Browse files
committed
Minor cleanup on scenes + remove debug statements
1 parent 7ed269a commit 63a7b8f

File tree

8 files changed

+200
-88
lines changed

8 files changed

+200
-88
lines changed

sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity

Lines changed: 2 additions & 2 deletions
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.44657826, g: 0.49641263, b: 0.57481676, a: 1}
41+
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
@@ -1449,7 +1449,7 @@ MonoBehaviour:
14491449
UserName:
14501450
elevationLayerType: 0
14511451
requiredOptions:
1452-
baseMaterial: {fileID: 0}
1452+
baseMaterial: {fileID: 2100000, guid: b9f23e9bce724fa4daac57ecded470b8, type: 2}
14531453
addCollider: 0
14541454
exaggerationFactor: 1
14551455
modificationOptions:

sdkproject/Assets/Mapbox/Examples/Resources/RoadMaterial.mat

Lines changed: 32 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -10,118 +10,67 @@ Material:
1010
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
1111
m_ShaderKeywords: _EMISSION
1212
m_LightmapFlags: 1
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
1315
m_CustomRenderQueue: -1
1416
stringTagMap: {}
17+
disabledShaderPasses: []
1518
m_SavedProperties:
16-
serializedVersion: 2
19+
serializedVersion: 3
1720
m_TexEnvs:
18-
- first:
19-
name: _BumpMap
20-
second:
21+
- _BumpMap:
2122
m_Texture: {fileID: 0}
2223
m_Scale: {x: 1, y: 1}
2324
m_Offset: {x: 0, y: 0}
24-
- first:
25-
name: _DetailAlbedoMap
26-
second:
25+
- _DetailAlbedoMap:
2726
m_Texture: {fileID: 0}
2827
m_Scale: {x: 1, y: 1}
2928
m_Offset: {x: 0, y: 0}
30-
- first:
31-
name: _DetailMask
32-
second:
29+
- _DetailMask:
3330
m_Texture: {fileID: 0}
3431
m_Scale: {x: 1, y: 1}
3532
m_Offset: {x: 0, y: 0}
36-
- first:
37-
name: _DetailNormalMap
38-
second:
33+
- _DetailNormalMap:
3934
m_Texture: {fileID: 0}
4035
m_Scale: {x: 1, y: 1}
4136
m_Offset: {x: 0, y: 0}
42-
- first:
43-
name: _EmissionMap
44-
second:
37+
- _EmissionMap:
4538
m_Texture: {fileID: 0}
4639
m_Scale: {x: 1, y: 1}
4740
m_Offset: {x: 0, y: 0}
48-
- first:
49-
name: _MainTex
50-
second:
51-
m_Texture: {fileID: 0}
41+
- _MainTex:
42+
m_Texture: {fileID: 2800000, guid: 80a9f5451284e4a468bf97d34a9e8dd9, type: 3}
5243
m_Scale: {x: 1, y: 1}
5344
m_Offset: {x: 0, y: 0}
54-
- first:
55-
name: _MetallicGlossMap
56-
second:
45+
- _MetallicGlossMap:
5746
m_Texture: {fileID: 0}
5847
m_Scale: {x: 1, y: 1}
5948
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _OcclusionMap
62-
second:
49+
- _OcclusionMap:
6350
m_Texture: {fileID: 0}
6451
m_Scale: {x: 1, y: 1}
6552
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _ParallaxMap
68-
second:
53+
- _ParallaxMap:
6954
m_Texture: {fileID: 0}
7055
m_Scale: {x: 1, y: 1}
7156
m_Offset: {x: 0, y: 0}
7257
m_Floats:
73-
- first:
74-
name: _BumpScale
75-
second: 1
76-
- first:
77-
name: _Cutoff
78-
second: 0.5
79-
- first:
80-
name: _DetailNormalMapScale
81-
second: 1
82-
- first:
83-
name: _DstBlend
84-
second: 0
85-
- first:
86-
name: _GlossMapScale
87-
second: 1
88-
- first:
89-
name: _Glossiness
90-
second: 0
91-
- first:
92-
name: _GlossyReflections
93-
second: 1
94-
- first:
95-
name: _Metallic
96-
second: 0
97-
- first:
98-
name: _Mode
99-
second: 0
100-
- first:
101-
name: _OcclusionStrength
102-
second: 1
103-
- first:
104-
name: _Parallax
105-
second: 0.02
106-
- first:
107-
name: _SmoothnessTextureChannel
108-
second: 0
109-
- first:
110-
name: _SpecularHighlights
111-
second: 1
112-
- first:
113-
name: _SrcBlend
114-
second: 1
115-
- first:
116-
name: _UVSec
117-
second: 0
118-
- first:
119-
name: _ZWrite
120-
second: 1
58+
- _BumpScale: 1
59+
- _Cutoff: 0.5
60+
- _DetailNormalMapScale: 1
61+
- _DstBlend: 0
62+
- _GlossMapScale: 1
63+
- _Glossiness: 0
64+
- _GlossyReflections: 1
65+
- _Metallic: 0
66+
- _Mode: 0
67+
- _OcclusionStrength: 1
68+
- _Parallax: 0.02
69+
- _SmoothnessTextureChannel: 0
70+
- _SpecularHighlights: 1
71+
- _SrcBlend: 1
72+
- _UVSec: 0
73+
- _ZWrite: 1
12174
m_Colors:
122-
- first:
123-
name: _Color
124-
second: {r: 0.6102941, g: 0.6102941, b: 0.6102941, a: 1}
125-
- first:
126-
name: _EmissionColor
127-
second: {r: 0, g: 0, b: 0, a: 1}
75+
- _Color: {r: 0.6102941, g: 0.6102941, b: 0.6102941, a: 1}
76+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: RoadSideMaterial
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
12+
m_LightmapFlags: 4
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
15+
m_CustomRenderQueue: -1
16+
stringTagMap: {}
17+
disabledShaderPasses: []
18+
m_SavedProperties:
19+
serializedVersion: 3
20+
m_TexEnvs:
21+
- _BumpMap:
22+
m_Texture: {fileID: 0}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
- _DetailAlbedoMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailMask:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailNormalMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _EmissionMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _MainTex:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MetallicGlossMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _OcclusionMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _ParallaxMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
m_Floats:
58+
- _BumpScale: 1
59+
- _Cutoff: 0.5
60+
- _DetailNormalMapScale: 1
61+
- _DstBlend: 0
62+
- _GlossMapScale: 1
63+
- _Glossiness: 0.5
64+
- _GlossyReflections: 1
65+
- _Metallic: 0
66+
- _Mode: 0
67+
- _OcclusionStrength: 1
68+
- _Parallax: 0.02
69+
- _SmoothnessTextureChannel: 0
70+
- _SpecularHighlights: 1
71+
- _SrcBlend: 1
72+
- _UVSec: 0
73+
- _ZWrite: 1
74+
m_Colors:
75+
- _Color: {r: 0.3137255, g: 0.32941177, b: 0.32941177, a: 1}
76+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat.meta

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

sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg.meta

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

sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ MonoBehaviour:
218218
filters: []
219219
combinerType: 0
220220
extrusionOptions:
221-
_selectedLayerName:
221+
_selectedLayerName: road
222222
extrusionType: 5
223223
extrusionGeometryType: 0
224224
propertyName: height
@@ -235,7 +235,7 @@ MonoBehaviour:
235235
- Materials:
236236
- {fileID: 2100000, guid: 8e8afdee0a225a84282f04f2fb89b8b6, type: 2}
237237
- Materials:
238-
- {fileID: 2100000, guid: 8e8afdee0a225a84282f04f2fb89b8b6, type: 2}
238+
- {fileID: 2100000, guid: b00db1eb69ea64eb4adb30b2c0fb01cb, type: 2}
239239
atlasInfo: {fileID: 0}
240240
colorPalette: {fileID: 0}
241241
honorBuildingIdSetting: 1

sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ private bool ProcessFeature(int index, UnityTile tile, VectorLayerVisualizerProp
410410
//skip existing features, only works on tilesets with unique ids
411411
if (ShouldSkipProcessingFeatureWithId(feature.Data.Id, tile, layerProperties))
412412
{
413-
Debug.Log("Here");
414413
return false;
415414
}
416415
//feature not skipped. Add to pool only if features are in preprocess stage.

0 commit comments

Comments
 (0)