Skip to content

Commit 9692a1d

Browse files
Pushing updated scripts for Camera movement and such.
VR cam disabled for now (re-enables itself though)
1 parent 6625744 commit 9692a1d

File tree

7 files changed

+365
-160
lines changed

7 files changed

+365
-160
lines changed

Box_wall_test.unity

Lines changed: 154 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -4375,6 +4375,35 @@ Transform:
43754375
m_Father: {fileID: 1359187707}
43764376
m_RootOrder: 0
43774377
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4378+
--- !u!1 &545377385
4379+
GameObject:
4380+
m_ObjectHideFlags: 0
4381+
m_PrefabParentObject: {fileID: 0}
4382+
m_PrefabInternal: {fileID: 0}
4383+
serializedVersion: 5
4384+
m_Component:
4385+
- component: {fileID: 545377386}
4386+
m_Layer: 0
4387+
m_Name: CameraPivot
4388+
m_TagString: Untagged
4389+
m_Icon: {fileID: 0}
4390+
m_NavMeshLayer: 0
4391+
m_StaticEditorFlags: 0
4392+
m_IsActive: 1
4393+
--- !u!4 &545377386
4394+
Transform:
4395+
m_ObjectHideFlags: 0
4396+
m_PrefabParentObject: {fileID: 0}
4397+
m_PrefabInternal: {fileID: 0}
4398+
m_GameObject: {fileID: 545377385}
4399+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4400+
m_LocalPosition: {x: 0, y: 0, z: 0}
4401+
m_LocalScale: {x: 1, y: 1, z: 1}
4402+
m_Children:
4403+
- {fileID: 1687868593}
4404+
m_Father: {fileID: 0}
4405+
m_RootOrder: 5
4406+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
43784407
--- !u!1 &584445547
43794408
GameObject:
43804409
m_ObjectHideFlags: 0
@@ -4811,127 +4840,6 @@ MonoBehaviour:
48114840
m_Calls: []
48124841
m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0,
48134842
Culture=neutral, PublicKeyToken=null
4814-
--- !u!1 &655673436
4815-
GameObject:
4816-
m_ObjectHideFlags: 0
4817-
m_PrefabParentObject: {fileID: 0}
4818-
m_PrefabInternal: {fileID: 0}
4819-
serializedVersion: 5
4820-
m_Component:
4821-
- component: {fileID: 655673441}
4822-
- component: {fileID: 655673440}
4823-
- component: {fileID: 655673439}
4824-
- component: {fileID: 655673438}
4825-
- component: {fileID: 655673437}
4826-
- component: {fileID: 655673442}
4827-
m_Layer: 0
4828-
m_Name: Touch_Mover
4829-
m_TagString: Untagged
4830-
m_Icon: {fileID: 0}
4831-
m_NavMeshLayer: 0
4832-
m_StaticEditorFlags: 0
4833-
m_IsActive: 1
4834-
--- !u!114 &655673437
4835-
MonoBehaviour:
4836-
m_ObjectHideFlags: 0
4837-
m_PrefabParentObject: {fileID: 0}
4838-
m_PrefabInternal: {fileID: 0}
4839-
m_GameObject: {fileID: 655673436}
4840-
m_Enabled: 0
4841-
m_EditorHideFlags: 0
4842-
m_Script: {fileID: 11500000, guid: 37795b5cce5abcc4893e83f837a3bc9c, type: 3}
4843-
m_Name:
4844-
m_EditorClassIdentifier:
4845-
speed_touch: 0.01
4846-
speed_mouse: 10
4847-
did_feel_hit: 0
4848-
newHit: 0
4849-
touchPosition: {x: 0, y: 0}
4850-
touchDeltaPosition: {x: 0, y: 0}
4851-
currentMousePosition: {x: 0, y: 0}
4852-
lastMousePosition: {x: 0, y: 0}
4853-
mouseDeltaPosition: {x: 0, y: 0}
4854-
--- !u!23 &655673438
4855-
MeshRenderer:
4856-
m_ObjectHideFlags: 0
4857-
m_PrefabParentObject: {fileID: 0}
4858-
m_PrefabInternal: {fileID: 0}
4859-
m_GameObject: {fileID: 655673436}
4860-
m_Enabled: 1
4861-
m_CastShadows: 1
4862-
m_ReceiveShadows: 1
4863-
m_DynamicOccludee: 1
4864-
m_MotionVectors: 1
4865-
m_LightProbeUsage: 1
4866-
m_ReflectionProbeUsage: 1
4867-
m_Materials:
4868-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
4869-
m_StaticBatchInfo:
4870-
firstSubMesh: 0
4871-
subMeshCount: 0
4872-
m_StaticBatchRoot: {fileID: 0}
4873-
m_ProbeAnchor: {fileID: 0}
4874-
m_LightProbeVolumeOverride: {fileID: 0}
4875-
m_ScaleInLightmap: 1
4876-
m_PreserveUVs: 1
4877-
m_IgnoreNormalsForChartDetection: 0
4878-
m_ImportantGI: 0
4879-
m_StitchLightmapSeams: 0
4880-
m_SelectedEditorRenderState: 3
4881-
m_MinimumChartSize: 4
4882-
m_AutoUVMaxDistance: 0.5
4883-
m_AutoUVMaxAngle: 89
4884-
m_LightmapParameters: {fileID: 0}
4885-
m_SortingLayerID: 0
4886-
m_SortingLayer: 0
4887-
m_SortingOrder: 0
4888-
--- !u!135 &655673439
4889-
SphereCollider:
4890-
m_ObjectHideFlags: 0
4891-
m_PrefabParentObject: {fileID: 0}
4892-
m_PrefabInternal: {fileID: 0}
4893-
m_GameObject: {fileID: 655673436}
4894-
m_Material: {fileID: 0}
4895-
m_IsTrigger: 0
4896-
m_Enabled: 1
4897-
serializedVersion: 2
4898-
m_Radius: 0.5
4899-
m_Center: {x: 0, y: 0, z: 0}
4900-
--- !u!33 &655673440
4901-
MeshFilter:
4902-
m_ObjectHideFlags: 0
4903-
m_PrefabParentObject: {fileID: 0}
4904-
m_PrefabInternal: {fileID: 0}
4905-
m_GameObject: {fileID: 655673436}
4906-
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
4907-
--- !u!4 &655673441
4908-
Transform:
4909-
m_ObjectHideFlags: 0
4910-
m_PrefabParentObject: {fileID: 0}
4911-
m_PrefabInternal: {fileID: 0}
4912-
m_GameObject: {fileID: 655673436}
4913-
m_LocalRotation: {x: 0.47771448, y: 0.47771448, z: -0.5213338, w: -0.5213338}
4914-
m_LocalPosition: {x: 1.33, y: 9.899, z: 4.64}
4915-
m_LocalScale: {x: 1, y: 1, z: 1}
4916-
m_Children: []
4917-
m_Father: {fileID: 0}
4918-
m_RootOrder: 4
4919-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4920-
--- !u!114 &655673442
4921-
MonoBehaviour:
4922-
m_ObjectHideFlags: 0
4923-
m_PrefabParentObject: {fileID: 0}
4924-
m_PrefabInternal: {fileID: 0}
4925-
m_GameObject: {fileID: 655673436}
4926-
m_Enabled: 1
4927-
m_EditorHideFlags: 0
4928-
m_Script: {fileID: 11500000, guid: 741bec5477e9f2c40903af34651d072b, type: 3}
4929-
m_Name:
4930-
m_EditorClassIdentifier:
4931-
horizontal_speed: 40
4932-
vertical_speed: 40
4933-
foward_speed: 40
4934-
back_speed: 40
49354843
--- !u!1 &666048874
49364844
GameObject:
49374845
m_ObjectHideFlags: 0
@@ -12499,6 +12407,7 @@ GameObject:
1249912407
- component: {fileID: 1687868592}
1250012408
- component: {fileID: 1687868591}
1250112409
- component: {fileID: 1687868590}
12410+
- component: {fileID: 1687868594}
1250212411
m_Layer: 0
1250312412
m_Name: Camera
1250412413
m_TagString: Untagged
@@ -12561,13 +12470,30 @@ Transform:
1256112470
m_PrefabParentObject: {fileID: 0}
1256212471
m_PrefabInternal: {fileID: 0}
1256312472
m_GameObject: {fileID: 1687868589}
12564-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12565-
m_LocalPosition: {x: 1.0685325, y: 9.76673, z: 5.043692}
12473+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12474+
m_LocalPosition: {x: 0, y: 0, z: -10}
1256612475
m_LocalScale: {x: 1, y: 1, z: 1}
1256712476
m_Children: []
12568-
m_Father: {fileID: 0}
12569-
m_RootOrder: 5
12570-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12477+
m_Father: {fileID: 545377386}
12478+
m_RootOrder: 0
12479+
m_LocalEulerAnglesHint: {x: 0, y: -27.720001, z: 0}
12480+
--- !u!114 &1687868594
12481+
MonoBehaviour:
12482+
m_ObjectHideFlags: 0
12483+
m_PrefabParentObject: {fileID: 0}
12484+
m_PrefabInternal: {fileID: 0}
12485+
m_GameObject: {fileID: 1687868589}
12486+
m_Enabled: 1
12487+
m_EditorHideFlags: 0
12488+
m_Script: {fileID: 11500000, guid: 741bec5477e9f2c40903af34651d072b, type: 3}
12489+
m_Name:
12490+
m_EditorClassIdentifier:
12491+
horizontal_speed: 0.5
12492+
vertical_speed: 0.5
12493+
foward_speed: 0.5
12494+
ScrollSensitvity: 20
12495+
OrbitDampening: 10
12496+
ScrollDampening: 6
1257112497
--- !u!1 &1690278031
1257212498
GameObject:
1257312499
m_ObjectHideFlags: 0
@@ -13840,6 +13766,108 @@ MeshFilter:
1384013766
m_PrefabInternal: {fileID: 0}
1384113767
m_GameObject: {fileID: 1839764172}
1384213768
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
13769+
--- !u!1 &1844216919
13770+
GameObject:
13771+
m_ObjectHideFlags: 0
13772+
m_PrefabParentObject: {fileID: 0}
13773+
m_PrefabInternal: {fileID: 0}
13774+
serializedVersion: 5
13775+
m_Component:
13776+
- component: {fileID: 1844216924}
13777+
- component: {fileID: 1844216923}
13778+
- component: {fileID: 1844216922}
13779+
- component: {fileID: 1844216921}
13780+
- component: {fileID: 1844216920}
13781+
m_Layer: 0
13782+
m_Name: Cube
13783+
m_TagString: Untagged
13784+
m_Icon: {fileID: 0}
13785+
m_NavMeshLayer: 0
13786+
m_StaticEditorFlags: 0
13787+
m_IsActive: 1
13788+
--- !u!114 &1844216920
13789+
MonoBehaviour:
13790+
m_ObjectHideFlags: 0
13791+
m_PrefabParentObject: {fileID: 0}
13792+
m_PrefabInternal: {fileID: 0}
13793+
m_GameObject: {fileID: 1844216919}
13794+
m_Enabled: 0
13795+
m_EditorHideFlags: 0
13796+
m_Script: {fileID: 11500000, guid: 741bec5477e9f2c40903af34651d072b, type: 3}
13797+
m_Name:
13798+
m_EditorClassIdentifier:
13799+
horizontal_speed: 0.5
13800+
vertical_speed: 0.5
13801+
foward_speed: 0.5
13802+
ScrollSensitvity: 2
13803+
OrbitDampening: 10
13804+
ScrollDampening: 6
13805+
--- !u!23 &1844216921
13806+
MeshRenderer:
13807+
m_ObjectHideFlags: 0
13808+
m_PrefabParentObject: {fileID: 0}
13809+
m_PrefabInternal: {fileID: 0}
13810+
m_GameObject: {fileID: 1844216919}
13811+
m_Enabled: 1
13812+
m_CastShadows: 1
13813+
m_ReceiveShadows: 1
13814+
m_DynamicOccludee: 1
13815+
m_MotionVectors: 1
13816+
m_LightProbeUsage: 1
13817+
m_ReflectionProbeUsage: 1
13818+
m_Materials:
13819+
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
13820+
m_StaticBatchInfo:
13821+
firstSubMesh: 0
13822+
subMeshCount: 0
13823+
m_StaticBatchRoot: {fileID: 0}
13824+
m_ProbeAnchor: {fileID: 0}
13825+
m_LightProbeVolumeOverride: {fileID: 0}
13826+
m_ScaleInLightmap: 1
13827+
m_PreserveUVs: 1
13828+
m_IgnoreNormalsForChartDetection: 0
13829+
m_ImportantGI: 0
13830+
m_StitchLightmapSeams: 0
13831+
m_SelectedEditorRenderState: 3
13832+
m_MinimumChartSize: 4
13833+
m_AutoUVMaxDistance: 0.5
13834+
m_AutoUVMaxAngle: 89
13835+
m_LightmapParameters: {fileID: 0}
13836+
m_SortingLayerID: 0
13837+
m_SortingLayer: 0
13838+
m_SortingOrder: 0
13839+
--- !u!65 &1844216922
13840+
BoxCollider:
13841+
m_ObjectHideFlags: 0
13842+
m_PrefabParentObject: {fileID: 0}
13843+
m_PrefabInternal: {fileID: 0}
13844+
m_GameObject: {fileID: 1844216919}
13845+
m_Material: {fileID: 0}
13846+
m_IsTrigger: 0
13847+
m_Enabled: 1
13848+
serializedVersion: 2
13849+
m_Size: {x: 1, y: 1, z: 1}
13850+
m_Center: {x: 0, y: 0, z: 0}
13851+
--- !u!33 &1844216923
13852+
MeshFilter:
13853+
m_ObjectHideFlags: 0
13854+
m_PrefabParentObject: {fileID: 0}
13855+
m_PrefabInternal: {fileID: 0}
13856+
m_GameObject: {fileID: 1844216919}
13857+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
13858+
--- !u!4 &1844216924
13859+
Transform:
13860+
m_ObjectHideFlags: 0
13861+
m_PrefabParentObject: {fileID: 0}
13862+
m_PrefabInternal: {fileID: 0}
13863+
m_GameObject: {fileID: 1844216919}
13864+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
13865+
m_LocalPosition: {x: 2.68, y: 10.54, z: 4.99}
13866+
m_LocalScale: {x: 1, y: 1, z: 1}
13867+
m_Children: []
13868+
m_Father: {fileID: 0}
13869+
m_RootOrder: 4
13870+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1384313871
--- !u!1 &1892516485
1384413872
GameObject:
1384513873
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)