Changeset 540

Timestamp:

02/28/10 22:45:14 (5 months ago)

Author:

gaul@…

Message:

• ball hits paddle (keep bouncin'!)
  
• NOTE: physics are computed on client only (TODO: sync)
  

Location:

branches/cpp-ode/src

Files:

• libmmpong/netgame.cc (modified) (1 diff)
• libmmpong/netgame.h (modified) (3 diffs)
• libmmpong/netgame_ode.cc (modified) (1 diff)
• libmmpong/netgame_ode.h (modified) (2 diffs)
• libmmpong/netgame_ode_pong.cc (modified) (2 diffs)
• libmmpong/netgame_ode_pong.h (modified) (1 diff)
• libmmpong/ode_box.cc (modified) (1 diff)
• libmmpong/ode_obj.h (modified) (4 diffs)
• mmpong-gl/client_gl.cc (modified) (1 diff)

branches/cpp-ode/src/libmmpong/netgame.cc

@@ -14 +14 @@
         ent_reg<ODESphere>();
         ent_reg<Player>();
+        world_time=boost::posix_time::microsec_clock::universal_time();
 };
 

branches/cpp-ode/src/libmmpong/netgame.h

@@ -5 +5 @@
 #include <set>
 #include <boost/thread/mutex.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include "netent.h"
 #include "netent_helper.h"
@@ -45 +46 @@
                 //override in derived Game class implementing the actual 
                 //gameplay and physics
-                virtual void advance(double step_ms) = 0;
+                //ATTENTION: the method should return exactly after the given time has passed
+                virtual void advance(const boost::posix_time::ptime endtime = boost::posix_time::microsec_clock::universal_time()) = 0;
                 
-                virtual double get_proposed_step_ms() { return 1.0/50; };
+                //virtual double get_proposed_step_ms() { return 1.0/50; };
 
                 //override in derived client class
@@ -116 +118 @@
                         return boost::dynamic_pointer_cast<CLASS>(get_ent(entid));
                 };
+                
+                boost::posix_time::ptime world_time; //time of last advance()
 
                 //only server creates NetEnts

branches/cpp-ode/src/libmmpong/netgame_ode.cc

@@ -12 +12 @@
 };
 
