Skip to content

Commit 12c6ead

Browse files
AdamMitchell-msAdamMitchell-ms
authored
Fix a bunch of the tests (#455)
* Set the MainCamera tag on the camera in several scenes so that Camera.main is non-null. * Fix path to asset generator.
1 parent 75a40d9 commit 12c6ead

10 files changed

+150
-112
lines changed

‎UnityGLTF/Assets/UnityGLTF/Examples/BoomBoxTestScene.unity

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.1829417, g: 0.2262355, b: 0.29291272, a: 1}
41+
m_IndirectSpecularColor: {r: 0.45030367, g: 0.49799693, b: 0.56280375, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 9
45+
serializedVersion: 11
4646
m_GIWorkflowMode: 0
4747
m_GISettings:
4848
serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
5454
m_EnableBakedLightmaps: 1
5555
m_EnableRealtimeLightmaps: 1
5656
m_LightmapEditorSettings:
57-
serializedVersion: 8
57+
serializedVersion: 9
5858
m_Resolution: 2
5959
m_BakeResolution: 40
6060
m_TextureWidth: 1024
@@ -88,8 +88,9 @@ LightmapSettings:
8888
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8989
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9090
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
9192
m_LightingDataAsset: {fileID: 0}
92-
m_ShadowMaskMode: 2
93+
m_UseShadowmask: 1
9394
--- !u!196 &4
9495
NavMeshSettings:
9596
serializedVersion: 2
@@ -109,6 +110,8 @@ NavMeshSettings:
109110
manualTileSize: 0
110111
tileSize: 256
111112
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
112115
m_NavMeshData: {fileID: 0}
113116
--- !u!1 &358204559
114117
GameObject:
@@ -190,7 +193,7 @@ GameObject:
190193
- component: {fileID: 683563954}
191194
m_Layer: 0
192195
m_Name: MainCamera
193-
m_TagString: Untagged
196+
m_TagString: MainCamera
194197
m_Icon: {fileID: 0}
195198
m_NavMeshLayer: 0
196199
m_StaticEditorFlags: 0
@@ -206,10 +209,11 @@ MonoBehaviour:
206209
m_Script: {fileID: 11500000, guid: 70ff706d2c89cc247a850af95597fcbb, type: 3}
207210
m_Name:
208211
m_EditorClassIdentifier:
209-
target: {fileID: 1835019345}
212+
targetPosition: {x: 0, y: 0, z: 0}
210213
distance: 5
211214
xSpeed: 120
212215
ySpeed: 120
216+
zoomSpeed: 0.8
213217
yMinLimit: -20
214218
yMaxLimit: 80
215219
distanceMin: 0.5
@@ -270,11 +274,11 @@ Camera:
270274
m_TargetEye: 3
271275
m_HDR: 0
272276
m_AllowMSAA: 1
277+
m_AllowDynamicResolution: 0
273278
m_ForceIntoRT: 0
274279
m_OcclusionCulling: 1
275280
m_StereoConvergence: 10
276281
m_StereoSeparation: 0.022
277-
m_StereoMirrorMode: 0
278282
--- !u!4 &683563959
279283
Transform:
280284
m_ObjectHideFlags: 0
@@ -390,11 +394,6 @@ Prefab:
390394
m_RemovedComponents: []
391395
m_ParentPrefab: {fileID: 100100000, guid: 5255039e40b37b14fbcc0b72a30fc62e, type: 2}
392396
m_IsPrefabParent: 0
393-
--- !u!4 &1835019345 stripped
394-
Transform:
395-
m_PrefabParentObject: {fileID: 4000011406631220, guid: 5255039e40b37b14fbcc0b72a30fc62e,
396-
type: 2}
397-
m_PrefabInternal: {fileID: 1835019344}
398397
--- !u!1 &1904599574
399398
GameObject:
400399
m_ObjectHideFlags: 0
@@ -422,6 +421,7 @@ MeshRenderer:
422421
m_Enabled: 1
423422
m_CastShadows: 1
424423
m_ReceiveShadows: 1
424+
m_DynamicOccludee: 1
425425
m_MotionVectors: 1
426426
m_LightProbeUsage: 1
427427
m_ReflectionProbeUsage: 1
@@ -437,6 +437,7 @@ MeshRenderer:
437437
m_PreserveUVs: 1
438438
m_IgnoreNormalsForChartDetection: 0
439439
m_ImportantGI: 0
440+
m_StitchLightmapSeams: 0
440441
m_SelectedEditorRenderState: 3
441442
m_MinimumChartSize: 4
442443
m_AutoUVMaxDistance: 0.5
@@ -454,9 +455,9 @@ MeshCollider:
454455
m_Material: {fileID: 0}
455456
m_IsTrigger: 0
456457
m_Enabled: 1
457-
serializedVersion: 2
458+
serializedVersion: 3
458459
m_Convex: 0
459-
m_InflateMesh: 0
460+
m_CookingOptions: 14
460461
m_SkinWidth: 0.01
461462
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
462463
--- !u!33 &1904599577

‎UnityGLTF/Assets/UnityGLTF/Examples/LanternSpecGlossTestScene.unity

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,11 @@ MonoBehaviour:
144144
m_Script: {fileID: 11500000, guid: 70ff706d2c89cc247a850af95597fcbb, type: 3}
145145
m_Name:
146146
m_EditorClassIdentifier:
147-
target: {fileID: 0}
147+
targetPosition: {x: 0, y: 2.5, z: 0}
148148
distance: 5
149149
xSpeed: 120
150150
ySpeed: 120
151+
zoomSpeed: 0.8
151152
yMinLimit: -20
152153
yMaxLimit: 80
153154
distanceMin: 0.5
@@ -220,7 +221,7 @@ Transform:
220221
m_PrefabInternal: {fileID: 0}
221222
m_GameObject: {fileID: 328853373}
222223
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
223-
m_LocalPosition: {x: 0, y: 1.2, z: -2.23}
224+
m_LocalPosition: {x: 0, y: 2.5, z: -5}
224225
m_LocalScale: {x: 1, y: 1, z: 1}
225226
m_Children: []
226227
m_Father: {fileID: 0}

‎UnityGLTF/Assets/UnityGLTF/Examples/LanternTestScene.unity

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.1829417, g: 0.2262355, b: 0.29291272, a: 1}
41+
m_IndirectSpecularColor: {r: 0.45030367, g: 0.49799693, b: 0.56280375, a: 1}
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 9
45+
serializedVersion: 11
4646
m_GIWorkflowMode: 0
4747
m_GISettings:
4848
serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
5454
m_EnableBakedLightmaps: 1
5555
m_EnableRealtimeLightmaps: 1
5656
m_LightmapEditorSettings:
57-
serializedVersion: 8
57+
serializedVersion: 9
5858
m_Resolution: 2
5959
m_BakeResolution: 40
6060
m_TextureWidth: 1024
@@ -88,8 +88,9 @@ LightmapSettings:
8888
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8989
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9090
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
9192
m_LightingDataAsset: {fileID: 0}
92-
m_ShadowMaskMode: 2
93+
m_UseShadowmask: 1
9394
--- !u!196 &4
9495
NavMeshSettings:
9596
serializedVersion: 2
@@ -109,6 +110,8 @@ NavMeshSettings:
109110
manualTileSize: 0
110111
tileSize: 256
111112
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
112115
m_NavMeshData: {fileID: 0}
113116
--- !u!1001 &10002063
114117
Prefab:
@@ -184,11 +187,6 @@ Prefab:
184187
m_RemovedComponents: []
185188
m_ParentPrefab: {fileID: 100100000, guid: 5255039e40b37b14fbcc0b72a30fc62e, type: 2}
186189
m_IsPrefabParent: 0
187-
--- !u!4 &10002064 stripped
188-
Transform:
189-
m_PrefabParentObject: {fileID: 4000011406631220, guid: 5255039e40b37b14fbcc0b72a30fc62e,
190-
type: 2}
191-
m_PrefabInternal: {fileID: 10002063}
192190
--- !u!1 &328853373
193191
GameObject:
194192
m_ObjectHideFlags: 0
@@ -204,7 +202,7 @@ GameObject:
204202
- component: {fileID: 328853374}
205203
m_Layer: 0
206204
m_Name: Camera
207-
m_TagString: Untagged
205+
m_TagString: MainCamera
208206
m_Icon: {fileID: 0}
209207
m_NavMeshLayer: 0
210208
m_StaticEditorFlags: 0
@@ -220,10 +218,11 @@ MonoBehaviour:
220218
m_Script: {fileID: 11500000, guid: 70ff706d2c89cc247a850af95597fcbb, type: 3}
221219
m_Name:
222220
m_EditorClassIdentifier:
223-
target: {fileID: 10002064}
221+
targetPosition: {x: 0, y: 0, z: 0}
224222
distance: 5
225223
xSpeed: 120
226224
ySpeed: 120
225+
zoomSpeed: 0.8
227226
yMinLimit: -20
228227
yMaxLimit: 80
229228
distanceMin: 0.5
@@ -284,11 +283,11 @@ Camera:
284283
m_TargetEye: 3
285284
m_HDR: 0
286285
m_AllowMSAA: 1
286+
m_AllowDynamicResolution: 0
287287
m_ForceIntoRT: 0
288288
m_OcclusionCulling: 1
289289
m_StereoConvergence: 10
290290
m_StereoSeparation: 0.022
291-
m_StereoMirrorMode: 0
292291
--- !u!4 &328853379
293292
Transform:
294293
m_ObjectHideFlags: 0
@@ -434,6 +433,7 @@ MeshRenderer:
434433
m_Enabled: 1
435434
m_CastShadows: 1
436435
m_ReceiveShadows: 1
436+
m_DynamicOccludee: 1
437437
m_MotionVectors: 1
438438
m_LightProbeUsage: 1
439439
m_ReflectionProbeUsage: 1
@@ -449,6 +449,7 @@ MeshRenderer:
449449
m_PreserveUVs: 1
450450
m_IgnoreNormalsForChartDetection: 0
451451
m_ImportantGI: 0
452+
m_StitchLightmapSeams: 0
452453
m_SelectedEditorRenderState: 3
453454
m_MinimumChartSize: 4
454455
m_AutoUVMaxDistance: 0.5
@@ -466,9 +467,9 @@ MeshCollider:
466467
m_Material: {fileID: 0}
467468
m_IsTrigger: 0
468469
m_Enabled: 1
469-
serializedVersion: 2
470+
serializedVersion: 3
470471
m_Convex: 0
471-
m_InflateMesh: 0
472+
m_CookingOptions: 14
472473
m_SkinWidth: 0.01
473474
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
474475
--- !u!33 &1904599577

