TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 12:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Defer re-init'ing the shape when TSShapeConstructor is loading a shape

Browse source
This commit is contained in:
James Urquhart 2016-09-03 10:41:25 +01:00
parent 0e717ea707
commit a46779fad6
5 changed files with 143 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/ts/tsShapeConstruct.h
View file

@ -246,6 +246,7 @@ public:
TSShape* mShape; // Edited shape; NULL while not loaded; not a Resource<TSShape> as we don't want it to prevent from unloading.
ColladaUtils::ImportOptions mOptions;
bool mLoadingShape;
public:
@ -261,6 +262,7 @@ public:
bool onAdd();
void onScriptChanged(const Torque::Path& path);
void onActionPerformed();
bool writeField(StringTableEntry fieldname, const char *value);
void writeChangeSet();
@ -383,8 +385,16 @@ typedef domUpAxisType TSShapeConstructorUpAxis;
typedef ColladaUtils::ImportOptions::eLodType TSShapeConstructorLodType;
DefineEnumType( TSShapeConstructorUpAxis );
DefineEnumType( TSShapeConstructorLodType );
DefineEnumType(TSShapeConstructorLodType);
class TSShapeConstructorMethodActionCallback
{
TSShapeConstructor* mObject;
public:
TSShapeConstructorMethodActionCallback(TSShapeConstructor *object) : mObject(object) { ; }
~TSShapeConstructorMethodActionCallback() { mObject->onActionPerformed(); }
};
/* This macro simplifies the definition of a TSShapeConstructor API method. It
wraps the actual EngineMethod definition and automatically calls the real
@ -403,6 +413,7 @@ DefineEnumType( TSShapeConstructorLodType );
Con::errorf( "TSShapeConstructor::" #name " - shape not loaded" ); \
return defRet; \
} \
TSShapeConstructorMethodActionCallback actionCallback(object); \
return object->name rawArgs ; \
} \
/* Define the real TSShapeConstructor method */ \