From afec8e7c3aec1a186512b997ed3b717efef8fc43 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 11 Feb 2008 00:19:11 +0000 Subject: renamed Entity.base_* to Entity.core_* fixed camera::mode::Overview --- src/client/draw.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/client/draw.cc') diff --git a/src/client/draw.cc b/src/client/draw.cc index 1e3e5b0..8d83ba8 100644 --- a/src/client/draw.cc +++ b/src/client/draw.cc @@ -20,16 +20,16 @@ render::Box cube(math::Vector3f(0.5f, 0.5f, 0.5f), math::Vector3f(-0.5f, -0.5f, void draw_entity_sphere(core::Entity *entity) { - render::gl::color(entity->base_color); - sphere.radius = entity->base_radius; + render::gl::color(entity->core_color); + sphere.radius = entity->core_radius; sphere.draw(); } void draw_entity_cube(core::Entity *entity) { - cube.topcolor = entity->base_color; - cube.bottomcolor = entity->base_color * 0.7f; - cube.radius = entity->base_radius; + cube.topcolor = entity->core_color; + cube.bottomcolor = entity->core_color * 0.7f; + cube.radius = entity->core_radius; cube.draw(); } @@ -37,11 +37,11 @@ void draw_entity_cube(core::Entity *entity) void draw_entity_diamond(core::Entity *entity) { using namespace render; - float r = entity->base_radius; + float r = entity->core_radius; gl::begin(gl::Lines); gl::color(1.0f, 0.0f, 0.0f); gl::vertex(r,0.0f,0.0f); - gl::color(entity->base_color); + gl::color(entity->core_color); gl::vertex(-r,0.0f,0.0f); gl::vertex(0.0f,0.0f,r/2); @@ -52,13 +52,13 @@ void draw_entity_diamond(core::Entity *entity) gl::end(); } -// draw an entity of type core::entity::Default +// draw an entity of core_type core::entity::Default void draw_entity_default(core::Entity *entity) { render::gl::push(); render::gl::translate(entity->location); - switch(entity->base_shape) { + switch(entity->core_shape) { case core::entity::Sphere: draw_entity_sphere(entity); break; @@ -194,6 +194,7 @@ void draw_spacegrid() void draw_world(float elapsed) { + // used for animations angle += 180.0f * elapsed; if( angle > 360.0f ) { angle -= 360.0f; @@ -203,7 +204,7 @@ void draw_world(float elapsed) using namespace render; std::vector::iterator it; for (it=core::entity::registry.begin(); it != core::entity::registry.end(); it++) { - switch ( (*it)->type) { + switch ( (*it)->core_type()) { case core::entity::Default: draw_entity_default((*it)); break; -- cgit v1.2.3