‎UnityGLTF/Assets/UnityGLTF/Examples/MultiSceneTest.unity

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,18 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80-
m_PVRFiltering: 0
80+
m_PVRFilterTypeDirect: 0
81+
m_PVRFilterTypeIndirect: 0
82+
m_PVRFilterTypeAO: 0
8183
m_PVRFilteringMode: 1
8284
m_PVRCulling: 1
8385
m_PVRFilteringGaussRadiusDirect: 1
8486
m_PVRFilteringGaussRadiusIndirect: 5
8587
m_PVRFilteringGaussRadiusAO: 2
86-
m_PVRFilteringAtrousColorSigma: 1
87-
m_PVRFilteringAtrousNormalSigma: 1
88-
m_PVRFilteringAtrousPositionSigma: 1
88+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
89+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
90+
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
8992
m_LightingDataAsset: {fileID: 0}
9093
m_UseShadowmask: 1
9194
--- !u!196 &4
@@ -107,6 +110,8 @@ NavMeshSettings:
107110
manualTileSize: 0
108111
tileSize: 256
109112
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
110115
m_NavMeshData: {fileID: 0}
111116
--- !u!1 &750635813
112117
GameObject:
@@ -135,6 +140,7 @@ MeshRenderer:
135140
m_Enabled: 1
136141
m_CastShadows: 1
137142
m_ReceiveShadows: 1
143+
m_DynamicOccludee: 1
138144
m_MotionVectors: 1
139145
m_LightProbeUsage: 1
140146
m_ReflectionProbeUsage: 1
@@ -150,6 +156,7 @@ MeshRenderer:
150156
m_PreserveUVs: 1
151157
m_IgnoreNormalsForChartDetection: 0
152158
m_ImportantGI: 0
159+
m_StitchLightmapSeams: 0
153160
m_SelectedEditorRenderState: 3
154161
m_MinimumChartSize: 4
155162
m_AutoUVMaxDistance: 0.5
@@ -167,9 +174,9 @@ MeshCollider:
167174
m_Material: {fileID: 0}
168175
m_IsTrigger: 0
169176
m_Enabled: 1
170-
serializedVersion: 2
177+
serializedVersion: 3
171178
m_Convex: 0
172-
m_InflateMesh: 0
179+
m_CookingOptions: 14
173180
m_SkinWidth: 0.01
174181
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
175182
--- !u!33 &750635816
@@ -207,7 +214,7 @@ GameObject:
207214
- component: {fileID: 758867166}
208215
m_Layer: 0
209216
m_Name: Camera
210-
m_TagString: Untagged
217+
m_TagString: MainCamera
211218
m_Icon: {fileID: 0}
212219
m_NavMeshLayer: 0
213220
m_StaticEditorFlags: 0
@@ -223,10 +230,11 @@ MonoBehaviour:
223230
m_Script: {fileID: 11500000, guid: 70ff706d2c89cc247a850af95597fcbb, type: 3}
224231
m_Name:
225232
m_EditorClassIdentifier:
226-
target: {fileID: 1647343058}
233+
targetPosition: {x: 0, y: 0, z: 0}
227234
distance: 5
228235
xSpeed: 120
229236
ySpeed: 120
237+
zoomSpeed: 0.8
230238
yMinLimit: -20
231239
yMaxLimit: 80
232240
distanceMin: 0.5
@@ -287,11 +295,11 @@ Camera:
287295
m_TargetEye: 3
288296
m_HDR: 0
289297
m_AllowMSAA: 1
298+
m_AllowDynamicResolution: 0
290299
m_ForceIntoRT: 0
291300
m_OcclusionCulling: 1
292301
m_StereoConvergence: 10
293302
m_StereoSeparation: 0.022
294-
m_StereoMirrorMode: 0
295303
--- !u!4 &758867171
296304
Transform:
297305
m_ObjectHideFlags: 0
@@ -399,7 +407,6 @@ MonoBehaviour:
399407
m_EditorClassIdentifier:
400408
SceneIndex: 0
401409
Url: http://localhost:8080/MultiScene/glTF/MultiScene.gltf
402-
GLTFStandardShader: {fileID: 4800000, guid: a5732b1b5b2e36d47a3da75e187eba06, type: 3}
403410
--- !u!4 &1647343058
404411
Transform:
405412
m_ObjectHideFlags: 0

