From 5ff83138cf50de06b6558ca2e0856b3611fbce8d Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 6 Apr 2024 16:39:31 -0500 Subject: [PATCH] need to set state to ok post-load and pre-changesignal callback --- Engine/source/T3D/assets/ShapeAsset.cpp | 4 ++-- Engine/source/T3D/tsStatic.cpp | 9 --------- Engine/source/T3D/tsStatic.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Engine/source/T3D/assets/ShapeAsset.cpp b/Engine/source/T3D/assets/ShapeAsset.cpp index 9be189324..8945335a7 100644 --- a/Engine/source/T3D/assets/ShapeAsset.cpp +++ b/Engine/source/T3D/assets/ShapeAsset.cpp @@ -417,9 +417,10 @@ U32 ShapeAsset::load() } } + mLoadedState = Ok; + mChangeSignal.trigger(); - mLoadedState = Ok; return mLoadedState; } @@ -534,7 +535,6 @@ void ShapeAsset::onAssetRefresh(void) mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath; load(); - //onAssetRefresh(); } void ShapeAsset::SplitSequencePathAndName(String& srcPath, String& srcName) diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp index 17d674a96..a33bd5029 100644 --- a/Engine/source/T3D/tsStatic.cpp +++ b/Engine/source/T3D/tsStatic.cpp @@ -606,15 +606,6 @@ void TSStatic::onRemove() Parent::onRemove(); } -void TSStatic::_onResourceChanged(const Torque::Path& path) -{ - if (path != Path(mShapeName)) - return; - - _createShape(); - _updateShouldTick(); -} - void TSStatic::onShapeChanged() { _createShape(); diff --git a/Engine/source/T3D/tsStatic.h b/Engine/source/T3D/tsStatic.h index d5c783c0b..d0c9f6c46 100644 --- a/Engine/source/T3D/tsStatic.h +++ b/Engine/source/T3D/tsStatic.h @@ -169,7 +169,6 @@ protected: void _renderNormals(ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat); - void _onResourceChanged(const Torque::Path& path); void onShapeChanged(); // ProcessObject