Update source to 4.8 compatible

marynate · Aug 1, 2015 · fa9a662 · fa9a662
1 parent b6929b4
commit fa9a662
Show file tree

Hide file tree

Showing 15 changed files with 173 additions and 235 deletions.
diff --git a/FluidSurface/FluidSurface.uplugin b/FluidSurface/FluidSurface.uplugin
@@ -2,13 +2,14 @@
     "PluginFileVersion" : 3,
 
 	"FriendlyName" : "Fluid Surface Actor",
-	"Version" : 8,
-	"VersionName" : "0.1.0",
+	"Version" : 9,
+	"VersionName" : "0.1.2",
 	"CreatedBy" : "Ehamloptiran",
 	"CreatedByURL" : "[email protected]",
-	"EngineVersion" : 1579795,
+	"EngineVersion" : "4.8.0",
 	"Description" : "Simulated fluid surface actor",
-	"Category" : "Programming Rendering.Plugins",
+	"Category" : "Rendering",
+	"EnabledByDefault" : true,
 
     "Modules" :
 	[

diff --git a/FluidSurface/Source/FluidSurface/Private/FluidSurface.cpp b/FluidSurface/Source/FluidSurface/Private/FluidSurface.cpp
@@ -2,7 +2,7 @@
 
 #include "FluidSurfacePrivatePCH.h"
 
-class FFluidSurface : public IFluidSurface
+class FFluidSurface : public IModuleInterface
 {
 	/** IModuleInterface implementation */
 	virtual void StartupModule( ) override;

diff --git a/FluidSurface/Source/FluidSurface/Private/FluidSurfaceActor.cpp b/FluidSurface/Source/FluidSurface/Private/FluidSurfaceActor.cpp
@@ -1,9 +1,9 @@
 
 #include "FluidSurfacePrivatePCH.h"
 
-AFluidSurfaceActor::AFluidSurfaceActor( const class FPostConstructInitializeProperties& PCIP )
-	: Super( PCIP )
+AFluidSurfaceActor::AFluidSurfaceActor(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
 {
-	FluidSurfaceComponent = PCIP.CreateDefaultSubobject<UFluidSurfaceComponent>( this, TEXT( "FluidSurfaceComponent0" ) );
+	FluidSurfaceComponent = CreateDefaultSubobject<UFluidSurfaceComponent>(TEXT("FluidSurfaceComponent0"));
 	RootComponent = FluidSurfaceComponent;
 }
diff --git a/FluidSurface/Source/FluidSurface/Private/FluidSurfaceComponent.cpp b/FluidSurface/Source/FluidSurface/Private/FluidSurfaceComponent.cpp
@@ -18,8 +18,8 @@ inline bool UsingLowDetail( )
 	return ( Ret == 0 );
 }
 
-UFluidSurfaceComponent::UFluidSurfaceComponent( const FPostConstructInitializeProperties& PCIP )
-	: Super( PCIP )
+UFluidSurfaceComponent::UFluidSurfaceComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
 {
 	PrimaryComponentTick.bCanEverTick = true;
 	bTickInEditor = true;
@@ -143,7 +143,7 @@ void UFluidSurfaceComponent::Init( )
 	p.Z = FLUIDBOXHEIGHT;
 	FluidBoundingBox += p;
 
-	PLingBuffer.Init( MAX_FLUID_PLINGS );
+	PLingBuffer.SetNumUninitialized(MAX_FLUID_PLINGS);
 	NumPLing = 0;
 
 	if( RenderData )
@@ -241,7 +241,7 @@ void UFluidSurfaceComponent::TickComponent( float DeltaTime, enum ELevelTick Tic
 #endif
 
 	/* If this water hasn't been rendered for a while, stop updating */
-	if( GetWorld( )->TimeSeconds - LastRenderTime > 1 )
+	if (LastRenderTime > 0 && GetWorld()->TimeSeconds - LastRenderTime > 1)
 		return;
 
 	Time += DeltaTime;
@@ -257,7 +257,7 @@ void UFluidSurfaceComponent::TickComponent( float DeltaTime, enum ELevelTick Tic
 		CollisionShape.SetBox( FluidBoundingBox.GetExtent( ) );
 
 		/* Find overlapping actors */
-		GetWorld( )->OverlapMulti( OverlappingActors, GetComponentLocation( ), GetComponentQuat( ), ECC_WorldDynamic, CollisionShape, FCollisionQueryParams( false ) );
+		GetWorld()->OverlapMultiByChannel(OverlappingActors, GetComponentLocation(), GetComponentQuat(), ECC_WorldDynamic, CollisionShape, FCollisionQueryParams(false));
 
 		// @todo: handle better
 
@@ -354,7 +354,7 @@ void UFluidSurfaceComponent::UpdateBody( )
 	if( BodySetup == NULL )
 	{
 		/* Create physics body */
-		BodySetup = ConstructObject<UBodySetup>( UBodySetup::StaticClass( ), this );
+		BodySetup = NewObject<UBodySetup>(this, UBodySetup::StaticClass());
 	}
 
 	BodySetup->AggGeom.EmptyElements( );

diff --git a/FluidSurface/Source/FluidSurface/Private/FluidSurfacePrivatePCH.h b/FluidSurface/Source/FluidSurface/Private/FluidSurfacePrivatePCH.h
@@ -3,7 +3,6 @@
 #include "CoreUObject.h"
 #include "Engine.h"
 
-#include "IFluidSurface.h"
 #include "FluidSurfaceEngine.h"
 #include "FluidSurfaceActor.h"
 #include "FluidSurfaceComponent.h"