TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-10 07:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up "Add" menubar categoes on the 3d object side via the following:

Browse source 
SceneObject now defaults to a category of "misc"
getCategoryOfClass now checks parent classes for what categories they hold so that variants can inherit
categories are in one of a few rough groups and subgroups depending on actual mapper needs/usages
This commit is contained in:
AzaezelX 2023-11-08 20:42:47 -06:00
parent edbb76155b
commit fbcfe02098
157 changed files with 127 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/scene/sceneContainer.cpp
View file

@ -318,10 +318,9 @@ struct SceneRayHelper
xformedEnd.convolveInverse(ptr->mObjScale);
RayInfo ri;
ri.object = ptr;
ri.generateTexCoord = info->generateTexCoord;
if (mFunc && !mFunc(&ri))
if (mFunc && !mFunc(ptr))
return false;
bool result = false;

2
Engine/source/scene/sceneContainer.h
View file

@ -668,7 +668,7 @@ class SceneContainer
/// @name Line intersection
/// @{
typedef bool ( *CastRayCallback )( RayInfo* ri );
typedef bool ( *CastRayCallback )(SceneObject* object);
/// Test against collision geometry -- fast.
bool castRay( const Point3F &start, const Point3F &end, U32 mask, RayInfo* info, CastRayCallback callback = NULL );

1
Engine/source/scene/sceneObject.h
View file

@ -754,6 +754,7 @@ class SceneObject : public NetObject, public ProcessObject
static bool _setGameObject(void* object, const char* index, const char* data);
DECLARE_CONOBJECT( SceneObject );
DECLARE_CATEGORY("MISC");
private:
SceneObject( const SceneObject& ); ///< @deprecated disallowed

2
Engine/source/scene/simPath.h
View file

@ -84,6 +84,7 @@ class Path : public GameBase
U32 getPathIndex() const;
DECLARE_CONOBJECT(Path);
DECLARE_CATEGORY("Cinematic");
static void initPersistFields();
DECLARE_CALLBACK(void, onAdd, (SimObjectId ID));
};
@ -151,6 +152,7 @@ class Marker : public SceneObject
~Marker();
DECLARE_CONOBJECT(Marker);
DECLARE_CATEGORY("Cinematic");
static void initPersistFields();
void inspectPostApply();