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

Added initial implement of Image Types for GFX resource management

Browse source 
Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file
Added lookup logic for getting any textures inside collada files to streamline asset importing logic
Fixed modal behavior for Import config and import window
Initial implementation of loose file/legacy file importing
Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops
Fixed volume visibility behavior
Fixed physics world viz toggle
This commit is contained in:
Areloch 2020-02-17 00:32:50 -06:00
parent e885722093
commit 9c381caea2
21 changed files with 753 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Engine/source/T3D/tsStatic.cpp
View file

@ -171,8 +171,8 @@ void TSStatic::initPersistFields()
&TSStatic::_setShapeAsset, &defaultProtectedGetFn,
"The source shape asset.");
addField("shapeName", TypeShapeFilename, Offset( mShapeName, TSStatic ),
"%Path and filename of the model file (.DTS, .DAE) to use for this TSStatic.", AbstractClassRep::FieldFlags::FIELD_HideInInspectors );
addProtectedField("shapeName", TypeShapeFilename, Offset( mShapeName, TSStatic ), &TSStatic::_setShape, &defaultProtectedGetFn,
"%Path and filename of the model file (.DTS, .DAE) to use for this TSStatic."/*, AbstractClassRep::FieldFlags::FIELD_HideInInspectors*/ );
endGroup("Shape");
@ -261,6 +261,27 @@ void TSStatic::initPersistFields()
Parent::initPersistFields();
}
bool TSStatic::_setShape(void* obj, const char* index, const char* data)
{
TSStatic* ts = static_cast<TSStatic*>(obj);// ->setFile(FileName(data));
//before we continue, lets hit up the Asset Database to see if this file is associated to an asset. If so, we grab the asset instead
AssetQuery query;
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, data);
if (foundAssetcount == 0)
{
//didn't find any assets. continue as normal
ts->mShapeName = StringTable->insert(data);
}
else
{
ts->setShapeAsset(query.mAssetList[0]);
ts->mShapeName = StringTable->EmptyString();
}
return false;
}
bool TSStatic::_setShapeAsset(void* obj, const char* index, const char* data)
{
TSStatic* ts = static_cast<TSStatic*>(obj);// ->setFile(FileName(data));
@ -539,8 +560,10 @@ void TSStatic::prepCollision()
setMaskBits( UpdateCollisionMask );
// Allow the ShapeInstance to prep its collision if it hasn't already
if ( mShapeInstance )
if (mShapeInstance)
mShapeInstance->prepCollision();
else
return;
// Cleanup any old collision data
mCollisionDetails.clear();