Skip to content

Commit

Permalink
4.8 update
Browse files Browse the repository at this point in the history
  • Loading branch information
tk-master committed Jun 26, 2015
1 parent acd8cb5 commit 0769c4b
Show file tree
Hide file tree
Showing 105 changed files with 260 additions and 2,374 deletions.
Binary file modified Binaries/Win64/UE4Editor-OceanProject.dll
Binary file not shown.
91 changes: 47 additions & 44 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,6 @@ AppliedTargetedHardwareClass=Desktop
DefaultGraphicsPerformance=Maximum
AppliedDefaultGraphicsPerformance=Maximum

[/Script/Engine.RendererSettings]
r.MobileHDR=True
r.AllowOcclusionQueries=True
r.MinScreenRadiusForLights=0.030000
r.MinScreenRadiusForDepthPrepass=0.030000
r.PrecomputedVisibilityWarning=False
r.TextureStreaming=True
Compat.UseDXT5NormalMaps=False
r.AllowStaticLighting=True
r.NormalMapsForStaticLighting=False
r.GBuffer=True
r.GenerateMeshDistanceFields=False
r.Shadow.DistanceFieldPenumbraSize=0.050000
r.TessellationAdaptivePixelsPerTriangle=48.000000
r.SeparateTranslucency=True
r.TranslucentSortPolicy=0
TranslucentSortAxis=(X=0.000000,Y=-1.000000,Z=0.000000)
r.CustomDepth=1
r.DefaultFeature.Bloom=True
r.DefaultFeature.AmbientOcclusion=True
r.DefaultFeature.AmbientOcclusionStaticFraction=True
r.DefaultFeature.AutoExposure=True
r.DefaultFeature.MotionBlur=False
r.DefaultFeature.LensFlare=True
r.DefaultFeature.AntiAliasing=1
r.EarlyZPass=3
r.EarlyZPassMovable=False
r.DBuffer=False
r.ClearSceneMethod=1
r.WireframeCullThreshold=5.000000
UIScaleRule=ShortestSide
UIScaleCurve=(EditorCurveData=(Keys=),ExternalCurve=None)

[/Script/Engine.UserInterfaceSettings]
RenderFocusRule=NavigationOnly
DefaultCursor=None
TextEditBeamCursor=None
CrosshairsCursor=None
GrabHandCursor=None
GrabHandClosedCursor=None
SlashedCircleCursor=None
UIScaleRule=Vertical
UIScaleCurve=(EditorCurveData=(Keys=((Time=1080.000000,Value=1.000000))),ExternalCurve=None)

