l31tm0t1f/GalleryEnvironment
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: l31tm0t1f:734dd5f8e0bb786f0ae904d83f4f7b31f7cbe0fe
Branches Tags
l31tm0t1f:master l31tm0t1f:LiisaChanges
..
compare: l31tm0t1f:LiisaChanges
Branches Tags
l31tm0t1f:master l31tm0t1f:LiisaChanges

9 Commits
734dd5f8e0 ... LiisaChang

Author SHA1 Message Date
jelizavet
3eea75f7db stereo vision 2022-03-28 18:06:05 +03:00
jelizavet
f145eff6a1 bottle implementation 2022-03-28 17:48:06 +03:00
jelizavet
ec375254b7 Setup 2022-03-28 15:39:55 +03:00
Jelizaveta Kuznetsova
00e80e27ca Debug 2022-03-23 00:05:47 +02:00
jelizavet
84f4348b91 Grab fixes 2022-03-20 18:31:17 +02:00
DOMENIS\jelizavet
d2f13b90d8 Merge 2022-03-07 18:48:11 +02:00
DOMENIS\jelizavet
0b15820fdd Grab dif project 2022-03-07 18:47:54 +02:00
l31tm0t1f
efa77c7dbb Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master 
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
 2022-03-07 17:33:55 +02:00
l31tm0t1f
c936cbdc02 2.commit 2022-03-07 17:31:45 +02:00
7 changed files with 26 additions and 3 deletions
Expand all files Collapse all files

10
Config/DefaultInput.ini
View File

@@ -142,6 +142,12 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_System_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_System_Click)
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click)
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click)
+ActionMappings=(ActionName="GrabPullLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click)
+ActionMappings=(ActionName="GrabPullRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
+ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click)
+ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
+ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
+ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click)
+AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) +AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X)
+AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) +AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis)
+AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y)
@@ -184,7 +190,9 @@ DoubleClickTime=0.200000
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y)
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y)
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y)
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_A_Click) +AxisMappings=(AxisName="TeleportationAxis",Scale=1.000000,Key=OculusTouch_Right_A_Click)
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=D)
+AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=A)
DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultPlayerInputClass=/Script/Engine.PlayerInput
DefaultInputComponentClass=/Script/Engine.InputComponent DefaultInputComponentClass=/Script/Engine.InputComponent
DefaultTouchInterface=None DefaultTouchInterface=None

BIN
Content/Materials/M_vingette.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/VRPawn.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Maps/VRMapGrabLocomotion.umap LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset LFS Normal file
View File

Binary file not shown.