From 2af3fc7199e0c6405b032cb801aa1f772efbeff6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 29 Sep 2019 10:10:04 -0400 Subject: Removed extra camera --- .idea/.idea.Project SimLife/.idea/indexLayout.xml | 3 +- Assets/Scenes/Simulation/SimulationScene.unity | 145 +-------------------- .../Simulation/SimulationScene/NavMesh.asset | Bin 45552 -> 45552 bytes 3 files changed, 2 insertions(+), 146 deletions(-) diff --git a/.idea/.idea.Project SimLife/.idea/indexLayout.xml b/.idea/.idea.Project SimLife/.idea/indexLayout.xml index b902834..4360f37 100644 --- a/.idea/.idea.Project SimLife/.idea/indexLayout.xml +++ b/.idea/.idea.Project SimLife/.idea/indexLayout.xml @@ -3,7 +3,6 @@ - Assets Library/PackageCache/com.unity.ads@2.0.8 Library/PackageCache/com.unity.analytics@3.3.2 Library/PackageCache/com.unity.collab-proxy@1.2.16 @@ -13,6 +12,7 @@ Library/PackageCache/com.unity.ide.vscode@1.0.7 Library/PackageCache/com.unity.multiplayer-hlapi@1.0.2 Library/PackageCache/com.unity.purchasing@2.0.6 + Library/PackageCache/com.unity.terrain-tools@2.0.2-preview Library/PackageCache/com.unity.test-framework@1.0.13 Library/PackageCache/com.unity.textmeshpro@2.0.1 Library/PackageCache/com.unity.xr.legacyinputhelpers@2.0.2 @@ -25,7 +25,6 @@ .idea .vscode Library - Temp obj diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity index 06d6de4..6f2d8dc 100644 --- a/Assets/Scenes/Simulation/SimulationScene.unity +++ b/Assets/Scenes/Simulation/SimulationScene.unity @@ -1036,7 +1036,6 @@ Transform: m_LocalPosition: {x: -750.44525, y: -294.66302, z: 402.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 546904938} - {fileID: 1912464012} m_Father: {fileID: 1297664489} m_RootOrder: 1 @@ -1362,148 +1361,6 @@ MonoBehaviour: rotateLeftKey: 122 useMouseRotation: 1 mouseRotationKey: 324 ---- !u!1 &546904937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 546904938} - - component: {fileID: 546904940} - - component: {fileID: 546904939} - - component: {fileID: 546904941} - m_Layer: 9 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &546904938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 546904937} - m_LocalRotation: {x: 0.28050485, y: -0, z: -0, w: 0.95985264} - m_LocalPosition: {x: -9.409973, y: 14.899994, z: -19.100006} - m_LocalScale: {x: 6.4204, y: 1, z: 6.1789} - m_Children: [] - m_Father: {fileID: 430691590} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 32.581, y: 0, z: 0} ---- !u!81 &546904939 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 546904937} - m_Enabled: 1 ---- !u!20 &546904940 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 546904937} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &546904941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 546904937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28ef8c68bade09b41aca258d42a632f2, type: 3} - m_Name: - m_EditorClassIdentifier: - lastTab: 2 - movementSettingsFoldout: 0 - zoomingSettingsFoldout: 0 - rotationSettingsFoldout: 0 - heightSettingsFoldout: 0 - mapLimitSettingsFoldout: 0 - targetingSettingsFoldout: 0 - inputSettingsFoldout: 0 - useFixedUpdate: 0 - keyboardMovementSpeed: 5 - screenEdgeMovementSpeed: 3 - followingSpeed: 5 - rotationSped: 3 - panningSpeed: 10 - mouseRotationSpeed: 10 - autoHeight: 1 - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - maxHeight: 10 - minHeight: 15 - heightDampening: 5 - keyboardZoomingSensitivity: 2 - scrollWheelZoomingSensitivity: 25 - limitMap: 1 - limitX: 50 - limitY: 50 - targetFollow: {fileID: 0} - targetOffset: {x: 0, y: 0, z: 0} - useScreenEdgeInput: 1 - screenEdgeBorder: 25 - useKeyboardInput: 1 - horizontalAxis: Horizontal - verticalAxis: Vertical - usePanning: 1 - panningKey: 325 - useKeyboardZooming: 1 - zoomInKey: 91 - zoomOutKey: 93 - useScrollwheelZooming: 1 - zoomingAxis: Mouse ScrollWheel - useKeyboardRotation: 1 - rotateRightKey: 120 - rotateLeftKey: 122 - useMouseRotation: 1 - mouseRotationKey: 324 --- !u!1 &607681915 GameObject: m_ObjectHideFlags: 0 @@ -4014,7 +3871,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 430691590} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1912464013 MeshRenderer: diff --git a/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset b/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset index a443f48..4d8a823 100644 Binary files a/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset and b/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset differ -- cgit v1.2.3