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>2008-05-14 21:07:10 +0000
committerStijn Buys <ingar@osirion.org>2008-05-14 21:07:10 +0000
commita185c11f2397c0296a4b62cc266b4fa00a63c1e2 (patch)
tree186da4cdee2d9cd46fb2415567da1c441c7431ef /src/render
parent599adb817e19d9be3502e501dc904c7255cd616c (diff)
console, camera & interpolation
Diffstat (limited to 'src/render')
-rw-r--r--src/render/draw.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc
index 7c35bf3..9292460 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -431,7 +431,7 @@ void draw_pass_model_fx()
t = (core::application()->time() + entity->state()->fuzz() - (*lit)->offset()) * (*lit)->frequency();
if (!(*lit)->strobe() || (( t - floorf(t)) <= (*lit)->time())) {
- math::Vector3f location = entity->state()->location() + (entity->axis() * (*lit)->location());
+ math::Vector3f location = entity->state()->location() + (entity->state()->axis() * (*lit)->location());
float light_size = 0.0625 * (*lit)->radius();
if ((*lit)->render_texture != flare_texture) {
@@ -482,7 +482,7 @@ void draw_pass_model_fx()
t = 0.75f + t/2;
for(std::list<model::Engine*>::iterator eit = entity->model()->model_engine.begin(); eit != entity->model()->model_engine.end(); eit++) {
- math::Vector3f location = entity->state()->location() + (entity->axis() * (*eit)->location());
+ math::Vector3f location = entity->state()->location() + (entity->state()->axis() * (*eit)->location());
float engine_size = 0.0625 * (*eit)->radius() * t;
math::Color color(1.0f, 0.0f, 0.0f, 0.9f * u);