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>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/render/render.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/render/render.cc')
-rw-r--r--src/render/render.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/render/render.cc b/src/render/render.cc
index 12445a6..03c5c87 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -1,7 +1,7 @@
/*
render/render.cc
- 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
*/
#include <iostream>
@@ -24,7 +24,8 @@
#include "render/textures.h"
#include "sys/sys.h"
-namespace render {
+namespace render
+{
core::Cvar *r_axis = 0;
core::Cvar *r_bbox = 0;
@@ -53,7 +54,7 @@ void func_list_particles(std::string const &args)
ParticleScript::list();
}
-void init(int width, int height)
+void init(int width, int height)
{
con_print << "^BInitializing renderer..." << std::endl;
@@ -148,8 +149,8 @@ void unload()
for (core::Entity::Registry::iterator it = core::Entity::registry().begin(); it != core::Entity::registry().end(); it++) {
core:: Entity *entity = (*it).second;
-
- if (entity->type() == core::Entity::Globe) {
+
+ if (entity->type() == core::Entity::Globe) {
core::EntityGlobe *globe = static_cast<core::EntityGlobe *>(entity);
if (globe->render_texture) {
render::Textures::unload(globe->render_texture);
@@ -179,7 +180,7 @@ void clear()
if (entity->model())
entity->set_model(0);
- if (entity->type() == core::Entity::Globe) {
+ if (entity->type() == core::Entity::Globe) {
core::EntityGlobe *globe = static_cast<core::EntityGlobe *>(entity);
globe->render_texture = 0;
}