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

need to set state to ok post-load and pre-changesignal callback

Browse source
This commit is contained in:
AzaezelX 2024-04-06 16:39:31 -05:00
parent 3ace31c68c
commit 5ff83138cf
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -417,9 +417,10 @@ U32 ShapeAsset::load()
} }
} }
mLoadedState = Ok;
mChangeSignal.trigger(); mChangeSignal.trigger();
mLoadedState = Ok;
return mLoadedState; return mLoadedState;
} }
@ -534,7 +535,6 @@ void ShapeAsset::onAssetRefresh(void)
mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath; mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
load(); load();
//onAssetRefresh();
} }
void ShapeAsset::SplitSequencePathAndName(String& srcPath, String& srcName) void ShapeAsset::SplitSequencePathAndName(String& srcPath, String& srcName)

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

@ -606,15 +606,6 @@ void TSStatic::onRemove()
Parent::onRemove(); Parent::onRemove();
} }
void TSStatic::_onResourceChanged(const Torque::Path& path)
{
if (path != Path(mShapeName))
return;
_createShape();
_updateShouldTick();
}
void TSStatic::onShapeChanged() void TSStatic::onShapeChanged()
{ {
_createShape(); _createShape();

1
Engine/source/T3D/tsStatic.h
View file

@ -169,7 +169,6 @@ protected:
void _renderNormals(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat); void _renderNormals(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat);
void _onResourceChanged(const Torque::Path& path);
void onShapeChanged(); void onShapeChanged();
// ProcessObject // ProcessObject