From 7218e3bd4616d4706090ec47d72845a2bb89c6a3 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 4 May 2008 22:30:49 +0000 Subject: split map reading from models --- src/render/draw.cc | 2 +- src/render/draw.h | 1 + src/render/gl.cc | 2 -- src/render/gl.h | 4 ++-- src/render/render.h | 14 ++++++-------- src/render/tga.h | 3 ++- 6 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/render') diff --git a/src/render/draw.cc b/src/render/draw.cc index 7342b69..c0e21cc 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -260,7 +260,7 @@ void pass_visibility() // load entity models if necessary if (!entity->model() && entity->modelname().size()) { - entity->entity_model = model::Model::get(entity->modelname()); + entity->entity_model = model::Model::load(entity->modelname()); if (!entity->model()) { entity->entity_modelname.clear(); diff --git a/src/render/draw.h b/src/render/draw.h index 65e15ee..c7d68b1 100644 --- a/src/render/draw.h +++ b/src/render/draw.h @@ -7,6 +7,7 @@ #ifndef __INCLUDED_RENDER_DRAW_H__ #define __INCLUDED_RENDER_DRAW_H__ +#include "math/axis.h" #include "math/vector3f.h" namespace render diff --git a/src/render/gl.cc b/src/render/gl.cc index 37ff75f..5540af0 100644 --- a/src/render/gl.cc +++ b/src/render/gl.cc @@ -4,8 +4,6 @@ the terms of the GNU General Public License version 2 */ -#include "GL/gl.h" - #include "render/gl.h" #include "math/matrix4f.h" diff --git a/src/render/gl.h b/src/render/gl.h index 4383e52..fb8bdf2 100644 --- a/src/render/gl.h +++ b/src/render/gl.h @@ -7,8 +7,8 @@ #ifndef __INCLUDED_RENDER_GL_H__ #define __INCLUDED_RENDER_GL_H__ -#include -#include +#include "GL/gl.h" +#include "GL/glu.h" #include "math/vector3f.h" #include "math/matrix4f.h" diff --git a/src/render/render.h b/src/render/render.h index 0bde634..d1f79a7 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -7,9 +7,13 @@ #ifndef __INCLUDED_RENDER_H__ #define __INCLUDED_RENDER_H__ -#include "GL/gl.h" #include "core/cvar.h" -#include "model/model.h" +#include "model/vertexarray.h" + +#include "render/draw.h" +#include "render/gl.h" +#include "render/text.h" +#include "render/tga.h" namespace render { @@ -19,8 +23,6 @@ namespace render { /// shutdown the render subsystem void shutdown(); - extern GLuint textures[32]; - extern core::Cvar *r_radius; extern core::Cvar *r_wireframe; extern core::Cvar *r_arraysize; @@ -28,9 +30,5 @@ namespace render { extern model::VertexArray *vertexarray; } -#include "render/draw.h" -#include "render/gl.h" -#include "render/text.h" -#include "render/tga.h" #endif // __INCLUDED_RENDER_H__ diff --git a/src/render/tga.h b/src/render/tga.h index 0da65fb..767a871 100644 --- a/src/render/tga.h +++ b/src/render/tga.h @@ -13,10 +13,11 @@ namespace render { +/// a class for loading and saving .tga files class TGA { public: - /// load a TGA image from disk + /// load a TGA image file from disk /** @param filename short path to the filename to be loaded */ static Image *load(const char * filename); -- cgit v1.2.3