4.12 Planar Reflections Test

- Plugin compiled for 4.12 preview 3 - WARNING: Fish Flocking is not currently operational. 4.12 caused breaking changes to the code, will need to be fixed in a later build. - Removed SSR from the Ocean_Ultra material - Implemented Planar Reflections as a component of the BP_Ocean blueprint - Minor adjustments made to the overall look as it changed the color and specular lighting. Still WIP - Early birds only!
L4M0S · May 10, 2016 · 22a9518 · 22a9518
1 parent 22b5390
commit 22a9518
Show file tree

Hide file tree

Showing 14 changed files with 173 additions and 31 deletions.
diff --git a/Binaries/Win64/OceanProjectEditor.target b/Binaries/Win64/OceanProjectEditor.target
@@ -6,92 +6,232 @@
 	"Version" : 
 	{
 		"MajorVersion" : 4,
-		"MinorVersion" : 11,
-		"PatchVersion" : 2,
-		"Changelist" : 2946394,
+		"MinorVersion" : 12,
+		"PatchVersion" : 0,
+		"Changelist" : 2970308,
 		"IsLicenseeVersion" : 0,
-		"BranchName" : "++UE4+Release-4.11"
+		"BranchName" : "++UE4+Release-4.12"
 	},
 	"BuildProducts" :
 	[
 		{
-			"Path" : "$(ProjectDir)\\Plugins\\OceanPlugin\\Binaries\\Win64\\UE4Editor-OceanPlugin.dll",
+			"Path" : "$(ProjectDir)/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.dll",
 			"Type" : "DynamicLibrary"
 		},
 		{
-			"Path" : "$(ProjectDir)\\Plugins\\OceanPlugin\\Binaries\\Win64\\UE4Editor-OceanPlugin.pdb",
+			"Path" : "$(ProjectDir)/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.pdb",
 			"Type" : "SymbolFile"
 		},
 		{
-			"Path" : "$(ProjectDir)\\Plugins\\OceanPlugin\\Intermediate\\Build\\Win64\\UE4Editor\\Development\\UE4Editor-OceanPlugin.lib",
+			"Path" : "$(ProjectDir)/Plugins/OceanPlugin/Intermediate/Build/Win64/UE4Editor/Development/UE4Editor-OceanPlugin.lib",
 			"Type" : "ImportLibrary"
 		},
 		{
-			"Path" : "$(ProjectDir)\\Binaries\\Win64\\UE4Editor-OceanProject.dll",
+			"Path" : "$(ProjectDir)/Binaries/Win64/UE4Editor-OceanProject.dll",
 			"Type" : "DynamicLibrary"
 		},
 		{
-			"Path" : "$(ProjectDir)\\Binaries\\Win64\\UE4Editor-OceanProject.pdb",
+			"Path" : "$(ProjectDir)/Binaries/Win64/UE4Editor-OceanProject.pdb",
 			"Type" : "SymbolFile"
 		},
 		{
-			"Path" : "$(ProjectDir)\\Intermediate\\Build\\Win64\\UE4Editor\\Development\\UE4Editor-OceanProject.lib",
+			"Path" : "$(ProjectDir)/Intermediate/Build/Win64/UE4Editor/Development/UE4Editor-OceanProject.lib",
 			"Type" : "ImportLibrary"
 		}
 	],
 	"RuntimeDependencies" :
 	[
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3PROFILE_x64.dll"
+			"Path" : "$(ProjectDir)/OceanProject.uproject",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(ProjectDir)/Plugins/OceanPlugin/OceanPlugin.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/2D/Paper2D/Paper2D.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Blendables/LightPropagationVolume/LightPropagationVolume.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Developer/GitSourceControl/GitSourceControl.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Developer/PerforceSourceControl/PerforceSourceControl.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Developer/SubversionSourceControl/SubversionSourceControl.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Developer/UObjectPlugin/UObjectPlugin.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Developer/VisualStudioSourceCodeAccess/VisualStudioSourceCodeAccess.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Editor/EpicSurvey/EpicSurvey.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Editor/PluginBrowser/PluginBrowser.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Editor/SpeedTreeImporter/SpeedTreeImporter.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Editor/SuperSearchEditor/SuperSearchEditor.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Experimental/CharacterAI/CharacterAI.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Experimental/HTML5Networking/HTML5Networking.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Media/MediaPlayerEditor/MediaPlayerEditor.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Media/WmfMedia/WmfMedia.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Messaging/UdpMessaging/UdpMessaging.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/MovieScene/LevelSequenceEditor/LevelSequenceEditor.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/MovieScene/MatineeToLevelSequence/MatineeToLevelSequence.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/ArchVisCharacter/ArchVisCharacter.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/CableComponent/CableComponent.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/CustomMeshComponent/CustomMeshComponent.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/ExampleDeviceProfileSelector/ExampleDeviceProfileSelector.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/OculusInput/OculusInput.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/OculusLibrary/OculusLibrary.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/OculusRift/OculusRift.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/ProceduralMeshComponent/ProceduralMeshComponent.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/Steam/SteamVR/SteamVR.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Runtime/WindowsMoviePlayer/WindowsMoviePlayer.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Plugins/Slate/SlateRemote/SlateRemote.uplugin",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Content/Slate/...",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(ProjectDir)/Content/Slate/...",
+			"Type" : "UFS"
+		},
+		{
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3PROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3PROFILE_x64.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CommonPROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CommonPROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CommonPROFILE_x64.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CookingPROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CookingPROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/PhysX3CookingPROFILE_x64.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/nvToolsExt64_1.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/PhysX-3.3/Win64/VS2015/nvToolsExt64_1.dll",
+			"Type" : "NonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_ClothingPROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_ClothingPROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_ClothingPROFILE_x64.dll.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_DestructiblePROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_DestructiblePROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_DestructiblePROFILE_x64.dll.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_LegacyPROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_LegacyPROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/APEX_LegacyPROFILE_x64.dll.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		},
 		{
-			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/ApexFrameworkPROFILE_x64.dll"
+			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/ApexFrameworkPROFILE_x64.dll",
+			"Type" : "NonUFS"
 		},
 		{
 			"Path" : "$(EngineDir)/Binaries/ThirdParty/PhysX/APEX-1.3/Win64/VS2015/ApexFrameworkPROFILE_x64.dll.pdb",
-			"IgnoreIfMissing" : true
+			"Type" : "DebugNonUFS"
 		}
 	]
 }