‎UnityGLTF/Assets/UnityGLTF/Examples/SciFiHelmetTestScene.unity

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,6 @@ Prefab:
187187
m_RemovedComponents: []
188188
m_ParentPrefab: {fileID: 100100000, guid: 5255039e40b37b14fbcc0b72a30fc62e, type: 2}
189189
m_IsPrefabParent: 0
190-
--- !u!4 &10002064 stripped
191-
Transform:
192-
m_PrefabParentObject: {fileID: 4000011406631220, guid: 5255039e40b37b14fbcc0b72a30fc62e,
193-
type: 2}
194-
m_PrefabInternal: {fileID: 10002063}
195190
--- !u!1 &328853373
196191
GameObject:
197192
m_ObjectHideFlags: 0
@@ -207,7 +202,7 @@ GameObject:
207202
- component: {fileID: 328853374}
208203
m_Layer: 0
209204
m_Name: Camera
210-
m_TagString: Untagged
205+
m_TagString: MainCamera
211206
m_Icon: {fileID: 0}
212207
m_NavMeshLayer: 0
213208
m_StaticEditorFlags: 0
@@ -223,10 +218,11 @@ MonoBehaviour:
223218
m_Script: {fileID: 11500000, guid: 70ff706d2c89cc247a850af95597fcbb, type: 3}
224219
m_Name:
225220
m_EditorClassIdentifier:
226-
target: {fileID: 10002064}
221+
targetPosition: {x: 0, y: 0, z: 0}
227222
distance: 5
228223
xSpeed: 120
229224
ySpeed: 120
225+
zoomSpeed: 0.8
230226
yMinLimit: -20
231227
yMaxLimit: 80
232228
distanceMin: 0.5

0 commit comments

Comments
 (0)