diff options
author | neoraider <devnull@localhost> | 2008-01-16 17:11:00 +0100 |
---|---|---|
committer | neoraider <devnull@localhost> | 2008-01-16 17:11:00 +0100 |
commit | 8b4b9845d657970b920667f2c2ca64a4974463e9 (patch) | |
tree | 4c7d1d09cce705118c220967dc94873852d1669c /Renderer.cpp | |
parent | e9d27f488c8653967c9a5b86c94801367253444c (diff) | |
download | zoomedit-8b4b9845d657970b920667f2c2ca64a4974463e9.tar zoomedit-8b4b9845d657970b920667f2c2ca64a4974463e9.zip |
zoomedit: Let tools decide wether to highlight hovered objects.
Diffstat (limited to 'Renderer.cpp')
-rw-r--r-- | Renderer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Renderer.cpp b/Renderer.cpp index be00732..4954133 100644 --- a/Renderer.cpp +++ b/Renderer.cpp @@ -107,14 +107,14 @@ void Renderer::drawCross(const Vertex &m, float r) { glEnd(); } -void Renderer::renderObject(const LevelObject &object, bool selected, bool hovered, float scale) { +void Renderer::renderObject(const LevelObject &object, bool selected, bool highlighted, float scale) { if(object.isOfType("Room")) - renderRoom(*(Room*)&object, selected, hovered, scale); + renderRoom(*(Room*)&object, selected, highlighted, scale); else if(object.isOfType("PlayerStart")) - renderPlayerStart(*(PlayerStart*)&object, selected, hovered, scale); + renderPlayerStart(*(PlayerStart*)&object, selected, highlighted, scale); } -void Renderer::renderRoom(const Room &room, bool selected, bool hovered, float scale) { +void Renderer::renderRoom(const Room &room, bool selected, bool highlighted, float scale) { if(selected) glColor4f(0.0f, 0.7f, 1.0f, 0.2f); else @@ -126,7 +126,7 @@ void Renderer::renderRoom(const Room &room, bool selected, bool hovered, float s glColor4f(1.0f, 1.0f, 1.0f, 0.9f); glLineWidth(2.0f); } - else if(hovered) { + else if(highlighted) { glColor4f(0.0f, 0.7f, 1.0f, 0.7f); glLineWidth(2.0f); } @@ -138,12 +138,12 @@ void Renderer::renderRoom(const Room &room, bool selected, bool hovered, float s drawPolygon(room); } -void Renderer::renderPlayerStart(const PlayerStart &start, bool selected, bool hovered, float scale) { +void Renderer::renderPlayerStart(const PlayerStart &start, bool selected, bool highlighted, float scale) { if(selected) { glColor4f(1.0f, 1.0f, 1.0f, 0.9f); glLineWidth(2.0f); } - else if(hovered) { + else if(highlighted) { glColor4f(0.0f, 0.7f, 0.7f, 0.7f); glLineWidth(2.0f); } @@ -168,6 +168,6 @@ void Renderer::render(const Level &level, const Rectangle &rect, float scale) { for(Level::const_iterator object = level.begin(); object != level.end(); object++) { renderObject(**object, (&**object == editManager->getSelectedObject()), - (&**object == editManager->getHoveredObject()), scale); + (&**object == editManager->getHighlightedObject()), scale); } } |