TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 20:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo TorqueLab changes until it works properly

Browse source
This commit is contained in:
Duion 2015-09-06 23:14:36 +02:00
parent 683a11e384
commit 9b8114d4e1
8 changed files with 12 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Engine/source/forest/editor/forestBrushTool.cpp
View file

@ -40,7 +40,7 @@
#include "math/mRandomDeck.h"
#include "math/mRandomSet.h"
F32 ForestBrushTool::smGlobalScale = 1.0f; //TorqueLab - Forest global scale Init
bool ForestBrushTool::protectedSetSize( void *object, const char *index, const char *data )
{
ForestBrushTool *tool = static_cast<ForestBrushTool*>( object );
@ -122,14 +122,7 @@ void ForestBrushTool::initPersistFields()
Parent::initPersistFields();
}
//TorqueLab - Forest brush tool new console variables
void ForestBrushTool::consoleInit()
{
//TorqueLab - Forest global scale - Apply global scaling to painted elements
Con::addVariable("$Forest::GlobalScale", TypeF32, &ForestBrushTool::smGlobalScale, "For editor use.\n"
"@ingroup Editors\n");
Parent::consoleInit();
}
bool ForestBrushTool::onAdd()
{
if ( !Parent::onAdd() )
@ -387,10 +380,6 @@ void ForestBrushTool::_paint( const Point3F &point )
randElementSet.add( pElement, pElement->mProbability );
}
//TorqueLab - Check forest global scale
if (smGlobalScale <= 0.01)
smGlobalScale = 0.01f;
// Pull elements from the random set until we would theoretically fill
// the desired area.
@ -414,8 +403,6 @@ void ForestBrushTool::_paint( const Point3F &point )
areaLeft -= area * 5.0f; // fudge value
scaleFactor *= smGlobalScale; //TorqueLab - Add forest global scale
// No room left we are done.
//if ( areaLeft < 0.0f )
// break;

2
Engine/source/forest/editor/forestBrushTool.h
View file

@ -61,12 +61,10 @@ public:
// SimObject
DECLARE_CONOBJECT( ForestBrushTool );
static void consoleInit(); //TorqueLab - New console variables
static void initPersistFields();
virtual bool onAdd();
virtual void onRemove();
static F32 smGlobalScale; //TorqueLab - Forest global scale
// ForestTool
virtual void on3DMouseDown( const Gui3DMouseEvent &evt );
virtual void on3DMouseUp( const Gui3DMouseEvent &evt );