diff options
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/Makefile.am | 7 | ||||
-rw-r--r-- | src/render/draw.cc | 4 | ||||
-rw-r--r-- | src/render/render.cc | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/render/Makefile.am b/src/render/Makefile.am index 166aa99..7069f97 100644 --- a/src/render/Makefile.am +++ b/src/render/Makefile.am @@ -9,6 +9,7 @@ endif librender_la_LDFLAGS = -avoid-version -no-undefined @GL_LIBS@ librender_la_LIBADD = $(top_builddir)/src/math/libmath.la -librender_la_SOURCES = camera.cc draw.cc gl.cc image.cc render.cc text.cc \ - textures.cc tga.cc -noinst_HEADERS = camera.h draw.h gl.h image.h render.h text.h textures.h tga.h +librender_la_SOURCES = camera.cc draw.cc dust.cc gl.cc image.cc render.cc \ + text.cc textures.cc tga.cc +noinst_HEADERS = camera.h draw.h dust.h gl.h image.h render.h text.h textures.h \ + tga.h diff --git a/src/render/draw.cc b/src/render/draw.cc index 18c3d73..1f920b0 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -12,6 +12,7 @@ #include "render/render.h" #include "render/textures.h" #include "render/draw.h" +#include "render/dust.h" #include "render/gl.h" namespace render @@ -317,6 +318,7 @@ void pass_prepare(float seconds) // load entity models and light flare textures if (!entity->model() && entity->modelname().size()) { entity->entity_model = model::Model::load(entity->modelname()); + entity->entity_radius = entity->model()->radius(); if (!entity->model()) { entity->entity_modelname.clear(); @@ -865,6 +867,8 @@ void draw(float seconds) draw_pass_spacegrid(); // draw the blue spacegrid + Dust::draw(); // draw spacedust + draw_pass_model_fx(); // draw entity lights and engines gl::enable(GL_LIGHTING); diff --git a/src/render/render.cc b/src/render/render.cc index ea70dbf..cb0d4dd 100644 --- a/src/render/render.cc +++ b/src/render/render.cc @@ -10,6 +10,7 @@ #include <iomanip> #include "render/gl.h" +#include "render/dust.h" #include "render/textures.h" #include "render/tga.h" #include "render/render.h" @@ -98,6 +99,8 @@ void init() Textures::init(); Text::init(); + + Dust::init(); } void shutdown() @@ -123,6 +126,8 @@ void shutdown() Textures::shutdown(); Camera::shutdown(); + + Dust::shutdown(); } } |