TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/environment/waterObject.h
View file

@ -45,6 +45,8 @@
#include "materials/matTextureTarget.h"
#endif
#include "T3D/assets/ImageAsset.h"
GFXDeclareVertexFormat( GFXWaterVertex )
{
Point3F point;
@ -200,6 +202,10 @@ protected:
/// Callback used internally when smDisableTrueReflections changes.
void _onDisableTrueRelfections();
void onRippleTexChanged() {}
void onFoamTexChanged() {}
void onDepthGradientTexChanged() {}
protected:
static bool _setFullReflect( void *object, const char *index, const char *data );
@ -266,10 +272,14 @@ protected:
F32 mDepthGradientMax;
// Other textures
String mRippleTexName;
String mFoamTexName;
String mCubemapName;
String mDepthGradientTexName;
DECLARE_IMAGEASSET(WaterObject, RippleTex, onRippleTexChanged, GFXStaticTextureProfile);
DECLARE_IMAGEASSET_NET_SETGET(WaterObject, RippleTex, TextureMask);
DECLARE_IMAGEASSET(WaterObject, FoamTex, onFoamTexChanged, GFXStaticTextureSRGBProfile);
DECLARE_IMAGEASSET_NET_SETGET(WaterObject, FoamTex, TextureMask);
DECLARE_IMAGEASSET(WaterObject, DepthGradientTex, onDepthGradientTexChanged, GFXStaticTextureSRGBProfile);
DECLARE_IMAGEASSET_NET_SETGET(WaterObject, DepthGradientTex, TextureMask);
StringTableEntry mCubemapName;
// Sound
SFXAmbience* mSoundAmbience;
@ -309,9 +319,6 @@ protected:
WaterMatParams mMatParamHandles[NumMatTypes];
bool mUnderwater;
GFXStateBlockRef mUnderwaterSB;
GFXTexHandle mRippleTex;
GFXTexHandle mDepthGradientTex;
GFXTexHandle mFoamTex;
CubemapData *mCubemap;
MatrixSet *mMatrixSet;
NamedTexTarget mNamedDepthGradTex;