TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 12:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1554 from Azaezel/alpha41/decalAtlasWipWork

Browse source 
decal atlas and decal editor corrections
This commit is contained in:
Brian Roberts 2025-09-22 08:49:42 -05:00 • committed by GitHub
commit eb380e58a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 68 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gui/worldEditor/guiDecalEditorCtrl.cpp
View file

@ -854,7 +854,7 @@ DefineEngineMethod( GuiDecalEditorCtrl, selectDecal, void, ( U32 id ), , "select
object->selectDecal( decalInstance );
}
DefineEngineMethod( GuiDecalEditorCtrl, editDecalDetails, void, ( U32 id, Point3F pos, Point3F tan,F32 size ), , "editDecalDetails( S32 )()" )
DefineEngineMethod( GuiDecalEditorCtrl, editDecalDetails, void, ( U32 id, Point3F pos, Point3F tan, F32 size, S32 uvID), , "editDecalDetails( S32,Point3F,Point3F,F32,S32 )()" )
{
DecalInstance *decalInstance = gDecalManager->mDecalInstanceVec[id];
if( decalInstance == NULL )
@ -864,7 +864,8 @@ DefineEngineMethod( GuiDecalEditorCtrl, editDecalDetails, void, ( U32 id, Point3
decalInstance->mPosition = pos;
decalInstance->mTangent = tan;
decalInstance->mSize = size;
decalInstance->mTextureRectIdx = uvID;
if ( decalInstance == object->mSELDecal )
object->setGizmoFocus( decalInstance );
@ -873,6 +874,11 @@ DefineEngineMethod( GuiDecalEditorCtrl, editDecalDetails, void, ( U32 id, Point3
gDecalManager->notifyDecalModified( decalInstance );
}
DefineEngineMethod(GuiDecalEditorCtrl, getDecalFrame, S32, (U32 id), , "")
{
return gDecalManager->mDecalInstanceVec[id]->mTextureRectIdx;
}
DefineEngineMethod( GuiDecalEditorCtrl, getSelectionCount, S32, (), , "" )
{
if ( object->mSELDecal != NULL )