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

Merge pull request #1699 from Azaezel/alpha41/decalEd_pill

Browse source 
fix decal editor bounds and decalmanager raycast
This commit is contained in:
Brian Roberts 2026-03-24 19:04:58 -05:00 • committed by GitHub
commit 1ee72ff9bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/decal/decalManager.cpp
View file

@ -660,12 +660,14 @@ DecalInstance* DecalManager::raycast( const Point3F &start, const Point3F &end,
RayInfo ri; RayInfo ri;
bool containsPoint = false; bool containsPoint = false;
if ( gServerContainer.castRayRendered( start, end, STATIC_COLLISION_TYPEMASK, &ri ) ) if ( gServerContainer.castRayRendered( start, end, STATIC_COLLISION_TYPEMASK, &ri ) )
{ {
RectF rect = inst->mDataBlock->texRect[inst->mTextureRectIdx];
rect.extent *= inst->mSize * 0.5f;
Point2F poly[4]; Point2F poly[4];
poly[0].set( inst->mPosition.x - (inst->mSize / 2), inst->mPosition.y + (inst->mSize / 2)); poly[0].set(inst->mPosition.x - rect.extent.x, inst->mPosition.y + rect.extent.y);
poly[1].set( inst->mPosition.x - (inst->mSize / 2), inst->mPosition.y - (inst->mSize / 2)); poly[1].set( inst->mPosition.x - rect.extent.x, inst->mPosition.y - rect.extent.y);
poly[2].set( inst->mPosition.x + (inst->mSize / 2), inst->mPosition.y - (inst->mSize / 2)); poly[2].set( inst->mPosition.x + rect.extent.x, inst->mPosition.y - rect.extent.y);
poly[3].set( inst->mPosition.x + (inst->mSize / 2), inst->mPosition.y + (inst->mSize / 2)); poly[3].set( inst->mPosition.x + rect.extent.x, inst->mPosition.y + rect.extent.y);
if ( MathUtils::pointInPolygon( poly, 4, Point2F(ri.point.x, ri.point.y) ) ) if ( MathUtils::pointInPolygon( poly, 4, Point2F(ri.point.x, ri.point.y) ) )
containsPoint = true; containsPoint = true;

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

@ -516,11 +516,12 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
if ( gDecalManager->clipDecal( mSELDecal, &mSELEdgeVerts ) ) if ( gDecalManager->clipDecal( mSELDecal, &mSELEdgeVerts ) )
_renderDecalEdge( mSELEdgeVerts, ColorI( 255, 255, 255, 255 ) ); _renderDecalEdge( mSELEdgeVerts, ColorI( 255, 255, 255, 255 ) );
const F32 &decalSize = mSELDecal->mSize; const F32 &decalSize = mSELDecal->mSize * 0.5;
Point3F boxSize( decalSize, decalSize, decalSize ); Point3F boxSize( decalSize, decalSize, decalSize );
MatrixF worldMat( true ); MatrixF worldMat( true );
mSELDecal->getWorldMatrix( &worldMat, true ); mSELDecal->getWorldMatrix( &worldMat, true );
RectF rect = mSELDecal->mDataBlock->texRect[mSELDecal->mTextureRectIdx];
worldMat.scale(Point3F(rect.extent.x, rect.extent.y, 0.25f));
drawUtil->drawObjectBox( desc, boxSize, mSELDecal->mPosition, worldMat, ColorI( 255, 255, 255, 255 ) ); drawUtil->drawObjectBox( desc, boxSize, mSELDecal->mPosition, worldMat, ColorI( 255, 255, 255, 255 ) );
} }
@ -531,11 +532,13 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
if ( gDecalManager->clipDecal( mHLDecal, &mHLEdgeVerts ) ) if ( gDecalManager->clipDecal( mHLDecal, &mHLEdgeVerts ) )
_renderDecalEdge( mHLEdgeVerts, ColorI( 255, 255, 255, 255 ) ); _renderDecalEdge( mHLEdgeVerts, ColorI( 255, 255, 255, 255 ) );
const F32 &decalSize = mHLDecal->mSize; const F32 &decalSize = mHLDecal->mSize * 0.5;
Point3F boxSize( decalSize, decalSize, decalSize ); Point3F boxSize( decalSize, decalSize, decalSize );
MatrixF worldMat( true ); MatrixF worldMat( true );
mHLDecal->getWorldMatrix( &worldMat, true ); mHLDecal->getWorldMatrix( &worldMat, true );
RectF rect = mHLDecal->mDataBlock->texRect[mHLDecal->mTextureRectIdx];
worldMat.scale(Point3F(rect.extent.x, rect.extent.y, 0.25f));
drawUtil->drawObjectBox( desc, boxSize, mHLDecal->mPosition, worldMat, ColorI( 255, 255, 255, 255 ) ); drawUtil->drawObjectBox( desc, boxSize, mHLDecal->mPosition, worldMat, ColorI( 255, 255, 255, 255 ) );
} }