From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/render/render.h | 80 ++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 38 deletions(-) (limited to 'src/render/render.h') diff --git a/src/render/render.h b/src/render/render.h index 17ba42c..4d2e9c2 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -1,7 +1,7 @@ /* render/render.h - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #ifndef __INCLUDED_RENDER_H__ @@ -19,50 +19,54 @@ #include "render/textures.h" #include "render/renderext.h" -namespace render { +namespace render +{ - /// initialize the render subsystem - void init(int width, int height); +/// initialize the render subsystem +void init(int width, int height); - /// shutdown the render subsystem - void shutdown(); +/// shutdown the render subsystem +void shutdown(); - /// reset all render data - void reset(); +/// reset all render data +void reset(); - /// load game render data - void load(); +/// load game render data +void load(); - /// unload game render data - void unload(); +/// unload game render data +void unload(); - /// resize viewport - void resize(int width, int height); +/// resize viewport +void resize(int width, int height); - /// render entity axis - extern core::Cvar *r_axis; - /// render model bounding boxes - extern core::Cvar *r_bbox; - /// render the spacegrid - extern core::Cvar *r_grid; - /// render particle systems - extern core::Cvar *r_particles; - /// render entity radius - extern core::Cvar *r_radius; - /// render sky - extern core::Cvar *r_sky; - /// render wireframe models - extern core::Cvar *r_wireframe; - /// render vertex normals - extern core::Cvar *r_normals; - /// render collision - extern core::Cvar *r_collision; - /// use hardware generated mipmaps (requires OpenGL 1.4, does not work on all cards) - extern core::Cvar *r_mipmap; - /// use GL_NORMALIZE instead of GL_RESCALE_NORMAL - extern core::Cvar *r_normalize; +/// render entity axis +extern core::Cvar *r_axis; +/// render model bounding boxes +extern core::Cvar *r_bbox; +/// render the spacegrid +extern core::Cvar *r_grid; +/// render particle systems +extern core::Cvar *r_particles; +/// render entity radius +extern core::Cvar *r_radius; +/// render sky +extern core::Cvar *r_sky; +/// render wireframe models +extern core::Cvar *r_wireframe; +/// render vertex normals +extern core::Cvar *r_normals; +/// render collision +extern core::Cvar *r_collision; +/// use hardware generated mipmaps (requires OpenGL 1.4, does not work on all cards) +extern core::Cvar *r_mipmap; +/// use GL_NORMALIZE instead of GL_RESCALE_NORMAL +extern core::Cvar *r_normalize; - inline RenderExt *ext_render(const core::Entity *entity) { return static_cast(entity->extension((size_t)core::Extension::Render)); } +inline RenderExt *ext_render(const core::Entity *entity) +{ + return static_cast(entity->extension((size_t)core::Extension::Render)); +} } -- cgit v1.2.3