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

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/clusterCluck

Browse source 
# Conflicts:
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
#	Engine/source/scene/sceneContainer.h
This commit is contained in:
AzaezelX 2023-11-10 02:50:13 -06:00
commit eeb42632f5
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1768,7 +1768,7 @@ void GuiConvexEditorCtrl::submitUndo( UndoType type, const Vector<ConvexShape*>
mIsDirty = true; mIsDirty = true;
} }
bool GuiConvexEditorCtrl::_cursorCastCallback(SceneObject* object) bool GuiConvexEditorCtrl::_cursorCastCallback( SceneObject* object )
{ {
// Reject anything that's not a ConvexShape. // Reject anything that's not a ConvexShape.
return dynamic_cast< ConvexShape* >( object ); return dynamic_cast< ConvexShape* >( object );

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

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

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

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