diff --git a/Binaries/Win64/UE4Editor-OceanProject.dll b/Binaries/Win64/UE4Editor-OceanProject.dll
diff --git a/Binaries/Win64/UE4Editor.modules b/Binaries/Win64/UE4Editor.modules
@@ -1,5 +1,5 @@
 {
-	"Changelist" : 2946394,
+	"Changelist" : 2970308,
 	"BuildId" : "",
 	"Modules" : 
 	{

diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
@@ -62,6 +62,7 @@ r.BasePassOutputsVelocity=True
 r.WireframeCullThreshold=5.000000
 UIScaleRule=ShortestSide
 UIScaleCurve=(EditorCurveData=(Keys=),ExternalCurve=None)
+r.AllowGlobalClipPlane=True
 
 [/Script/EngineSettings.GameMapsSettings]
 EditorStartupMap=/Game/Maps/IslandMap
@@ -84,6 +85,7 @@ RenderFocusRule=NavigationOnly
 DefaultCursor=None
 TextEditBeamCursor=None
 CrosshairsCursor=None
+HandCursor=None
 GrabHandCursor=None
 GrabHandClosedCursor=None
 SlashedCircleCursor=None

diff --git a/Content/Maps/IslandMap.umap b/Content/Maps/IslandMap.umap
diff --git a/Content/Ocean/BP_Ocean.uasset b/Content/Ocean/BP_Ocean.uasset
diff --git a/Content/Ocean/Materials/M_Ocean_Versions/M_Ocean_Ultra.uasset b/Content/Ocean/Materials/M_Ocean_Versions/M_Ocean_Ultra.uasset
diff --git a/OceanProject.uproject b/OceanProject.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.11",
+	"EngineAssociation": "4.12",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.dll b/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.dll
diff --git a/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.pdb b/Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.pdb
diff --git a/Plugins/OceanPlugin/Binaries/Win64/UE4Editor.modules b/Plugins/OceanPlugin/Binaries/Win64/UE4Editor.modules
@@ -1,5 +1,5 @@
 {
-	"Changelist" : 2946394,
+	"Changelist" : 2970308,
 	"BuildId" : "",
 	"Modules" : 
 	{

diff --git a/Plugins/OceanPlugin/Source/OceanPlugin/OceanPlugin.Build.cs b/Plugins/OceanPlugin/Source/OceanPlugin/OceanPlugin.Build.cs
@@ -5,7 +5,7 @@ public class OceanPlugin : ModuleRules
 {
     private string ModulePath
     {
-        get { return Path.GetDirectoryName(RulesCompiler.GetModuleFilename(this.GetType().Name)); }
+        get { return Path.GetDirectoryName(ModuleDirectory); }
     }
 
     private string ThirdPartyPath

diff --git a/Plugins/OceanPlugin/Source/OceanPlugin/Private/Fish/FlockFish.cpp b/Plugins/OceanPlugin/Source/OceanPlugin/Private/Fish/FlockFish.cpp
@@ -34,8 +34,8 @@ AFlockFish::AFlockFish(const FObjectInitializer& ObjectInitializer) : Super(Obje
 	FishInteractionSphere = ObjectInitializer.CreateDefaultSubobject<USphereComponent>(this, TEXT("FishInteractionSphere"));
 	FishInteractionSphere->SetSphereRadius(10);
 	FishInteractionSphere->AttachTo(RootComponent);
-	FishInteractionSphere->OnComponentBeginOverlap.AddDynamic(this, &AFlockFish::OnBeginOverlap);
-	FishInteractionSphere->OnComponentEndOverlap.AddDynamic(this, &AFlockFish::OnEndOverlap);
+	//FishInteractionSphere->OnComponentBeginOverlap.AddDynamic(this, &AFlockFish::OnBeginOverlap);
+	//FishInteractionSphere->OnComponentEndOverlap.AddDynamic(this, &AFlockFish::OnEndOverlap);
 
 	if (isLeader == true)
 	{

diff --git a/Saved/AutoScreenshot.png b/Saved/AutoScreenshot.png