From a29aa1ee2935857f616351a23578311f514516d4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 25 Mar 2008 18:51:27 +0000 Subject: screenshots --- src/render/draw.cc | 2 +- src/render/render.cc | 16 +++++++++++----- src/render/render.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/render') diff --git a/src/render/draw.cc b/src/render/draw.cc index e3d4174..2775f63 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -465,7 +465,7 @@ void draw(math::Vector3f const &eye, math::Vector3f const &target, float seconds glEnableClientState(GL_NORMAL_ARRAY); glEnableClientState(GL_COLOR_ARRAY); - if (r_drawwireframe && r_drawwireframe->value()) { + if (r_wireframe && r_wireframe->value()) { glPolygonMode(GL_FRONT, GL_LINE); } else { glPolygonMode(GL_FRONT, GL_FILL); diff --git a/src/render/render.cc b/src/render/render.cc index b7f42a8..15a6d5c 100644 --- a/src/render/render.cc +++ b/src/render/render.cc @@ -4,9 +4,14 @@ the terms of the GNU General Public License version 2 */ -// project headers +#include +#include +#include +#include + #include "render/render.h" #include "core/core.h" +#include "filesystem/filesystem.h" #include "sys/sys.h" namespace render { @@ -15,7 +20,7 @@ GLuint textures[32]; core::Cvar *r_drawradius = 0; core::Cvar *r_drawstats = 0; -core::Cvar *r_drawwireframe = 0; +core::Cvar *r_wireframe = 0; void init() { @@ -28,17 +33,17 @@ void init() con_print << "Loading textures..." << std::endl; if (!TGA::texture(textures, "bitmaps/loader.tga", 0)) { - //con_error << "Essential file bitmaps/loader.tga missing" << std::endl; + con_error << "Essential file bitmaps/loader.tga missing" << std::endl; core::application()->shutdown(); } if (!TGA::texture(textures, "bitmaps/conchars.tga", 1)) { - //con_error << "Essential file bitmaps/conchars.tga missing" << std::endl; + con_error << "Essential file bitmaps/conchars.tga missing" << std::endl; core::application()->shutdown(); } r_drawradius = core::Cvar::get("r_drawradius", "0", core::Cvar::Archive); r_drawstats = core::Cvar::get("r_drawstats", "0", core::Cvar::Archive); - r_drawwireframe = core::Cvar::get("r_drawwireframe", "0", core::Cvar::Archive); + r_wireframe = core::Cvar::get("r_wireframe", "0", core::Cvar::Archive); } void shutdown() @@ -47,3 +52,4 @@ void shutdown() } } + diff --git a/src/render/render.h b/src/render/render.h index c622dfe..34ba974 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -24,8 +24,8 @@ namespace render { extern GLuint textures[32]; extern core::Cvar *r_drawradius; - extern core::Cvar *r_drawwireframe; extern core::Cvar *r_drawstats; + extern core::Cvar *r_wireframe; } #include "render/draw.h" -- cgit v1.2.3