Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2015-02-28 23:04:23 +0000
committerStijn Buys <ingar@osirion.org>2015-02-28 23:04:23 +0000
commitbbb7d96b6f12f5ad60204df2b0975971d81ae66c (patch)
treee283cc0fe790a5f50fbc38b214bbfb654d0aea46 /src/render
parentf583cb5139e58123a3535b92d8bb9346fd73f4a9 (diff)
Do not draw world axis with r_axis enabled.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/draw.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc
index f354780..c42248e 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -853,7 +853,7 @@ void draw_model_axis(const core::Entity *entity)
gl::begin(gl::Lines);
- gl::color(entity->color());
+ gl::color(1.0f, 1.0f, 1.0f, 1.0f);
gl::vertex(-r, 0.0f, 0.0f);
gl::vertex(r, 0.0f, 0.0f);
@@ -863,6 +863,8 @@ void draw_model_axis(const core::Entity *entity)
gl::vertex(0.0f, 0.0f, -r);
gl::vertex(0.0f, 0.0f, r);
+
+ /*
const math::Axis worldaxis(entity->axis().transpose());
@@ -876,6 +878,8 @@ void draw_model_axis(const core::Entity *entity)
gl::vertex(worldaxis.up() * -1 * r);
gl::vertex(worldaxis.up() * r);
+
+ */
gl::end();
}