TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-02 11:05:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1410 from Azaezel/alpha41/wetMess

Browse source 
conform and correct gridsize
This commit is contained in:
Brian Roberts 2025-03-11 22:09:39 -05:00 • committed by GitHub
commit cb7e2920cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/environment/waterBlock.cpp
View file

@ -531,10 +531,10 @@ void WaterBlock::initPersistFields()
docsURL;
addGroup( "WaterBlock" );
addProtectedFieldV("gridSize", TypeRangedF32, Offset(mGridElementSize, WaterBlock), &setGridSizeProperty, &defaultProtectedGetFn, &CommonValidators::PositiveNonZeroFloat,
addProtectedFieldV("gridSize", TypeRangedS32, Offset(mGridElementSize, WaterBlock), &setGridSizeProperty, &defaultProtectedGetFn, &CommonValidators::NaturalNumber,
"Spacing between vertices in the WaterBlock mesh");
addProtectedFieldV("gridElementSize", TypeRangedF32, Offset(mGridElementSize, WaterBlock), &setGridSizeProperty, &defaultProtectedGetFn, &CommonValidators::PositiveNonZeroFloat,
addProtectedFieldV("gridElementSize", TypeRangedS32, Offset(mGridElementSize, WaterBlock), &setGridSizeProperty, &defaultProtectedGetFn, &CommonValidators::NaturalNumber,
"Duplicate of gridElementSize for backwards compatility");
Parent::initPersistFields();

2
Engine/source/environment/waterBlock.h
View file

@ -82,7 +82,7 @@ private:
GFXPrimitiveBufferHandle mRadialPrimBuff;
// misc
F32 mGridElementSize;
U32 mGridElementSize;
U32 mWidth;
U32 mHeight;
F32 mElapsedTime;

4
Engine/source/environment/waterPlane.cpp
View file

@ -122,10 +122,10 @@ void WaterPlane::initPersistFields()
docsURL;
addGroup( "WaterPlane" );
addProtectedFieldV( "gridSize", TypeRangedF32, Offset( mGridSize, WaterPlane ), &protectedSetGridSize, &defaultProtectedGetFn, &CommonValidators::PositiveNonZeroFloat,
addProtectedFieldV( "gridSize", TypeRangedS32, Offset( mGridSize, WaterPlane ), &protectedSetGridSize, &defaultProtectedGetFn, &CommonValidators::NaturalNumber,
"Spacing between vertices in the WaterBlock mesh" );
addProtectedFieldV( "gridElementSize", TypeRangedF32, Offset( mGridElementSize, WaterPlane ), &protectedSetGridElementSize, &defaultProtectedGetFn, &CommonValidators::PositiveNonZeroFloat,
addProtectedFieldV( "gridElementSize", TypeRangedS32, Offset( mGridElementSize, WaterPlane ), &protectedSetGridElementSize, &defaultProtectedGetFn, &CommonValidators::NaturalNumber,
"Duplicate of gridElementSize for backwards compatility");
endGroup( "WaterPlane" );