Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Reduce the strength of the elevation brushes in Atlas.

Browse Source 
This was SVN commit r16488.
This commit is contained in:
sanderd17 2015-04-02 13:43:47 +00:00
parent 4e763ef26e
commit 0e2c30c7d2
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp
View File

@ -113,7 +113,7 @@ public:
void OnTick(AlterElevation* obj, float dt)
{
POST_COMMAND(AlterElevation, (obj->m_Pos, dt*4096.f*GetDirection()*g_Brush_Elevation.GetStrength()));
POST_COMMAND(AlterElevation, (obj->m_Pos, dt*g_Brush_Elevation.STRENGTH_MULTIPLIER*GetDirection()*g_Brush_Elevation.GetStrength()));
obj->m_Pos = Position::Unchanged();
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h
View File

@ -33,6 +33,8 @@ public:
Brush();
~Brush();
const float STRENGTH_MULTIPLIER = 1024.f;
int GetWidth() const;
int GetHeight() const;
std::vector<float> GetData() const;

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FlattenElevation.cpp
View File

@ -106,7 +106,7 @@ public:
void OnTick(FlattenElevation* obj, float dt)
{
POST_COMMAND(FlattenElevation, (obj->m_Pos, dt*4096.f*g_Brush_Elevation.GetStrength()));
POST_COMMAND(FlattenElevation, (obj->m_Pos, dt*g_Brush_Elevation.STRENGTH_MULTIPLIER*g_Brush_Elevation.GetStrength()));
obj->m_Pos = Position::Unchanged();
}
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PikeElevation.cpp
View File

@ -113,7 +113,7 @@ public:
void OnTick(PikeElevation* obj, float dt)
{
POST_COMMAND(PikeElevation, (obj->m_Pos, dt*4096.f*GetDirection()*g_Brush_Elevation.GetStrength()));
POST_COMMAND(PikeElevation, (obj->m_Pos, dt*g_Brush_Elevation.STRENGTH_MULTIPLIER*GetDirection()*g_Brush_Elevation.GetStrength()));
obj->m_Pos = Position::Unchanged();
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/SmoothElevation.cpp
View File

@ -114,7 +114,7 @@ public:
void OnTick(SmoothElevation* obj, float dt)
{
POST_COMMAND(SmoothElevation, (obj->m_Pos, dt*4096.f*GetDirection()*g_Brush_Elevation.GetStrength()));
POST_COMMAND(SmoothElevation, (obj->m_Pos, dt*g_Brush_Elevation.STRENGTH_MULTIPLIER*GetDirection()*g_Brush_Elevation.GetStrength()));
obj->m_Pos = Position::Unchanged();
}