Start of integrating models and pre-rendered backgrounds

This commit is contained in:
2022-08-13 21:28:44 -07:00
parent 1071a1347e
commit 19f6555ce9
26 changed files with 756 additions and 167 deletions

View File

@@ -353,7 +353,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a72a7a4e27e427e45b1902f730108ab3, type: 2}
- {fileID: 2100000, guid: 4074315a7fa348e41bbea6b15305eca1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -391,14 +391,98 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293610880}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 19.2, y: 10.8, z: 1}
m_LocalPosition: {x: 0, y: 1000, z: 500}
m_LocalScale: {x: 16, y: 9, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 963194228}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &360355835
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1853094968961178454, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_ClearFlags
value: 3
objectReference: {fileID: 0}
- target: {fileID: -1853094968961178454, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 8
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
propertyPath: m_Name
value: WALKABLE SCENE1 CAMERA
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
--- !u!1 &360355836 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6499529959314878404, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
m_PrefabInstance: {fileID: 360355835}
m_PrefabAsset: {fileID: 0}
--- !u!64 &360355837
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 360355836}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4104380202958562290, guid: 21f660bb7fa5007419943359cec01a75, type: 3}
--- !u!1 &610846507
GameObject:
m_ObjectHideFlags: 0
@@ -439,7 +523,7 @@ Animator:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 610846507}
m_Enabled: 1
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8d2f6406cd97d604a8a3fca1f0e86380, type: 2}
m_CullingMode: 0
@@ -459,13 +543,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 610846507}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: -5000, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 21670248}
- {fileID: 1709914077}
- {fileID: 2138461639}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -556,7 +639,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalPosition: {x: -748.4, y: 3, z: -432.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -612,12 +695,12 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 1
far clip plane: 500
near clip plane: 0.3
far clip plane: 50
field of view: 60
orthographic: 1
orthographic size: 5.383329
m_Depth: -1
orthographic size: 4.469144
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
@@ -640,8 +723,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.002, y: 0, z: -470.9}
m_LocalScale: {x: 0.0010416666, y: 0.0018518517, z: 1}
m_LocalPosition: {x: 0.002, y: -0.005, z: -49.81}
m_LocalScale: {x: 0, y: 0, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 293610884}
@@ -675,9 +758,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1709914076}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 50, z: 498}
m_LocalScale: {x: 100, y: 100, z: 50}
m_LocalRotation: {x: -0.0059860516, y: -0.8737048, z: 0.0107558, w: -0.4863009}
m_LocalPosition: {x: -112.73, y: 5010.06, z: 53.96}
m_LocalScale: {x: 10, y: 5, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 610846510}
@@ -778,102 +861,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e6d9a426a8d6e57489b2cd44e9ee79e1, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneIndex: 1
--- !u!1 &2138461638
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2138461639}
- component: {fileID: 2138461642}
- component: {fileID: 2138461641}
- component: {fileID: 2138461640}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2138461639
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2138461638}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 1, z: 100}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 610846510}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &2138461640
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2138461638}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2138461641
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2138461638}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2138461642
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2138461638}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
sceneIndex: 3