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

dial back nullPtr usage

Browse source 
while it still remains a good idea to port as many NULL compares and assignments over to nullPtr as feasable, we do still need to sort out how to better support scripted empty, false, and zero assigns for things like objectIDs.

this means we'll need to both fully convert the backend of the parser to support that kind of thing, but also alter most if not all exisiting NULLs. up to and including things like SAFE_DELETE. while that's certainly feasable, given there's aproximatel 400 nullptr assigns/checks prior to this commit, and roughly 1800 of the prior, if it terminates in a script call and not an aip one direct, we'll be dialing that back until such time as fork fully fopcused on converting and resolving any lingering mismatches is completed.
This commit is contained in:
AzaezelX 2025-12-29 17:45:09 -06:00
parent e9205027f7
commit 5ffa3b81f1
84 changed files with 319 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ void GuiConvexEditorCtrl::setVisible( bool val )
}
Scene* scene = Scene::getRootScene();
if (scene != nullptr)
if (scene != NULL)
{
//Make our proxy objects "real" again
for (U32 i = 0; i < mProxyObjects.size(); ++i)
@ -228,7 +228,7 @@ void GuiConvexEditorCtrl::setVisible( bool val )
mSavedGizmoFlags = mGizmoProfile->flags;
Scene* scene = Scene::getRootScene();
if (scene != nullptr)
if (scene != NULL)
{
for (U32 c = 0; c < scene->size(); ++c)
{

12
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -1888,7 +1888,7 @@ WorldEditor::WorldEditor()
mFadeIcons = true;
mFadeIconsDist = 8.f;
mActiveEditorTool = nullptr;
mActiveEditorTool = NULL;
}
WorldEditor::~WorldEditor()
@ -1982,7 +1982,7 @@ void WorldEditor::on3DMouseMove(const Gui3DMouseEvent & event)
mHitObject = NULL;
//If we have an active tool and it's intercepted our input, bail out
if (mActiveEditorTool != nullptr && mActiveEditorTool->onMouseMove(event))
if (mActiveEditorTool != NULL && mActiveEditorTool->onMouseMove(event))
return;
//
@ -2014,7 +2014,7 @@ void WorldEditor::on3DMouseMove(const Gui3DMouseEvent & event)
void WorldEditor::on3DMouseDown(const Gui3DMouseEvent & event)
{
//If we have an active tool and it's intercepted our input, bail out
if (mActiveEditorTool != nullptr && mActiveEditorTool->onMouseDown(event))
if (mActiveEditorTool != NULL && mActiveEditorTool->onMouseDown(event))
return;
mMouseDown = true;
@ -2085,7 +2085,7 @@ void WorldEditor::on3DMouseDown(const Gui3DMouseEvent & event)
void WorldEditor::on3DMouseUp( const Gui3DMouseEvent &event )
{
//If we have an active tool and it's intercepted our input, bail out
if (mActiveEditorTool != nullptr && mActiveEditorTool->onMouseUp(event))
if (mActiveEditorTool != NULL && mActiveEditorTool->onMouseUp(event))
return;
const bool wasUsingAxisGizmo = mUsingAxisGizmo;
@ -2249,7 +2249,7 @@ void WorldEditor::on3DMouseUp( const Gui3DMouseEvent &event )
void WorldEditor::on3DMouseDragged(const Gui3DMouseEvent & event)
{
//If we have an active tool and it's intercepted our input, bail out
if (mActiveEditorTool != nullptr && mActiveEditorTool->onMouseDragged(event))
if (mActiveEditorTool != NULL && mActiveEditorTool->onMouseDragged(event))
return;
if ( !mMouseDown )
@ -2488,7 +2488,7 @@ void WorldEditor::renderScene( const RectI &updateRect )
smRenderSceneSignal.trigger(this);
if (mActiveEditorTool != nullptr)
if (mActiveEditorTool != NULL)
mActiveEditorTool->render();
// Grab this before anything here changes it.