TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-02 19:16:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/development' into development

Browse source
This commit is contained in:
marauder2k7 2026-04-05 12:50:23 +01:00
commit fcbb72866c
8 changed files with 55 additions and 23 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;
bool containsPoint = false;
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];
poly[0].set( inst->mPosition.x - (inst->mSize / 2), inst->mPosition.y + (inst->mSize / 2));
poly[1].set( inst->mPosition.x - (inst->mSize / 2), inst->mPosition.y - (inst->mSize / 2));
poly[2].set( inst->mPosition.x + (inst->mSize / 2), inst->mPosition.y - (inst->mSize / 2));
poly[3].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 - rect.extent.x, inst->mPosition.y - rect.extent.y);
poly[2].set( inst->mPosition.x + rect.extent.x, inst->mPosition.y - rect.extent.y);
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) ) )
containsPoint = true;

5
Engine/source/T3D/projectile.cpp
View file

@ -873,11 +873,8 @@ bool Projectile::onAdd()
}
}
if (mSourceObject.isValid())
{
processAfter(mSourceObject);
if (isClientObject())
mSourceObject->getRenderMuzzlePoint(mSourceObjectSlot, &mCurrPosition);
}
// Setup our bounding box
if (bool(mDataBlock->getProjectileShape()) == true)
mObjBox = mDataBlock->getProjectileShape()->mBounds;

14
Engine/source/T3D/shapeBase.cpp
View file

@ -1164,13 +1164,6 @@ void ShapeBase::onRemove()
{
mConvexList->nukeList();
Parent::onRemove();
// Stop any running sounds on the client
if (isGhost())
for (S32 i = 0; i < MaxSoundThreads; i++)
stopAudio(i);
// Accumulation and environment mapping
if (isClientObject() && mShapeInstance)
{
@ -1178,6 +1171,13 @@ void ShapeBase::onRemove()
AccumulationVolume::removeObject(this);
}
Parent::onRemove();
// Stop any running sounds on the client
if (isGhost())
for (S32 i = 0; i < MaxSoundThreads; i++)
stopAudio(i);
if ( isClientObject() )
{
if (mCubeReflector)

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

@ -516,11 +516,12 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
if ( gDecalManager->clipDecal( mSELDecal, &mSELEdgeVerts ) )
_renderDecalEdge( mSELEdgeVerts, ColorI( 255, 255, 255, 255 ) );
const F32 &decalSize = mSELDecal->mSize;
const F32 &decalSize = mSELDecal->mSize * 0.5;
Point3F boxSize( decalSize, decalSize, decalSize );
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 ) );
}
@ -531,11 +532,13 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
if ( gDecalManager->clipDecal( mHLDecal, &mHLEdgeVerts ) )
_renderDecalEdge( mHLEdgeVerts, ColorI( 255, 255, 255, 255 ) );
const F32 &decalSize = mHLDecal->mSize;
const F32 &decalSize = mHLDecal->mSize * 0.5;
Point3F boxSize( decalSize, decalSize, decalSize );
MatrixF 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 ) );
}

8
Engine/source/ts/tsShapeInstance.cpp
View file

@ -239,8 +239,11 @@ void TSShapeInstance::initMeshObjects()
void TSShapeInstance::setMaterialList( TSMaterialList *matList )
{
// get rid of old list
if ( mOwnMaterialList )
if (mOwnMaterialList)
{
delete mMaterialList;
mMaterialList = NULL;
}
mMaterialList = matList;
mOwnMaterialList = false;
@ -891,6 +894,9 @@ void TSShapeInstance::prepCollision()
// Returns true is the shape contains any materials with accumulation enabled.
bool TSShapeInstance::hasAccumulation()
{
if (!mOwnMaterialList || mMaterialList == NULL)
return false;
bool result = false;
for ( U32 i = 0; i < mMaterialList->size(); ++i )
{

2
Templates/BaseGame/game/main.tscript.in
View file

@ -9,7 +9,7 @@ trace(false);
// Set the name of our application
$appName = "@TORQUE_APP_NAME@";
echo("\nInitializing" SPC $appName SPC "["@getAppVersionString()@"] [Engine Version:"@getVersionString()@"]\n");
//-----------------------------------------------------------------------------
// Load up scripts to initialise subsystems.
ModuleDatabase.setModuleExtension("module");

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript
View file

@ -120,7 +120,7 @@ function VerveEditor::CreateField( %targetStack, %fieldName, %fieldType )
};
%fieldContainer.add( %fieldLabel );
if ( isMethod( "VerveEditor", "Create" @ %fieldType @ "Field" ) )
if ( (%fieldType !$= "") && (isMethod( "VerveEditor", "Create" @ %fieldType @ "Field" ) ))
{
// Create the Input Control.
%fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field(" @ %fieldContainer @ "," @ %fieldName @ ");" );

24
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript
View file

@ -127,6 +127,28 @@ function ImageAsset::generatePreviewImage(%this, %previewButton, %forceRegenerat
return false;
}
function ImageAsset::makeMaterialFrom(%this)
{
%matName = %this.assetName @ "_Mat";
%assetLoc = AssetDatabase.getAssetPath(%this.getAssetId()) @"/"@ %this.assetName @"_Mat.asset.taml";
%newMat = new Material(%matName) {
diffuseMapAsset[0] = %this.getAssetId();
mapTo = %this.assetName;
};
%matAsset = new MaterialAsset() {
assetName = %matName;
materialDefinitionName = %matName;
};
%matAsset.add(%newMat);
TamlWrite(%matAsset, expandPath(%assetLoc));
AssetDatabase.addDeclaredAsset(AssetDatabase.getAssetModule(%this.getAssetId()), %assetLoc);
return %matAsset;
}
function ImageAsset::onShowActionMenu(%this)
{
GenericAsset::onShowActionMenu(%this);
@ -134,6 +156,8 @@ function ImageAsset::onShowActionMenu(%this)
%assetId = %this.getAssetId();
EditAssetPopup.setItemPosition("Create Composite Texture" TAB "" TAB "CompositeTextureEditor.buildComposite(\"" @ %assetId @ "\");", 4);
EditAssetPopup.setItemPosition("Create Terrain Textures" TAB "" TAB "makeTerrainMapsFrom(\"" @ %assetId @ "\");", 5);
EditAssetPopup.setItemPosition("Create Material" TAB "" TAB %this @ ".makeMaterialFrom();", 6);
EditAssetPopup.objectData = %assetId;
EditAssetPopup.objectType = AssetDatabase.getAssetType(%assetId);