From 28ba97bdd8fb6ca352dc49dba01a66bd155ad523 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 15 Nov 2008 19:24:55 +0000 Subject: entity extensions --- src/core/gameinterface.cc | 94 ----------------------------------------------- 1 file changed, 94 deletions(-) (limited to 'src/core/gameinterface.cc') diff --git a/src/core/gameinterface.cc b/src/core/gameinterface.cc index d99ec15..9551176 100644 --- a/src/core/gameinterface.cc +++ b/src/core/gameinterface.cc @@ -120,100 +120,6 @@ void GameInterface::clear() game_players.clear(); } -void GameInterface::reset_clientstate() -{ -// game_previousframetime = prevtimestamp; -// game_serverframetime = timestamp; -// game_time = timestamp; - - for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) { - - Entity *entity = (*it).second; - - if (entity->state() && !(entity->flags() & Entity::Static)) - entity->state()->assign(entity); - } - -// if ( game_clientframetime < game_previousframetime) -// game_clientframetime = game_previousframetime; -// else if ( game_clientframetime > game_serverframetime) -// game_clientframetime = game_serverframetime; - -} - - -void GameInterface::update_entity_clientstate(Entity *entity) -{ - if (!entity->state()) { - entity->entity_clientstate = new ClientState(entity); - entity->entity_clientstate->assign(entity); - } else - entity->state()->assign(entity); - } - -/* - if (!(entity->flags() & Entity::Static)) { - - // clientstate location - entity->state()->state_location = entity->state()->previouslocation() + - (entity->location() - entity->state()->previouslocation()) * timeoffset(); - - if (game_clientframetime <= game_serverframetime) { - - if(Cvar::cl_prediction->value() > 1) { - entity->state()->state_axis.assign(entity->state()->previousaxis()); - - float cosangle; // cosine of an angle - float angle; // angle in radians - math::Vector3f n; // normal of a plane - - n.assign(math::crossproduct( entity->state()->axis().forward(), entity->axis().forward())); - if (!(n.length() < MIN_DELTA)) { - n.normalize(); - cosangle = math::dotproduct( entity->state()->axis().forward(), entity->axis().forward()); - angle = acos(cosangle) * timeoffset(); // * 180.0f / M_PI; - if (angle > MIN_DELTA) - entity->state()->state_axis.rotate(n, -angle); - } - - n.assign(math::crossproduct( entity->state()->axis().left(), entity->axis().left())); - if (!(n.length() < MIN_DELTA)) { - n.normalize(); - cosangle = math::dotproduct( entity->state()->axis().left(), entity->axis().left()); - angle = acos(cosangle) * timeoffset(); // * 180.0f / M_PI; - if (angle > MIN_DELTA) - entity->state()->state_axis.rotate(n, -angle); - } - - n.assign(math::crossproduct( entity->state()->axis().up(), entity->axis().up())); - if (!(n.length() < MIN_DELTA)) { - n.normalize(); - cosangle = math::dotproduct( entity->state()->axis().up(), entity->axis().up()); - angle = acos(cosangle) * timeoffset(); // * 180.0f / M_PI; - if (angle > MIN_DELTA) - entity->state()->state_axis.rotate(n, -angle); - } - - } else { - entity->state()->state_axis.assign(entity->axis()); - } - } else { - entity->state()->state_axis.assign(entity->axis()); - } - - } else { - entity->state()->assign(entity); - } -} -*/ - -void GameInterface::update_clientstate() -{ - for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) { - update_entity_clientstate((*it).second); - } -} - void GameInterface::list_players() { using namespace std; -- cgit v1.2.3