stereo vision

bottle implementation
Setup
2022-03-28 18:06:05 +03:00 · 2022-03-28 17:48:06 +03:00 · 2022-03-28 15:39:55 +03:00 · 2022-03-23 00:05:47 +02:00 · 2022-03-20 18:31:17 +02:00 · 2022-03-07 18:48:11 +02:00
77 changed files with 162 additions and 82 deletions
--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
@@ -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=MixedReality_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="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis)
 +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=MixedReality_Right_Thumbstick_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
 DefaultInputComponentClass=/Script/Engine.InputComponent
 DefaultTouchInterface=None
--- a/Content/FPWeapon/Mesh/M_Soul_TreeDead.uasset
+++ b/Content/FPWeapon/Mesh/M_Soul_TreeDead.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset
--- a/Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
+++ b/Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
--- a/Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset
--- a/Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
+++ b/Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
--- a/Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
+++ b/Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
--- a/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset
--- a/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset
--- a/Content/Materials/M_vingette.uasset
+++ b/Content/Materials/M_vingette.uasset
--- a/Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset
+++ b/Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset
--- a/Content/ProceduralNaturePack/Materials/master_leaves.uasset
+++ b/Content/ProceduralNaturePack/Materials/master_leaves.uasset
--- a/Content/ProceduralNaturePack/Materials/master_spline_material.uasset
+++ b/Content/ProceduralNaturePack/Materials/master_spline_material.uasset
--- a/Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset
+++ b/Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset
--- a/Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset
+++ b/Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset
--- a/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset
+++ b/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset
--- a/Content/ProceduralNaturePack/Textures/clouds.uasset
+++ b/Content/ProceduralNaturePack/Textures/clouds.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_bsm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_bsm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_rgm.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset
--- a/Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset
+++ b/Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset
--- a/Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset
+++ b/Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset
--- a/Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset
+++ b/Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset
--- a/Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
+++ b/Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
--- a/Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset
+++ b/Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset
--- a/Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
+++ b/Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
--- a/Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
+++ b/Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
--- a/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset
+++ b/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset
--- a/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset
--- a/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset
--- a/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset
--- a/Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset
+++ b/Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset
--- a/Content/VRTemplate/Blueprints/VRPawn.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawn.uasset
--- a/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset
--- a/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap
+++ b/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap
--- a/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset
+++ b/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
+++ b/Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
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
Jelizaveta Kuznetsova	734dd5f8e0	Shaking tree asset from procedural nature pack	2022-03-06 21:55:16 +02:00
helenasokk	41ffd6339c	*Helena's assets commit again	2022-03-06 16:56:56 +02:00
helenasokk	1e440bc4ab	Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment # Conflicts: # Content/VRTemplate/Maps/VRTemplateMap.umap # Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset	2022-03-06 16:41:06 +02:00
helenasokk	4825126cd7	*trying to fix errors	2022-03-06 16:34:56 +02:00