Changeset 541

Timestamp:

03/01/10 22:54:45 (5 months ago)

Author:

gaul@…

Message:

• movable flag synced
  

Location:

branches/cpp-ode/src

Files:

• libmmpong/netgame_ode.cc (modified) (1 diff)
• libmmpong/netgame_ode.h (modified) (1 diff)
• libmmpong/netgame_ode_pong.cc (modified) (2 diffs)
• libmmpong/netgame_ode_pong.h (modified) (1 diff)
• libmmpong/netmsg.h (modified) (2 diffs)
• libmmpong/ode_box.cc (modified) (1 diff)
• libmmpong/ode_box.h (modified) (1 diff)
• libmmpong/ode_obj.h (modified) (5 diffs)
• libmmpong/ode_sphere.cc (modified) (1 diff)
• libmmpong/ode_sphere.h (modified) (1 diff)
• mmpong-gl/client_gl.cc (modified) (1 diff)

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

@@ -30 +30 @@
         for (unsigned int i=0; i<step_count; i++) {
                 collide();
-                step(STEPSIZE);
+                quickStep(STEPSIZE);
         }
         world_time=endtime;

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

@@ -49 +49 @@
                         unsigned int n_collide = dCollide(o1, o2, MAX_CONTACTS, &contact[0].geom, sizeof(dContact));
                         for (unsigned int i=0; i< n_collide; i++){
-                                contact[i].surface.mode = dContactBounce;
+                                contact[i].surface.mode = dContactBounce;// | dContactSoftCFM;
                                 contact[i].surface.mu=dInfinity;
-                                contact[i].surface.mu2=0;
-                                contact[i].surface.bounce=0.9;
-                                contact[i].surface.bounce_vel=0.1;
+                                contact[i].surface.bounce=1.0; // \in [0,1]
+                                contact[i].surface.bounce_vel=0.01;
+                                //contact[i].surface.soft_cfm = 0.1;
                                 dBodyID b1 = dGeomGetBody(o1), b2 = dGeomGetBody(o2);
                                 dJointID c = dJointCreateContact(id(), 0, contact+i);

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

@@ -23 +23 @@
         boost::shared_ptr<ODEBox> playerpad=srv_ent_create<ODEBox>();
         playerpad->geom.setLengths(0.05,0.5,0.05);
+        playerpad->set_immovable();
         double ang=M_PI*(1.0+2.0*newteamid/srv_teamid_cur);
-        playerpad->geom.setPosition(cos(ang)*1.05, sin(ang)*1.05, 0.0);
+        playerpad->setPosition(cos(ang)*1.05, sin(ang)*1.05, 0.0);
         uint16_t newpadid=playerpad->get_entid();
         player2pad[newplayerid]=newpadid;
@@ -274 +275 @@
                 boost::shared_ptr<ODEBox> pad=get_ent<ODEBox>(mypadid);
                 double ang=M_PI*(1.0+2.0*myteamid/srv_teamid_cur);
-                pad->geom.setPosition(cos(ang)*1.05, -1.0 + 2.0 * mypadpos, 0.0);
+                pad->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->geom.setPosition(0.0, 1.05, 0.0);
+                        bartop->setPosition(0.0, 1.05, 0.0);
+                        bartop->set_immovable();
+
                         barbot->geom.setLengths(2.0,0.05,0.05);
-                        barbot->geom.setPosition(0.0, -1.05, 0.0);
+                        barbot->setPosition(0.0, -1.05, 0.0);
+                        barbot->set_immovable();
                         
                         boost::shared_ptr<ODESphere> 
                                 ball=srv_ent_create<ODESphere>();
                         ball->geom.setRadius(0.025);
-                        ball->setLinearVel(-0.1, 0.0, 0.0);
+                        ball->setLinearVel(0.0, 1.0, 0.0);
                 };
                 virtual void srv_con_start(NetCon::pointer con);

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

@@ -108 +108 @@
                         pack_raw<uint32_t>(&conv);
                 };
+                
+                void pack(bool b) {
+                        uint16_t i=b;
+                        pack(i);
+                };
 
                 void pack(double f) {
@@ -173 +178 @@
                 };
 