[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Maps/OceanExampleMap_01
LocalMapOptions=
Expand Down Expand Up @@ -86,4 +42,51 @@ InitialAverageFrameRate=0.016667
+PhysicalSurfaces=(Type=SurfaceType2,Name="Wood")
+PhysicalSurfaces=(Type=SurfaceType3,Name="Metal")

[/Script/Engine.UserInterfaceSettings]
RenderFocusRule=NavigationOnly
DefaultCursor=None
TextEditBeamCursor=None
CrosshairsCursor=None
GrabHandCursor=None
GrabHandClosedCursor=None
SlashedCircleCursor=None
ApplicationScale=1.000000
UIScaleRule=Vertical
CustomScalingRuleClass=None
UIScaleCurve=(EditorCurveData=(Keys=((Time=1080.000000,Value=1.000000))),ExternalCurve=None)

[/Script/Engine.RendererSettings]
r.MobileHDR=True
r.AllowOcclusionQueries=True
r.MinScreenRadiusForLights=0.030000
r.MinScreenRadiusForDepthPrepass=0.030000
r.PrecomputedVisibilityWarning=False
r.TextureStreaming=True
Compat.UseDXT5NormalMaps=False
r.AllowStaticLighting=True
r.NormalMapsForStaticLighting=False
r.GenerateMeshDistanceFields=False
r.GenerateLandscapeGIData=True
r.Shadow.DistanceFieldPenumbraSize=0.050000
r.TessellationAdaptivePixelsPerTriangle=48.000000
r.SeparateTranslucency=True
r.TranslucentSortPolicy=0
TranslucentSortAxis=(X=0.000000,Y=-1.000000,Z=0.000000)
r.CustomDepth=1
r.DefaultFeature.Bloom=True
r.DefaultFeature.AmbientOcclusion=True
r.DefaultFeature.AmbientOcclusionStaticFraction=True
r.DefaultFeature.AutoExposure=True
r.DefaultFeature.MotionBlur=False
r.DefaultFeature.LensFlare=True
r.DefaultFeature.AntiAliasing=1
r.EarlyZPass=3
r.EarlyZPassMovable=False
r.DBuffer=False
r.ClearSceneMethod=1
r.BasePassOutputsVelocity=False
r.WireframeCullThreshold=5.000000
UIScaleRule=ShortestSide
UIScaleCurve=(EditorCurveData=(Keys=),ExternalCurve=None)


2 changes: 1 addition & 1 deletion Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LicensingTerms=
PrivacyPolicy=
ProjectID=913F4FCC458BBAD626E4FFB294689B16
ProjectName=OceanProject
ProjectVersion=4.7
ProjectVersion=4.8
SupportContact=
ProjectDisplayedTitle=Ocean Project

Expand Down
Binary file removed Content/Assets/NewMaterial.uasset
Binary file not shown.
Binary file removed Content/Assets/Sand/Sand.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Content/Blueprints/Underwater_Life/BP_FishManage.uasset
Binary file not shown.
Binary file not shown.
Binary file removed Content/Game/BP_DefaultPawn.uasset
Binary file not shown.
Binary file removed Content/Game/BP_GameMode.uasset
Binary file not shown.
Binary file modified Content/Maps/OceanExampleMap_01.umap
Binary file not shown.
Binary file modified Content/Maps/OceanExampleMap_02.umap
Binary file not shown.
Binary file modified Content/Maps/StressTest.umap
Binary file not shown.
Binary file modified Content/Maps/UnderwaterFish.umap
Binary file not shown.
Binary file removed Content/NewMaterial.uasset
Binary file not shown.
Binary file modified Content/Ocean/BP_Ocean.uasset
Binary file not shown.
Binary file added Content/Ocean/Materials/Caustics_tex.uasset
Binary file not shown.
Binary file modified Content/Ocean/Materials/MPC_Ocean.uasset
Binary file not shown.
Binary file modified Content/Ocean/Materials/M_Caustics_LF.uasset
Binary file not shown.
Binary file modified Content/Ocean/Materials/M_Caustics_LF_Inst.uasset
Binary file not shown.
Binary file not shown.
Binary file removed Content/Ocean/Materials/M_Ocean.uasset
Binary file not shown.
Binary file removed Content/Ocean/Materials/M_Ocean_Depth.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Content/Ocean/Materials/TextureUV.uasset
Binary file not shown.
Binary file modified Content/Ocean/Meshes/HarborBuoy.uasset
Binary file not shown.
Binary file added Content/Ocean/Meshes/SM_OceanPlaneFar.uasset
Binary file not shown.
Binary file not shown.
Binary file added Content/Ocean/OceanShaderEnum.uasset
Binary file not shown.
Binary file modified Content/Ocean/Textures/T_Foam_normal.uasset
Binary file not shown.
Binary file not shown.
Binary file modified Content/ShipsAndExamples/Assets/Misc/Mat_Glass.uasset
Binary file not shown.
Binary file modified Content/ShipsAndExamples/BP_Boat.uasset
Binary file not shown.
Binary file modified Content/ShipsAndExamples/Cannonz/BP_Cannon.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/ShipsAndExamples/ManOfWar/BP_ManOfWar.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/ShipsAndExamples/SFX/OceanWavesCue.uasset
Binary file not shown.
Binary file modified Content/ShipsAndExamples/UI/Chatbox/ChatboxWidget.uasset
Binary file not shown.
Binary file modified Content/ShipsAndExamples/UI/InterractionWidget.uasset
Binary file not shown.
Binary file modified Content/Sky/BP_Skydome.uasset
Binary file not shown.
2 changes: 1 addition & 1 deletion OceanProject.uproject
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.7",
"EngineAssociation": "4.8",
"Category": "",
"Description": "",
"Modules": [
Expand Down
Binary file not shown.
Binary file modified Plugins/OceanPlugin/Binaries/Win64/UE4Editor-OceanPlugin.dll
Binary file not shown.
6 changes: 3 additions & 3 deletions Plugins/OceanPlugin/OceanPlugin.uplugin
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"FileVersion" : 3,
"FriendlyName" : "DC Ocean Plugin",
"FriendlyName" : "Ocean Project Plugin",
"Version" : 1,
"VersionName": "1.0",
"EngineVersion" : "4.7.3",
"EngineVersion" : "4.8",
"Description" : "Provides the code base classes for the ocean system.",
"Category" : "Ocean.OceanPlugin",
"Category" : "Ocean",
"CreatedBy" : "DotCam",
"CreatedByURL" : "https://forums.unrealengine.com/showthread.php?42092-Community-Project-WIP-Weather-amp-Ocean-Water-Shader",
"CanContainContent" : "true",
Expand Down
Binary file modified Plugins/OceanPlugin/Resources/Icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Plugins/OceanPlugin/Resources/Thumbs.db
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ class ACustomVehicleController : public APlayerController

//--Custom debugging console commands--

UFUNCTION(exec, BlueprintImplementableEvent, meta = (FriendlyName = "Console Command ~ nogerstrnershader"))
virtual void noGerstnerShader();

UFUNCTION(exec)
virtual void noGerstner();
//UFUNCTION(exec, BlueprintImplementableEvent, meta = (DisplayName = "Console Command ~ enableoceanssr"))
//virtual void EnableOceanSSR();

UFUNCTION(exec)
virtual void DrawBuoyancyPoints();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#pragma once

#include "OceanPluginPrivatePCH.h"
#include "InfiniteSystemComponent.generated.h"

UENUM()
enum EFollowMethod
{
LookAtLocation,
FollowCamera,
FollowPawn,
Stationary
};

/**
* Infinite Ocean Plane System.
* Follows camera and scales by distance to make a plane appear as infinite.
*/
UCLASS(hidecategories=(Object, Mobility, LOD), ClassGroup=Physics, showcategories=Trigger, MinimalAPI, meta=(BlueprintSpawnableComponent))
class UInfiniteSystemComponent : public USceneComponent
{
GENERATED_UCLASS_BODY()

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
bool UpdateInEditor;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
TEnumAsByte<enum EFollowMethod> FollowMethod;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float GridSnapSize;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float MaxLookAtDistance;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
bool ScaleByDistance;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float ScaleDistanceFactor;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float ScaleStartDistance;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float ScaleMin;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Settings")
float ScaleMax;

virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction) override;
};

This file was deleted.

Loading

0 comments on commit 0769c4b

Please sign in to comment.