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

Merge pull request #2183 from Areloch/ShapeEdDisplayFixes

Browse source 
Fix a few rendering issues in the Shape Editor
This commit is contained in:
Areloch 2018-01-31 14:11:02 -06:00 • committed by GitHub
commit 74187743bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/gui/editor/guiShapeEdPreview.cpp
View file

@ -926,8 +926,8 @@ void GuiShapeEdPreview::handleMouseDown(const GuiEvent& event, GizmoMode mode)
} }
} }
if ( mode == RotateMode ) //if ( mode == RotateMode )
mRenderCameraAxes = true; // mRenderCameraAxes = true;
} }
void GuiShapeEdPreview::handleMouseUp(const GuiEvent& event, GizmoMode mode) void GuiShapeEdPreview::handleMouseUp(const GuiEvent& event, GizmoMode mode)
@ -941,8 +941,8 @@ void GuiShapeEdPreview::handleMouseUp(const GuiEvent& event, GizmoMode mode)
mGizmo->on3DMouseUp( mLastEvent ); mGizmo->on3DMouseUp( mLastEvent );
} }
if ( mode == RotateMode ) //if ( mode == RotateMode )
mRenderCameraAxes = false; // mRenderCameraAxes = false;
} }
void GuiShapeEdPreview::handleMouseMove(const GuiEvent& event, GizmoMode mode) void GuiShapeEdPreview::handleMouseMove(const GuiEvent& event, GizmoMode mode)
@ -1164,6 +1164,19 @@ void GuiShapeEdPreview::computeSceneBounds(Box3F& bounds)
{ {
if ( mModel ) if ( mModel )
mModel->computeBounds( mCurrentDL, bounds ); mModel->computeBounds( mCurrentDL, bounds );
if (bounds.getExtents().x < POINT_EPSILON || bounds.getExtents().y < POINT_EPSILON || bounds.getExtents().z < POINT_EPSILON)
{
bounds.set(Point3F::Zero);
//We probably don't have any actual meshes in this model, so compute using the bones if we have them
for (S32 i = 0; i < mModel->getShape()->nodes.size(); i++)
{
Point3F nodePos = mModel->mNodeTransforms[i].getPosition();
bounds.extend(nodePos);
}
}
} }
void GuiShapeEdPreview::updateDetailLevel(const SceneRenderState* state) void GuiShapeEdPreview::updateDetailLevel(const SceneRenderState* state)