+                void unpack(bool &ret) {
+                        uint16_t i;
+                        unpack(i);
+                        ret=(bool)i;
+                };
+
                 void unpack(double &f) {
                         //TODO: assure double has 64 bit

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

@@ -3 +3 @@
 using namespace mmp;
 
-ODEBox::ODEBox(NetGame::pointer game, uint16_t entid) : 
+ODEBox::ODEBox(NetGame::pointer game, uint16_t entid, bool _movable) : 
         ODEObj<NetEnt::ODEBox, dBox>(game, entid)
 { 
         geom.create(get_space(), 1.0, 1.0, 1.0);
-        //geom.setBody(*this);
         classname="ODEBox";
+        if (_movable)
+                set_movable();
 }
 

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

@@ -10 +10 @@
 class ODEBox : public ODEObj<NetEnt::ODEBox, dBox>, public NetEntCreator<ODEBox> {
         public:
-                ODEBox(NetGame::pointer game, uint16_t entid);
+                ODEBox(NetGame::pointer game, uint16_t entid, bool _movable=true);
         private:
                 virtual void update(NetMsg::pointer msg) {

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

@@ -17 +17 @@
                 boost::shared_ptr<NetGameODE> game;
         public:
+                //TODO: should the GEOM be protected? (andre thinks so...)
                 GEOM geom;
         protected:
@@ -33 +34 @@
                         //we could also use: this->classname="ODEObj";
                         NetEntHelper<CLASSID>::classname="ODEObj";
+                        movable=false;
                 };
 
+                bool movable;
+        public:
+                //links geom to body => physics do not influence object
+                //note that the object can still be moved by user input
+                void set_immovable() {
+                        movable=false;
+                        geom.setBody(0);
+                };
+                
+                //links geom to body => physics influence object
+                void set_movable() {
+                        movable=true;
+                        const dReal *vals=getPosition();
+                        dBody::setPosition(vals);
+                        vals=getRotation();
+                        dBody::setRotation(vals);
+                        geom.setBody(*this);
+                };
+        
+                //we need these wrapper functions (do NOT use dBody or dGeom 
+                //functions directly for positioning)
+                const dReal* getPosition() {
+                        return geom.getPosition();
+                };
+
+                const dReal* getRotation() {
+                        return geom.getRotation();
+                };
+                
+                void setPosition(const dReal vals[3]) {
+                        geom.setPosition(vals[0], vals[1], vals[2]);
+                        if (!movable)
+                                dBody::setPosition(vals);
+                };
+                //convenience wrapper
+                void setPosition(dReal x, dReal y, dReal z) {
+                        dReal vals[3]={x,y,z};
+                        setPosition(vals);
+                };
+                        
+
+                void setRotation(const dMatrix3 rot) {
+                        geom.setRotation(rot);
+                        if (!movable)
+                                dBody::setRotation(rot);
+                };
+        protected:
                 virtual void update(NetMsg::pointer msg) {
                         if (msg->get_state()==NetMsg::StatPacking) {
-                                const dReal *vals=geom.getPosition();
+                                msg->pack(movable);
+                                const dReal *vals=getPosition();
                                 LOGDBG("Position==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<"]");
                                 for(unsigned int i=0; i<3; i++)
@@ -48 +98 @@
 
                                 //check ODE alignment in dMatrix3
-                                vals=geom.getRotation();
+                                vals=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++)
@@ -62 +112 @@
                                         msg->pack_ode(vals[i]);
                         } else if (msg->get_state()==NetMsg::StatUnpacking) {
+                                bool _movable;
+                                msg->unpack(_movable);
+                                if (movable && !_movable)
+                                        set_immovable();
+                                if (!movable && _movable)
+                                        set_movable();
                                 dReal vals[12];
                                 for(unsigned int i=0; i<3; i++)
                                         msg->unpack_ode(vals[i]);
                                 LOGDBG("Position==["<<vals[0]<<","<<vals[1]<<","<<vals[2]<<"]");
-                                geom.setPosition(vals[0], vals[1], vals[2]);
+                                setPosition(vals[0], vals[1], vals[2]);
                                 
                                 for(unsigned int i=0; i<3; i++)
@@ -80 +136 @@
                                         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]<<"]");
-                                geom.setRotation(vals);
+                                setRotation(vals);
 
                                 for(unsigned int i=0; i<3; i++)

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

@@ -3 +3 @@
 using namespace mmp;
 
-ODESphere::ODESphere(NetGame::pointer game, uint16_t entid, dReal r) : 
+ODESphere::ODESphere(NetGame::pointer game, uint16_t entid, bool _movable) : 
         ODEObj<NetEnt::ODESphere, dSphere>(game, entid) 
 { 
-        geom.create(get_space(), r);
+        geom.create(get_space(), 1.0);
         geom.setBody(*this);
         classname="ODESphere";
+        if (_movable)
+                set_movable();
 }
 

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

@@ -9 +9 @@
 class ODESphere : public ODEObj<NetEnt::ODESphere, dSphere>, public NetEntCreator<ODESphere> {
         public:
-                ODESphere(NetGame::pointer game, uint16_t entid, dReal r=1.0);
+                ODESphere(NetGame::pointer game, uint16_t entid, bool _movable=true);
         private:
                 virtual void update(NetMsg::pointer msg) {

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

@@ -120 +120 @@
                 boost::posix_time::time_duration renderdur=renderend-renderbegin, waitdur=framedur-renderdur;
                 LOG("Rendering: " << renderdur << " => Waiting " << waitdur);
-                boost::this_thread::sleep(waitdur);
+                if (!waitdur.is_negative())
+                        boost::this_thread::sleep(waitdur);
         }       
 }