cgvr/DeltaVR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add interactable doors, disable ambient occlusion for now

Browse Source
This commit is contained in:
Toomas Tamm 2021-01-28 02:32:43 +02:00
parent dd3508fb43
commit c8ba257aa1
7 changed files with 818 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Variant.prefab
View File

@ -28,8 +28,8 @@ Transform:
m_GameObject: {fileID: 619810115}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: 0.001, y: 0.6044, z: -0}
m_LocalScale: {x: 1.01, y: 0.215, z: 7.2}
m_LocalPosition: {x: -0.000000005394727, y: 1.1540004, z: 0.000000009313226}
m_LocalScale: {x: 1.12, y: 0.4, z: 0.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 3
@ -109,6 +109,7 @@ GameObject:
- component: {fileID: 34540231478969632}
- component: {fileID: 1331482666335168784}
- component: {fileID: 906220286}
- component: {fileID: 7724609904239790431}
m_Layer: 0
m_Name: Right wall
m_TagString: Untagged
@ -125,8 +126,8 @@ Transform:
m_GameObject: {fileID: 1858704533180397902}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: 0.59098923, y: 0.06190014, z: -0.000003845461}
m_LocalScale: {x: 0.17, y: 1.3, z: 7.2}
m_LocalPosition: {x: 0.71, y: 0.179, z: 0}
m_LocalScale: {x: 0.3, y: 2.35, z: 0.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 2
@ -194,6 +195,22 @@ MeshCollider:
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!54 &7724609904239790431
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858704533180397902}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &2376408783022628303
GameObject:
m_ObjectHideFlags: 0
@ -220,7 +237,7 @@ Transform:
m_GameObject: {fileID: 2376408783022628303}
m_LocalRotation: {x: 0.00000005960465, y: 0.7071068, z: 0.7071068, w: -0.00000005960465}
m_LocalPosition: {x: -45.341, y: 17.234, z: 5.45}
m_LocalScale: {x: -1.1, y: 1.8975594, z: 0.031}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1141650349950631806}
- {fileID: 8958824632396726195}
@ -249,12 +266,15 @@ GameObject:
- component: {fileID: 6318928237655510687}
- component: {fileID: 8567072198544535915}
- component: {fileID: 932084705}
- component: {fileID: 6830999020486091146}
- component: {fileID: 8579609115951157415}
- component: {fileID: 8606222079484180125}
m_Layer: 0
m_Name: VR-door
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 1
m_IsActive: 1
--- !u!4 &1141650349950631806
Transform:
@ -263,14 +283,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7524997068079331246}
m_LocalRotation: {x: -0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0.003, y: -0, z: 0}
m_LocalScale: {x: 1.1, y: 1.897559, z: 0.031}
m_Children:
- {fileID: 6548037134010678093}
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 90.00001, z: 90.00001}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!33 &6318928237655510687
MeshFilter:
m_ObjectHideFlags: 0
@ -334,6 +354,136 @@ MeshCollider:
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!54 &6830999020486091146
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7524997068079331246}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &8579609115951157415
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7524997068079331246}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders:
- {fileID: 5489323224948033285}
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
m_CustomReticle: {fileID: 0}
m_AttachTransform: {fileID: 0}
m_AttachEaseInTime: 0.15
m_MovementType: 0
m_TrackPosition: 1
m_SmoothPosition: 0
m_SmoothPositionAmount: 5
m_TightenPosition: 0.5
m_TrackRotation: 1
m_SmoothRotation: 0
m_SmoothRotationAmount: 5
m_TightenRotation: 0.5
m_ThrowOnDetach: 1
m_ThrowSmoothingDuration: 0.25
m_ThrowSmoothingCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
m_RetainTransformParent: 1
--- !u!59 &8606222079484180125
HingeJoint:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7524997068079331246}
m_ConnectedBody: {fileID: 7724609904239790431}
m_ConnectedArticulationBody: {fileID: 0}
m_Anchor: {x: -0.5, y: 0, z: 0}
m_Axis: {x: 0, y: -0.4, z: 0}
m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: -0.5233279, y: -0.07617009, z: 0.000018732695}
m_UseSpring: 0
m_Spring:
spring: 0
damper: 0
targetPosition: 0
m_UseMotor: 0
m_Motor:
targetVelocity: 0
force: 0
freeSpin: 0
m_UseLimits: 1
m_Limits:
min: -90
max: 90
bounciness: 0
bounceMinVelocity: 0.2
contactDistance: 0
m_BreakForce: Infinity
m_BreakTorque: Infinity
m_EnableCollision: 0
m_EnablePreprocessing: 1
m_MassScale: 1
m_ConnectedMassScale: 1
--- !u!1 &7641886289678632063
GameObject:
m_ObjectHideFlags: 0
@ -345,12 +495,13 @@ GameObject:
- component: {fileID: 6548037134010678093}
- component: {fileID: 1563113102796242720}
- component: {fileID: 8357273141740731653}
- component: {fileID: 5489323224948033285}
m_Layer: 0
m_Name: Knob
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 1
m_IsActive: 1
--- !u!4 &6548037134010678093
Transform:
@ -415,6 +566,20 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &5489323224948033285
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7641886289678632063}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 1c68b634608ac71409cc85c15415923b, type: 2}
--- !u!1 &8583638621924436570
GameObject:
m_ObjectHideFlags: 0
@ -443,8 +608,8 @@ Transform:
m_GameObject: {fileID: 8583638621924436570}
m_LocalRotation: {x: -0.000000119209275, y: 0.00000008115275, z: -0.00000025602202,
w: 1}
m_LocalPosition: {x: -0.7239976, y: 0.061900616, z: -0.000003845461}
m_LocalScale: {x: 0.44, y: 1.3, z: 7.2}
m_LocalPosition: {x: -0.709994, y: 0.17900115, z: -0.0000000055879354}
m_LocalScale: {x: 0.3, y: 2.35, z: 0.2}
m_Children: []
m_Father: {fileID: 2389456291377549788}
m_RootOrder: 1

BIN
Assets/Other/Delta (Toomas) v0.blend (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/Other/Delta (Toomas) v0.blend1
View File

Binary file not shown.

1075
Assets/Scenes/Main_scene.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
m_Name: ScreenSpaceAmbientOcclusion
m_EditorClassIdentifier:
m_Active: 1
m_Active: 0
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
m_Settings:
Downsample: 0

4
Assets/XR/Settings/Open XR Package Settings.asset
View File

@ -59,10 +59,10 @@ MonoBehaviour:
- {fileID: -56004002815963975}
- {fileID: 5631358094445770064}
- {fileID: -3485549425058001080}
- {fileID: 8372070344407202778}
- {fileID: -2073485709369494527}
- {fileID: -3986725776056858659}
- {fileID: -9051815517748824824}
- {fileID: -2073485709369494527}
- {fileID: 8372070344407202778}
m_renderMode: 1
m_depthSubmissionMode: 0
--- !u!114 &-7629316217295429534

2
Packages/packages-lock.json
View File

@ -196,7 +196,7 @@
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.subsystemregistration": "1.0.6"
"com.unity.subsystemregistration": "1.0.5"
},
"url": "https://packages.unity.com"
},