TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squashed commit of the following:

Browse source 
commit 678d0ea2357915c6502af90083f1d34b6b21b7b4
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 20:46:15 2023 -0700

    Removed some commented-out code

commit 4a149157f7a7b781e2246b1417b144625ff559cd
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 20:42:03 2023 -0700

    Remove un-used instance of the blendHardness var

commit e5dc42adef00ed371cbc89b731ae16889ba68d9a
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 18:57:51 2023 -0700

    Cleanup un-needed conditionals and other leftover code

commit dccd10010e058f00cd41f5c5c111443f9cb71721
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 18:05:31 2023 -0700

    Use validator instead of protected field (2)

commit 4cc7f1d32fcc6ab788de54bb38763283fbd5533e
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 18:03:40 2023 -0700

    Use validator instead of protected field

commit e8d7e1731e383a99e8a0539d23a3b04f9c252491
Author: AtomicWalrus <headlesschickens.inc@gmail.com>
Date:   Mon Feb 20 15:34:48 2023 -0700

    Terrain macro textures and blending hardness
This commit is contained in:
AtomicWalrus 2023-02-20 20:47:46 -07:00
parent 2d946f693a
commit 13fec9bb80
10 changed files with 333 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/terrain/terrCellMaterial.h
View file

@ -59,7 +59,7 @@ protected:
public:
MaterialInfo()
:mat(NULL), layerId(0), mBlendDepthConst(NULL), mBlendContrastConst(NULL)
:mat(NULL), layerId(0), mBlendDepthConst(NULL), mBlendContrastConst(NULL), mBlendHardnessConst(NULL)
{
}
@ -71,6 +71,7 @@ protected:
U32 layerId;
GFXShaderConstHandle *mBlendDepthConst;
GFXShaderConstHandle *mBlendContrastConst;
GFXShaderConstHandle* mBlendHardnessConst;
};
///
@ -119,6 +120,7 @@ protected:
GFXShaderConstHandle *mOrmTexArrayConst;
GFXShaderConstHandle* mBlendDepthConst;
GFXShaderConstHandle* mBlendHeightFloorConst;
TerrainBlock *mTerrain;