diff --git a/Unreal/Environments/Blocks/.gitignore b/Unreal/Environments/Blocks/.gitignore deleted file mode 100644 index 5dba4e3d6b..0000000000 --- a/Unreal/Environments/Blocks/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# don't check-in Plugins folder we copied from AirSim folder -Plugins/ -# Don't add packaged binaries -Packaged/ - -# don't check-in generated files -*.sln -*_BuiltData.uasset -/.kdev/ -/*.kdev4 -/*.pro -/*.workspace -/*CodeCompletionFolders.txt -/*CodeLitePreProcessor.txt -/*.pri -/CMakeLists.txt -/Makefile - -# avoid checking uproject because this is usually just version change -*.uproject - -# avoid checking in MacOS XCode assets -*.xcworkspace diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject deleted file mode 100644 index 6d803f0f0c..0000000000 --- a/Unreal/Environments/Blocks/Blocks.uproject +++ /dev/null @@ -1,30 +0,0 @@ -{ - "FileVersion": 3, - "EngineAssociation": "5.3", - "Category": "", - "Description": "", - "Modules": [ - { - "Name": "Blocks", - "Type": "Runtime", - "LoadingPhase": "Default", - "AdditionalDependencies": [ - "AirSim" - ] - } - ], - "Plugins": [ - { - "Name": "AirSim", - "Enabled": true - }, - { - "Name": "SteamVR", - "Enabled": false - }, - { - "Name": "OculusVR", - "Enabled": false - } - ] -} \ No newline at end of file diff --git a/Unreal/Environments/Blocks/Config/DefaultEditor.ini b/Unreal/Environments/Blocks/Config/DefaultEditor.ini deleted file mode 100644 index f44257a4da..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultEditor.ini +++ /dev/null @@ -1,11 +0,0 @@ -[UnrealEd.SimpleMap] -SimpleMapName=/Game/Flying/Maps/FlyingExampleMap - -[EditoronlyBP] -bAllowClassAndBlueprintPinMatching=true -bReplaceBlueprintWithClass= true -bDontLoadBlueprintOutsideEditor= true -bBlueprintIsNotBlueprintType= true - -[/Script/AdvancedPreviewScene.SharedProfiles] - diff --git a/Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini b/Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini deleted file mode 100644 index e15e1cff67..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultEditorPerProjectUserSettings.ini +++ /dev/null @@ -1,5 +0,0 @@ -[ContentBrowser] -ContentBrowserTab1.SelectedPaths=/Game/Flying - -[/Script/UnrealEd.EditorPerProjectUserSettings] -bThrottleCPUWhenNotForeground=False \ No newline at end of file diff --git a/Unreal/Environments/Blocks/Config/DefaultEngine.ini b/Unreal/Environments/Blocks/Config/DefaultEngine.ini deleted file mode 100644 index bb71e75c2c..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultEngine.ini +++ /dev/null @@ -1,84 +0,0 @@ -[/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/FlyingCPP/Maps/FlyingExampleMap -LocalMapOptions= -TransitionMap= -bUseSplitscreen=True -TwoPlayerSplitscreenLayout=Horizontal -ThreePlayerSplitscreenLayout=FavorTop -GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/FlyingCPP/Maps/FlyingExampleMap -ServerDefaultMap=/Engine/Maps/Entry -GlobalDefaultGameMode=/Script/Blocks.BlocksGameMode -GlobalDefaultServerGameMode=None - -[/Script/IOSRuntimeSettings.IOSRuntimeSettings] -MinimumiOSVersion=IOS_11 - - -[/Script/Engine.Engine] -+ActiveGameNameRedirects=(OldGameName="TP_Flying",NewGameName="/Script/Blocks") -+ActiveGameNameRedirects=(OldGameName="/Script/TP_Flying",NewGameName="/Script/Blocks") -+ActiveClassRedirects=(OldClassName="TP_FlyingPawn",NewClassName="BlocksPawn") -+ActiveClassRedirects=(OldClassName="TP_FlyingGameMode",NewClassName="BlocksGameMode") - -[/Script/HardwareTargeting.HardwareTargetingSettings] -TargetedHardwareClass=Desktop -AppliedTargetedHardwareClass=Desktop -DefaultGraphicsPerformance=Maximum -AppliedDefaultGraphicsPerformance=Maximum - -[/Script/Engine.PhysicsSettings] -DefaultGravityZ=-980.000000 -DefaultTerminalVelocity=4000.000000 -DefaultFluidFriction=0.300000 -SimulateScratchMemorySize=262144 -RagdollAggregateThreshold=4 -TriangleMeshTriangleMinAreaThreshold=5.000000 -bEnableAsyncScene=False -bEnableShapeSharing=False -bEnablePCM=False -bEnableStabilization=False -bWarnMissingLocks=True -bEnable2DPhysics=False -LockedAxis=Invalid -DefaultDegreesOfFreedom=Full3D -BounceThresholdVelocity=200.000000 -FrictionCombineMode=Average -RestitutionCombineMode=Average -MaxAngularVelocity=3600.000000 -MaxDepenetrationVelocity=0.000000 -ContactOffsetMultiplier=0.010000 -MinContactOffset=0.000100 -MaxContactOffset=1.000000 -bSimulateSkeletalMeshOnDedicatedServer=True -DefaultShapeComplexity=CTF_UseSimpleAndComplex -bDefaultHasComplexCollision=True -bSuppressFaceRemapTable=False -bSupportUVFromHitResults=False -bDisableActiveActors=False -bDisableCCD=False -bEnableEnhancedDeterminism=False -MaxPhysicsDeltaTime=0.033333 -bSubstepping=False -bSubsteppingAsync=False -MaxSubstepDeltaTime=0.016667 -MaxSubsteps=6 -SyncSceneSmoothingFactor=0.000000 -AsyncSceneSmoothingFactor=0.990000 -InitialAverageFrameRate=0.016667 -PhysXTreeRebuildRate=10 - -[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] -bEnablePlugin=True -bAllowNetworkConnection=True -SecurityToken=811F8F1C4E41692A119A55BE04E6DB61 -bIncludeInShipping=False -bAllowExternalStartInShipping=False -bCompileAFSProject=False -bUseCompression=False -bLogFiles=False -bReportStats=False -ConnectionType=USBOnly -bUseManualIPAddress=False -ManualIPAddress= - diff --git a/Unreal/Environments/Blocks/Config/DefaultGame.ini b/Unreal/Environments/Blocks/Config/DefaultGame.ini deleted file mode 100644 index 3f62f5dc66..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultGame.ini +++ /dev/null @@ -1,48 +0,0 @@ -[/Script/EngineSettings.GeneralProjectSettings] -ProjectID=367FFC384956CDC4377673B3217F380D -ProjectName="Blocks" -CompanyName=Microsoft Research -Homepage="https://github.com/microsoft/airsim" -SupportContact="https://github.com/microsoft/airsim/issues" -LicensingTerms=MIT Licence -ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "8F8B6B2A472F9FDFB69E2B8CFAE8C4E0", "Blocks Environment for AirSim") -ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "F31D7C524A9E9BC66DD2AA922D309408", "Blocks Environment for AirSim") - -[/Script/UnrealEd.ProjectPackagingSettings] -Build=IfProjectHasCode -BuildConfiguration=PPBC_Development -StagingDirectory=(Path="C:/temp") -FullRebuild=True -ForDistribution=False -IncludeDebugFiles=False -BlueprintNativizationMethod=Disabled -bIncludeNativizedAssetsInProjectGeneration=False -UsePakFile=True -bGenerateChunks=False -bGenerateNoChunks=False -bChunkHardReferencesOnly=False -bBuildHttpChunkInstallData=False -HttpChunkInstallDataDirectory=(Path="") -HttpChunkInstallDataVersion= -IncludePrerequisites=True -IncludeAppLocalPrerequisites=False -bShareMaterialShaderCode=True -bSharedMaterialNativeLibraries=True -ApplocalPrerequisitesDirectory=(Path="") -IncludeCrashReporter=False -InternationalizationPreset=English --CulturesToStage=en -+CulturesToStage=en -bCookAll=False -bCookMapsOnly=False -bCompressed=True -bEncryptIniFiles=False -bEncryptPakIndex=False -bSkipEditorContent=False -+MapsToCook=(FilePath="/Game/FlyingCPP/Maps/FlyingExampleMap") -+MapsToCook=(FilePath="/AirSim/AirSimAssets") -+DirectoriesToAlwaysCook=(Path="/AirSim/HUDAssets") -bNativizeBlueprintAssets=False -bNativizeOnlySelectedBlueprints=False - - diff --git a/Unreal/Environments/Blocks/Config/DefaultGameUserSettings.ini b/Unreal/Environments/Blocks/Config/DefaultGameUserSettings.ini deleted file mode 100644 index 87f51567e9..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultGameUserSettings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[/Script/Engine.GameUserSettings] -FullscreenMode=1 \ No newline at end of file diff --git a/Unreal/Environments/Blocks/Config/DefaultInput.ini b/Unreal/Environments/Blocks/Config/DefaultInput.ini deleted file mode 100644 index c68d330fdd..0000000000 --- a/Unreal/Environments/Blocks/Config/DefaultInput.ini +++ /dev/null @@ -1,86 +0,0 @@ -[/Script/Engine.InputSettings] --AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) --AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) --AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) --AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f)) -+AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -bAltEnterTogglesFullscreen=True -bF11TogglesFullscreen=True -bUseMouseForTouch=False -bEnableMouseSmoothing=True -bEnableFOVScaling=True -bCaptureMouseOnLaunch=False -bEnableLegacyInputScales=True -bEnableMotionControls=True -bFilterInputByPlatformUser=False -bEnableInputDeviceSubsystem=True -bShouldFlushPressedKeysOnViewportFocusLost=True -bEnableDynamicComponentInputBinding=True -bAlwaysShowTouchInterface=False -bShowConsoleOnFourFingerTap=True -bEnableGestureRecognizer=False -bUseAutocorrect=False -DefaultViewportMouseCaptureMode=NoCapture -DefaultViewportMouseLockMode=DoNotLock -FOVScale=0.011110 -DoubleClickTime=0.200000 -DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput -DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent -DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks --ConsoleKeys=Tilde -+ConsoleKeys=Tilde - diff --git a/Unreal/Environments/Blocks/Content/Flying/Meshes/BaseMaterial.uasset b/Unreal/Environments/Blocks/Content/Flying/Meshes/BaseMaterial.uasset deleted file mode 100644 index 9e46c78be8..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Flying/Meshes/BaseMaterial.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/Flying/Meshes/GrayMaterial.uasset b/Unreal/Environments/Blocks/Content/Flying/Meshes/GrayMaterial.uasset deleted file mode 100644 index ce3d61a605..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Flying/Meshes/GrayMaterial.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/FlyingCPP/Maps/FlyingExampleMap.umap b/Unreal/Environments/Blocks/Content/FlyingCPP/Maps/FlyingExampleMap.umap deleted file mode 100644 index 412fce6f39..0000000000 Binary files a/Unreal/Environments/Blocks/Content/FlyingCPP/Maps/FlyingExampleMap.umap and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube.uasset b/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube.uasset deleted file mode 100644 index a2aff598de..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube_Chamfer.uasset b/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube_Chamfer.uasset deleted file mode 100644 index cb1abf9354..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Geometry/Meshes/1M_Cube_Chamfer.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/Geometry/Meshes/CubeMaterial.uasset b/Unreal/Environments/Blocks/Content/Geometry/Meshes/CubeMaterial.uasset deleted file mode 100644 index 6960a6967b..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Geometry/Meshes/CubeMaterial.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/Content/Geometry/Meshes/TemplateFloor.uasset b/Unreal/Environments/Blocks/Content/Geometry/Meshes/TemplateFloor.uasset deleted file mode 100644 index be4c8e0e61..0000000000 Binary files a/Unreal/Environments/Blocks/Content/Geometry/Meshes/TemplateFloor.uasset and /dev/null differ diff --git a/Unreal/Environments/Blocks/GenerateProjectFiles.bat b/Unreal/Environments/Blocks/GenerateProjectFiles.bat deleted file mode 100644 index 0d1e71078f..0000000000 --- a/Unreal/Environments/Blocks/GenerateProjectFiles.bat +++ /dev/null @@ -1,11 +0,0 @@ -setlocal -del /q gen_temp.txt -powershell -command "& { (Get-ItemProperty 'Registry::HKEY_CLASSES_ROOT\Unreal.ProjectFile\shell\rungenproj' -Name 'Icon' ).'Icon' } > gen_temp.tmp" -type gen_temp.tmp > gen_temp.txt -set /p gen_bin=/dev/null - -if [[ ! -e "$UnrealDir" ]]; then - UnrealDir=$1 -fi -if [[ ! -e "$UnrealDir" ]]; then - # UnrealDir variable must be set like '/Users/Shared/Epic\ Games/UE_4.16' - echo "UnrealDir is not set." - exit 1 -fi - -if [ "$(uname)" == "Darwin" ]; then - # Call UnrealEngine shell scrpit - pushd "$UnrealDir/Engine/Build/BatchFiles/Mac/" >/dev/null - ./GenerateProjectFiles.sh "$SCRIPT_DIR/Blocks.uproject" - popd >/dev/null -else - echo "Not implemented" - exit 1 -fi - -popd >/dev/null -set +x diff --git a/Unreal/Environments/Blocks/Source/Blocks.Target.cs b/Unreal/Environments/Blocks/Source/Blocks.Target.cs deleted file mode 100644 index 2a0f084779..0000000000 --- a/Unreal/Environments/Blocks/Source/Blocks.Target.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; -using System.Collections.Generic; - -public class BlocksTarget : TargetRules -{ - public BlocksTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Game; - ExtraModuleNames.AddRange(new string[] { "Blocks" }); - DefaultBuildSettings = BuildSettingsVersion.V4; - //bUseUnityBuild = false; - if (Target.Platform == UnrealTargetPlatform.Linux) - bUsePCHFiles = false; - } -} diff --git a/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.cs b/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.cs deleted file mode 100644 index 46aba28414..0000000000 --- a/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; - -public class Blocks : ModuleRules -{ - public Blocks(ReadOnlyTargetRules Target) : base(Target) - { - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - bEnableExceptions = true; // win64 - if (Target.Platform == UnrealTargetPlatform.Linux) - bEnableExceptions = false; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); - } -} diff --git a/Unreal/Environments/Blocks/Source/Blocks/Blocks.cpp b/Unreal/Environments/Blocks/Source/Blocks/Blocks.cpp deleted file mode 100644 index ccda11a0df..0000000000 --- a/Unreal/Environments/Blocks/Source/Blocks/Blocks.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - -#include "Blocks.h" - -#include "Modules/ModuleManager.h" - -IMPLEMENT_PRIMARY_GAME_MODULE(FDefaultGameModuleImpl, Blocks, "Blocks"); diff --git a/Unreal/Environments/Blocks/Source/Blocks/Blocks.h b/Unreal/Environments/Blocks/Source/Blocks/Blocks.h deleted file mode 100644 index 25b0d29415..0000000000 --- a/Unreal/Environments/Blocks/Source/Blocks/Blocks.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs deleted file mode 100644 index a6e65043ae..0000000000 --- a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - -using UnrealBuildTool; -using System.Collections.Generic; - -public class BlocksEditorTarget : TargetRules -{ - public BlocksEditorTarget(TargetInfo Target) : base(Target) - { - Type = TargetType.Editor; - ExtraModuleNames.AddRange(new string[] { "Blocks" }); - DefaultBuildSettings = BuildSettingsVersion.V4; - //bUseUnityBuild = false; - //bUsePCHFiles = false; - } -} diff --git a/Unreal/Environments/Blocks/clean.bat b/Unreal/Environments/Blocks/clean.bat deleted file mode 100644 index 86487d1e1e..0000000000 --- a/Unreal/Environments/Blocks/clean.bat +++ /dev/null @@ -1,10 +0,0 @@ -rd /s/q Build -rd /s/q Binaries -rd /s/q Intermediate -rd /s/q Saved -mkdir Saved\logs -rd /s/q Plugins\AirSim\Binaries -rd /s/q Plugins\AirSim\Intermediate -rd /s/q Plugins\AirSim\Saved -del *.sln - diff --git a/Unreal/Environments/Blocks/clean.sh b/Unreal/Environments/Blocks/clean.sh deleted file mode 100755 index 941171fab1..0000000000 --- a/Unreal/Environments/Blocks/clean.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash - -# get path of current script: https://stackoverflow.com/a/39340259/207661 -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -pushd "$SCRIPT_DIR" >/dev/null - -set -e -set -x - -# clean temporary unreal folders -rm -rf Binaries -rm -rf Intermediate -rm -rf Saved -rm -rf Plugins/AirSim/Binaries -rm -rf Plugins/AirSim/Intermediate -rm -rf Plugins/AirSim/Saved -rm -f CMakeLists.txt -rm -f Makefile - -popd >/dev/null \ No newline at end of file diff --git a/Unreal/Environments/Blocks/package.bat b/Unreal/Environments/Blocks/package.bat deleted file mode 100644 index 7969e76627..0000000000 --- a/Unreal/Environments/Blocks/package.bat +++ /dev/null @@ -1,64 +0,0 @@ -@echo off -REM //---------- set up variable ---------- -setlocal -set ROOT_DIR=%~dp0 - -set OutPath=%1 -set ToolPath=%2 -set UEVer=%3 - -if "%UEVer%"=="" set "UEVer=4.24" - -set "_ToolPath=%PROGRAMFILES%\Epic Games\UE_%UEVer%\Engine\Build\BatchFiles" -if "%ToolPath%"=="" set ToolPath=%_ToolPath% -if "%ToolPath%"=="""" set ToolPath=%_ToolPath% - -IF NOT EXIST "%ToolPath%" ( - echo "Unreal Engine build path %ToolPath% was not found" - goto :failed -) - -if "%OutPath%"=="" set "OutPath=D:\AirSimBuilds" -IF NOT EXIST "%ToolPath%" ( - echo "Package output path %OutPath% was not found" - goto :failed -) - -echo Using ToolPath = %ToolPath% -echo Using OutPath = %OutPath% - -for %%f in (*.uproject) do ( - echo Packaging: %%f - - "%ToolPath%\Build" "%%~nfEditor" Win64 Development -WarningsAsErrors "%cd%\%%f" - if ERRORLEVEL 1 goto :failed - - REM "%ToolPath%\RunUAT" -ScriptsForProject="%cd%\%%f" BuildCookRun -installed -nop4 -project="%cd%\%%f" -cook -stage -archive -archivedirectory="%OutPath%" -package -clientconfig=Development -ue4exe=UE4Editor-Cmd.exe -compressed -pak -prereqs -nodebuginfo -targetplatform=Win64 -build -utf8output -nocompile -nocompileeditor - - REM "%ToolPath%\RunUAT" BuildCookRun -project="%cd%\%%f" -noP4 -platform=Win64 -clientconfig=Development -serverconfig=Development -cook -rocket -allmaps -build -stage -NoCompile -nocompileeditor -pak -archive -archivedirectory="%OutPath%" - - rmdir /s /q "%OutPath%\%%~nf" - - "%ToolPath%\RunUAT" BuildCookRun -project="%cd%\%%f" -noP4 -platform=Win64 -clientconfig=Development -cook -build -stage -pak -archive -archivedirectory="%OutPath%" -utf8output -compressed -prereqs - if ERRORLEVEL 1 goto :failed - - move "%OutPath%\WindowsNoEditor" "%OutPath%\%%~nf" - if ERRORLEVEL 1 goto :failed - - @echo off - echo start %%~nf -windowed> "%OutPath%\%%~nf\run.bat" - if ERRORLEVEL 1 goto :failed -) - -goto :done - -:failed -echo "Error occured while packaging" -echo "Usage: package.bat " -exit /b 1 - -:done -if "%1"=="" pause - - - diff --git a/Unreal/Environments/Blocks/update_from_git.bat b/Unreal/Environments/Blocks/update_from_git.bat deleted file mode 100644 index 9d8654036a..0000000000 --- a/Unreal/Environments/Blocks/update_from_git.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo off -REM //---------- set up variable ---------- -setlocal -set ROOT_DIR=%~dp0 - -set AirSimPath=%1 - -REM default path works for Blocks environment -if "%AirSimPath%"=="" set "AirSimPath=..\..\.." - -IF NOT EXIST "%AirSimPath%" ( - echo "AirSimPath %AirSimPath% was not found" - goto :failed -) - -echo Using AirSimPath = %AirSimPath% - -robocopy /MIR "%AirSimPath%\Unreal\Plugins\AirSim" Plugins\AirSim /XD temp *. /njh /njs /ndl /np -robocopy /MIR "%AirSimPath%\AirLib" Plugins\AirSim\Source\AirLib /XD temp *. /njh /njs /ndl /np -robocopy /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.bat -robocopy /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.sh -rem robocopy /njh /njs /ndl /np "%AirSimPath%" "." *.gitignore - -cmd /c clean.bat -cmd /c GenerateProjectFiles.bat - -goto :done - -:failed -echo Error occured while updating. -exit /b 1 - -:done -if "%1"=="" pause \ No newline at end of file diff --git a/Unreal/Environments/Blocks/update_from_git.sh b/Unreal/Environments/Blocks/update_from_git.sh deleted file mode 100755 index 5ffd1a0cef..0000000000 --- a/Unreal/Environments/Blocks/update_from_git.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/bash - -# get path of current script: https://stackoverflow.com/a/39340259/207661 -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -pushd "$SCRIPT_DIR" >/dev/null - -set -e -set -x - -./clean.sh - -rsync -a --exclude 'temp' --delete ../../Plugins/AirSim Plugins/ -rsync -a --exclude 'temp' --delete ../../../AirLib Plugins/AirSim/Source/ - -popd >/dev/null \ No newline at end of file diff --git a/Unreal/Environments/Blocks/update_from_git_ci.bat b/Unreal/Environments/Blocks/update_from_git_ci.bat deleted file mode 100644 index 58c565c838..0000000000 --- a/Unreal/Environments/Blocks/update_from_git_ci.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo off -REM //---------- set up variable ---------- -setlocal -set ROOT_DIR=%~dp0 - -set AirSimPath=%1 - -REM default path works for Blocks environment -if "%AirSimPath%"=="" set "AirSimPath=..\..\.." - -IF NOT EXIST "%AirSimPath%" ( - echo "AirSimPath %AirSimPath% was not found" - goto :failed -) - -echo Using AirSimPath = %AirSimPath% - -robocopy /MIR "%AirSimPath%\Unreal\Plugins\AirSim" Plugins\AirSim /XD temp *. /njh /njs /ndl /np -robocopy /MIR "%AirSimPath%\AirLib" Plugins\AirSim\Source\AirLib /XD temp *. /njh /njs /ndl /np -robocopy /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.bat -robocopy /njh /njs /ndl /np "%AirSimPath%\Unreal\Environments\Blocks" "." *.sh -rem robocopy /njh /njs /ndl /np "%AirSimPath%" "." *.gitignore - -REM cmd /c clean.bat -REM cmd /c GenerateProjectFiles.bat - -goto :done - -:failed -echo Error occured while updating. -exit /b 1 - -:done -REM if "%1"=="" pause \ No newline at end of file diff --git a/Unreal/Environments/Blocks/update_to_git.bat b/Unreal/Environments/Blocks/update_to_git.bat deleted file mode 100644 index 039954314b..0000000000 --- a/Unreal/Environments/Blocks/update_to_git.bat +++ /dev/null @@ -1,3 +0,0 @@ -robocopy /MIR Plugins\AirSim ..\..\Plugins\AirSim /XD temp Intermediate Binaries Saved *. /njh /njs /ndl /np -robocopy /MIR Plugins\AirSim\Source\AirLib ..\..\..\AirLib /XD temp Intermediate Binaries Saved *. /njh /njs /ndl /np -pause \ No newline at end of file diff --git a/Unreal/Environments/Blocks/update_to_git.sh b/Unreal/Environments/Blocks/update_to_git.sh deleted file mode 100755 index a1bcb0edec..0000000000 --- a/Unreal/Environments/Blocks/update_to_git.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/bash - - -# get path of current script: https://stackoverflow.com/a/39340259/207661 -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -pushd "$SCRIPT_DIR" >/dev/null - -set -e -set -x - -rsync -a --exclude 'temp' --delete Plugins/AirSim ../../Plugins/ -rsync -a --exclude 'temp' --delete Plugins/AirSim/Source/AirLib ../../../ - -popd >/dev/null -set +x