TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-09 21:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

4
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
View file

@ -1768,10 +1768,10 @@ void GuiConvexEditorCtrl::submitUndo( UndoType type, const Vector<ConvexShape*>
mIsDirty = true;
}
bool GuiConvexEditorCtrl::_cursorCastCallback( RayInfo* ri )
bool GuiConvexEditorCtrl::_cursorCastCallback(SceneObject* object)
{
// Reject anything that's not a ConvexShape.
return dynamic_cast< ConvexShape* >( ri->object );
return dynamic_cast< ConvexShape* >( object );
}
bool GuiConvexEditorCtrl::_cursorCast( const Gui3DMouseEvent &event, ConvexShape **hitShape, S32 *hitFace )

2
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
View file

@ -169,7 +169,7 @@ protected:
void _renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *matInst );
bool _cursorCast( const Gui3DMouseEvent &event, ConvexShape **hitShape, S32 *hitFace );
static bool _cursorCastCallback( RayInfo* ri );
static bool _cursorCastCallback(SceneObject* object);
protected: