TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Adds the capability to add a small offset to the Z value of items being told to snap to terrain

Browse source
This commit is contained in:
Marc Chapman 2019-02-12 03:14:01 +00:00
parent 32c7f2c7a7
commit c92c508a5d
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -816,6 +816,21 @@ void WorldEditor::terrainSnapSelection(Selection* sel, U8 modifier, Point3F gizm
{
mStuckToGround = true;
const F32 OffsetZValueMin = 0.01f;
if (mTerrainSnapOffsetZ)
{
if (mOffsetZValue == 0.0f)
{
ri.point.z += OffsetZValueMin;
}
else
{
ri.point.z += mOffsetZValue;
}
}
sel->offset(ri.point - centroid, (!mUseGroupCenter && mGridSnap) ? mGridPlaneSize : 0.f);
if(mTerrainSnapAlignment != AlignNone)
@ -1795,6 +1810,9 @@ WorldEditor::WorldEditor()
mStickToGround = false;
mStuckToGround = false;
mTerrainSnapAlignment = AlignNone;
mTerrainSnapOffsetZ = false;
mOffsetZValue = 0.0f;
mDropAtBounds = false;
mDropBelowCameraOffset = 15.0f;
mDropAtScreenCenterScalar = 1.0f;
@ -2788,6 +2806,8 @@ void WorldEditor::initPersistFields()
addField( "isDirty", TypeBool, Offset(mIsDirty, WorldEditor) );
addField( "stickToGround", TypeBool, Offset(mStickToGround, WorldEditor) );
addField("TerrainSnapOffsetZ", TypeBool, Offset(mTerrainSnapOffsetZ, WorldEditor));
addField("OffsetZValue", TypeF32, Offset(mOffsetZValue, WorldEditor));
//addField("sameScaleAllAxis", TypeBool, Offset(mSameScaleAllAxis, WorldEditor));
addField( "toggleIgnoreList", TypeBool, Offset(mToggleIgnoreList, WorldEditor) );

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

@ -358,6 +358,8 @@ class WorldEditor : public EditTSCtrl
bool mStickToGround;
bool mStuckToGround; ///< Selection is stuck to the ground
AlignmentType mTerrainSnapAlignment; ///< How does the stickied object align to the terrain
bool mTerrainSnapOffsetZ; ///< Allows the use of an offset to avoid z-fighting with flat objects on a flat terrain.
F32 mOffsetZValue; ///< Value of the Z offset (note: this shouldnt be changed once set)
bool mSoftSnap; ///< Allow soft snapping all of the time
bool mSoftSnapActivated; ///< Soft snap has been activated by the user and allowed by the current rules

10
Templates/Full/game/tools/worldEditor/scripts/editorPrefs.ed.cs
View file

@ -60,6 +60,9 @@ EditorSettings.endGroup();
EditorSettings.beginGroup( "Tools" );
EditorSettings.setDefaultValue( "snapGround", "0" );
EditorSettings.setDefaultValue( "TerrainSnapOffsetZ", "0" );
EditorSettings.setDefaultValue( "OffsetZValue", "0.01" );
EditorSettings.setDefaultValue( "snapSoft", "0" );
EditorSettings.setDefaultValue( "snapSoftSize", "2.0" );
EditorSettings.setDefaultValue( "boundingBoxCollision", "0" );
@ -215,6 +218,10 @@ function EditorGui::readWorldEditorSettings(%this)
EditorSettings.beginGroup( "Tools" );
EWorldEditor.stickToGround = EditorSettings.value("snapGround"); //$pref::WorldEditor::snapGround;
EWorldEditor.TerrainSnapOffsetZ = EditorSettings.value("TerrainSnapOffsetZ"); //$pref::WorldEditor::TerrainSnapOffsetZ;
EWorldEditor.OffsetZValue = EditorSettings.value("OffsetZValue"); //$pref::WorldEditor::OffsetZValue;
EWorldEditor.setSoftSnap( EditorSettings.value("snapSoft") ); //$pref::WorldEditor::snapSoft
EWorldEditor.setSoftSnapSize( EditorSettings.value("snapSoftSize") ); //$pref::WorldEditor::snapSoftSize
EWorldEditor.boundingBoxCollision = EditorSettings.value("boundingBoxCollision"); //$pref::WorldEditor::boundingBoxCollision;
@ -310,6 +317,9 @@ function EditorGui::writeWorldEditorSettings(%this)
EditorSettings.beginGroup( "Tools" );
EditorSettings.setValue( "snapGround", EWorldEditor.stickToGround ); //$Pref::WorldEditor::snapGround
EditorSettings.setValue( "TerrainSnapOffsetZ", EWorldEditor.TerrainSnapOffsetZ ); //$pref::WorldEditor::TerrainSnapOffsetZ;
EditorSettings.setValue( "OffsetZValue", EWorldEditor.OffsetZValue ); //$pref::WorldEditor::OffsetZValue;
EditorSettings.setValue( "snapSoft", EWorldEditor.getSoftSnap() ); //$Pref::WorldEditor::snapSoft
EditorSettings.setValue( "snapSoftSize", EWorldEditor.getSoftSnapSize() ); //$Pref::WorldEditor::snapSoftSize
EditorSettings.setValue( "boundingBoxCollision", EWorldEditor.boundingBoxCollision ); //$Pref::WorldEditor::boundingBoxCollision