Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pouring scenario modified #268

Open
wants to merge 16 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ Intermediate
# Cache files for the editor to use
DerivedDataCache/*

/.idea/.idea.RobCoG/.idea
17 changes: 17 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": "1.0",
"components": [
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64",
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeCrossPlat",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Workload.NativeGame",
"Microsoft.VisualStudio.Workload.Universal"
]
}
27 changes: 25 additions & 2 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ DefaultGraphicsPerformance=Maximum
AppliedDefaultGraphicsPerformance=Maximum

[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Maps/Empty.Empty
EditorStartupMap=/Game/Maps/Simulation/PouringSimulator_1.PouringSimulator_1
GameDefaultMap=/Game/Maps/Empty.Empty
GameInstanceClass=/URoboSim/URoboSimGameInstance.URoboSimGameInstance_C

[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
bSupportsPortraitOrientation=False
Expand Down Expand Up @@ -102,6 +103,11 @@ r.RayTracing=False
+CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")

[/Script/Engine.CollisionProfile]
.Profiles=(Name="RobotNoSelfCollision",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="Robot",CustomResponses=((Channel="Robot",Response=ECR_Ignore)),HelpMessage="Robot will not collide with itself")
.Profiles=(Name="RobotWithSelfCollision",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="Robot",CustomResponses=,HelpMessage="Robot will collide with itself")


[/Script/Engine.PhysicsSettings]
DefaultGravityZ=-980.000000
DefaultTerminalVelocity=4000.000000
Expand Down Expand Up @@ -139,7 +145,7 @@ AnimPhysicsMinDeltaTime=0.000000
bSimulateAnimPhysicsAfterReset=False
MaxPhysicsDeltaTime=0.033333
bSubstepping=False
bSubsteppingAsync=False
bSubsteppingAsync=True
MaxSubstepDeltaTime=0.016667
MaxSubsteps=6
SyncSceneSmoothingFactor=0.000000
Expand All @@ -160,3 +166,20 @@ bTextureCompression=True
bEnableQueryCollision=False
bEnablePlayInEditorChanges=False

[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
bEnablePlugin=True
bAllowNetworkConnection=True
SecurityToken=4AE7BE3147DA050310705EA401903073
bIncludeInShipping=False
bAllowExternalStartInShipping=False
bCompileAFSProject=False
bUseCompression=False
bLogFiles=False
bReportStats=False
ConnectionType=USBOnly
bUseManualIPAddress=False
ManualIPAddress=

[/Script/LuminRuntimeSettings.LuminRuntimeSettings]
FrameTimingHint=Maximum

1 change: 1 addition & 0 deletions Config/DefaultGame.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[/Script/EngineSettings.GeneralProjectSettings]
ProjectID=B43328594528B21243491D96AD8C9C72
CopyrightNotice=Copyright 2017-2021, Institute for Artificial Intelligence - University of Bremen
bStartInVR=True

[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
Expand Down
6 changes: 4 additions & 2 deletions Config/DefaultInput.ini
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="SLGenericTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=N)
+ActionMappings=(ActionName="VizQCineCamTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=K)
+ActionMappings=(ActionName="VizQCineCamEffectTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=J)
+ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
+ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Y)
+AxisMappings=(AxisName="LeftGrasp",Scale=1.000000,Key=Vive_Left_Trigger_Axis)
+AxisMappings=(AxisName="RightGrasp",Scale=1.000000,Key=Vive_Right_Trigger_Axis)
DefaultPlayerInputClass=/Script/Engine.PlayerInput
DefaultInputComponentClass=/Script/Engine.InputComponent
DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
-ConsoleKeys=Tilde
+ConsoleKeys=Tilde
Expand Down
5 changes: 5 additions & 0 deletions Config/DefaultRos.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


[/Script/UROSBridge.RosSettings]
ROSBridgeServerHost=192.168.56.101

13 changes: 13 additions & 0 deletions Config/SteamVRBindings/gamepad.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "Default bindings for Gamepads",
"controller_type": "gamepad",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": "RobCoG-18319896"
}
44 changes: 44 additions & 0 deletions Config/SteamVRBindings/holographic_controller.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "Default bindings for MixedReality",
"controller_type": "holographic_controller",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": "RobCoG-18319896"
}
44 changes: 44 additions & 0 deletions Config/SteamVRBindings/hpmotioncontroller.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "Default bindings for HPMixedRealityController",
"controller_type": "hpmotioncontroller",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": "RobCoG-18319896"
}
13 changes: 13 additions & 0 deletions Config/SteamVRBindings/indexhmd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "Default bindings for Valve Index Headset",
"controller_type": "indexhmd",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": "RobCoG-18319896"
}
44 changes: 44 additions & 0 deletions Config/SteamVRBindings/knuckles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "Default bindings for ValveIndex",
"controller_type": "knuckles",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": "RobCoG-18319896"
}
44 changes: 44 additions & 0 deletions Config/SteamVRBindings/oculus_touch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "Default bindings for OculusTouch",
"controller_type": "oculus_touch",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": [],
"poses": [
{
"output": "/actions/main/in/controllerleft",
"path": "/user/hand/left/pose/raw",
"requirement": "optional"
},
{
"output": "/actions/main/in/controllerright",
"path": "/user/hand/right/pose/raw"
}
],
"skeleton": [
{
"output": "/actions/main/in/skeletonleft",
"path": "/user/hand/left/input/skeleton/left"
},
{
"output": "/actions/main/in/skeletonright",
"path": "/user/hand/right/input/skeleton/right"
}
],
"haptics": [
{
"output": "/actions/main/out/vibrateleft",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/main/out/vibrateright",
"path": "/user/hand/right/output/haptic"
}
]
}
},
"description": "RobCoG-18319896"
}
13 changes: 13 additions & 0 deletions Config/SteamVRBindings/rift.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "Default bindings for Rift Headset",
"controller_type": "rift",
"last_edited_by": "UnrealEngine",
"bindings":
{
"/actions/main":
{
"sources": []
}
},
"description": "RobCoG-18319896"
}
Loading