-void NetGameODE::advance(double ms) {
+#define STEPSIZE 0.001f
+void NetGameODE::advance(const boost::posix_time::ptime endtime) {
+        lock();
+        if (endtime < world_time) {
+                LOGWARN("endtime < world_time");
+                unlock();
+                return;
+        }
+        
+        boost::posix_time::time_duration elapsed = endtime - world_time;
 
+        //TODO (if necessary): improve (naive) time stepping by measuring computation times
+        
+        double seconds= ((double)elapsed.total_microseconds())/1.e6;
+        unsigned int step_count= seconds/STEPSIZE;
+        LOGDBG("step world "<<seconds<<" seconds with "<<step_count << " iterations");
+        for (unsigned int i=0; i<step_count; i++) {
+                collide();
+                step(STEPSIZE);
+        }
+        world_time=endtime;
+        
+        unlock();
 }
 

branches/cpp-ode/src/libmmpong/netgame_ode.h

@@ -22 +22 @@
 
                 //(re-)implementation of virtual members
-                virtual void advance(double ms);
+                virtual void advance(const boost::posix_time::ptime endtime);
                 
                 virtual NetEnt::pointer cln_ent_new(NetMsg::pointer msg);
@@ -37 +37 @@
                 
                 static void collideCallbackCaller /* ;) */ (void *data, dGeomID o1, dGeomID o2) {
-                        NetGameODE *pthis = (NetGameODE *)data;
+                        NetGameODE *pthis = dynamic_cast<NetGameODE *>((NetGameODE *)data);
                         //disable RTTI if this is bottleneck
-                        if (typeid(pthis)!=typeid(NetGameODE))
+                        if (!pthis)
                                 throw std::runtime_error("Given pointer in callback is not a NetGameODE object");
                         pthis->collideCallback(NULL, o1, o2);

branches/cpp-ode/src/libmmpong/netgame_ode_pong.cc

@@ -24 +24 @@
         playerpad->geom.setLengths(0.05,0.5,0.05);
         double ang=M_PI*(1.0+2.0*newteamid/srv_teamid_cur);
-        playerpad->setPosition(cos(ang)*1.05, sin(ang)*1.05, 0.0);
+        playerpad->geom.setPosition(cos(ang)*1.05, sin(ang)*1.05, 0.0);
         uint16_t newpadid=playerpad->get_entid();
         player2pad[newplayerid]=newpadid;
@@ -274 +274 @@
                 boost::shared_ptr<ODEBox> pad=get_ent<ODEBox>(mypadid);
                 double ang=M_PI*(1.0+2.0*myteamid/srv_teamid_cur);
-                pad->setPosition(cos(ang)*1.05, -1.0 + 2.0 * mypadpos, 0.0);
+                pad->geom.setPosition(cos(ang)*1.05, -1.0 + 2.0 * mypadpos, 0.0);
                 NetMsg::pointer msg=NetMsg::create(NetMsg::CmdGameCustom);
                 msg->pack_begin();

branches/cpp-ode/src/libmmpong/netgame_ode_pong.h

@@ -55 +55 @@
                                 barbot=srv_ent_create<ODEBox>();
                         bartop->geom.setLengths(2.0,0.05,0.05);
-                        bartop->setPosition(0.0, 1.05, 0.0);
+                        bartop->geom.setPosition(0.0, 1.05, 0.0);
                         barbot->geom.setLengths(2.0,0.05,0.05);
-                        barbot->setPosition(0.0, -1.05, 0.0);
+                        barbot->geom.setPosition(0.0, -1.05, 0.0);
                         
                         boost::shared_ptr<ODESphere> 
                                 ball=srv_ent_create<ODESphere>();
                         ball->geom.setRadius(0.025);
+                        ball->setLinearVel(-0.1, 0.0, 0.0);
                 };
                 virtual void srv_con_start(NetCon::pointer con);

branches/cpp-ode/src/libmmpong/ode_box.cc

@@ -7 +7 @@
 { 
         geom.create(get_space(), 1.0, 1.0, 1.0);
-        geom.setBody(*this);
+        //geom.setBody(*this);
         classname="ODEBox";
 }

branches/cpp-ode/src/libmmpong/ode_obj.h

@@ -37 +37 @@
                 virtual void update(NetMsg::pointer msg) {
                         if (msg->get_state()==NetMsg::StatPacking) {
-                                const dReal *vals=getPosition();
+                                const dReal *vals=geom.getPosition();
                                 LOGDBG("Position==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<"]");
                                 for(unsigned int i=0; i<3; i++)
@@ -48 +48 @@
 
                                 //check ODE alignment in dMatrix3
-                                vals=getRotation();
+                                vals=geom.getRotation();
                                 LOGDBG("Rotation==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<";"<<vals[4]<<","<<vals[5]<<","<<vals[6]<<";"<<vals[8]<<","<<vals[9]<<","<<vals[10]<<"]");
                                 for(unsigned int i=0; i<3; i++)
@@ -66 +66 @@
                                         msg->unpack_ode(vals[i]);
                                 LOGDBG("Position==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<"]");
-                                setPosition(vals);
+                                geom.setPosition(vals[0], vals[1], vals[2]);
                                 
                                 for(unsigned int i=0; i<3; i++)
@@ -80 +80 @@
                                         msg->unpack_ode(vals[i]);
                                 LOGDBG("Rotation==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<";"<<vals[4]<<","<<vals[5]<<","<<vals[6]<<";"<<vals[8]<<","<<vals[9]<<","<<vals[10]<<"]");
-                                setRotation(vals);
+                                geom.setRotation(vals);
 
                                 for(unsigned int i=0; i<3; i++)

branches/cpp-ode/src/mmpong-gl/client_gl.cc

@@ -111 +111 @@
                 
                 renderer.begin();
-                if (game)
+                if (game) {
+                        game->advance();
                         game->render();
+                }
                 renderer.end();