Changeset 542

Timestamp:

03/02/10 22:45:36 (5 months ago)

Author:

gaul@…

Message:

• move code from .h into .cc files
  
• prepare ODEObj for enable()/disable() in order to retrieve corresponding ODEObjs in collision detection
  

Location:

branches/cpp-ode/src/libmmpong

Files:

• netent.h (modified) (2 diffs)
• netgame_ode.cc (modified) (1 diff)
• netgame_ode.h (modified) (3 diffs)
• netgame_ode_pong.cc (modified) (1 diff)
• netgame_ode_pong.h (modified) (1 diff)
• ode_box.cc (modified) (2 diffs)
• ode_box.h (modified) (1 diff)
• ode_obj.h (modified) (1 diff)
• ode_sphere.cc (modified) (2 diffs)
• ode_sphere.h (modified) (1 diff)

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

@@ -4 +4 @@
 #include <ostream>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/function.hpp>
 #include <stdexcept>
@@ -22 +23 @@
 class NetGame;
 
-class NetEnt {
+class NetEnt : public boost::enable_shared_from_this<NetEnt> {
         private:
                 uint16_t entid;

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

@@ -43 +43 @@
 
 
+#define MAX_CONTACTS 4 //maximal number of contacts between two particular objects
+
+void NetGameODE::collideCallback(void *data, dGeomID o1, dGeomID o2) {
+        dContact contact[MAX_CONTACTS];
+        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;// | dContactSoftCFM;
+                contact[i].surface.mu=dInfinity;
+                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);
+                dJointAttach(c, b1, b2);
+                LOGDBG("Collision detected (BAM!)");
+        }
+}
+
+#undef MAX_CONTACTS

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

@@ -7 +7 @@
 namespace mmp {
 
-#define MAX_CONTACTS 4 //maximal number of contacts between two particular objects
 
 //used only for initialization and cleanup of ODE
@@ -26 +25 @@
                 virtual NetEnt::pointer cln_ent_new(NetMsg::pointer msg);
 
+                std::map<dGeomID, NetEnt::pointer> geom2odeobj;
+
         protected:
                 NetGameODE(NetCon::pointer cln_con) : NetGame(cln_con), space(NULL) {
@@ -43 +44 @@
                         pthis->collideCallback(NULL, o1, o2);
                 };
-                                
 
-                virtual void collideCallback(void *data, dGeomID o1, dGeomID o2) {
-                        dContact contact[MAX_CONTACTS];
-                        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;// | dContactSoftCFM;
-                                contact[i].surface.mu=dInfinity;
-                                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);
-                                dJointAttach(c, b1, b2);
-                                cout << "BAM!" << endl; // ;)
-                        }
-                };
-                
+                virtual void collideCallback(void *data, dGeomID o1, dGeomID o2); 
 };
-
-#undef MAX_CONTACTS
 
 }

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

@@ -4 +4 @@
 using namespace mmp;
 
+void NetGameODEPong::srv_init() {
+        //create bars on top and bottom
+        //uint16_t entid;
+        boost::shared_ptr<ODEBox> 
+                bartop=srv_ent_create<ODEBox>(), 
+                barbot=srv_ent_create<ODEBox>();
+        bartop->geom.setLengths(2.0,0.05,0.05);
+        bartop->setPosition(0.0, 1.05, 0.0);
+        bartop->set_immovable();
+
+        barbot->geom.setLengths(2.0,0.05,0.05);
+        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.0, 1.0, 0.0);
+}
 
 void NetGameODEPong::srv_con_start(NetCon::pointer con) {

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

@@ -48 +48 @@
 
                 //server
-                virtual void srv_init() {
-                        //create bars on top and bottom
-                        //uint16_t entid;
-                        boost::shared_ptr<ODEBox> 
-                                bartop=srv_ent_create<ODEBox>(), 
-                                barbot=srv_ent_create<ODEBox>();
-                        bartop->geom.setLengths(2.0,0.05,0.05);
-                        bartop->setPosition(0.0, 1.05, 0.0);
-                        bartop->set_immovable();
-
-                        barbot->geom.setLengths(2.0,0.05,0.05);
-                        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.0, 1.0, 0.0);
-                };
+                virtual void srv_init();
                 virtual void srv_con_start(NetCon::pointer con);
                 virtual void srv_con_end(NetCon::pointer con);

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

@@ -3 +3 @@
 using namespace mmp;
 
-ODEBox::ODEBox(NetGame::pointer game, uint16_t entid, bool _movable) : 
-        ODEObj<NetEnt::ODEBox, dBox>(game, 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);
+        LOGDBG("HA");
+        //TODO: somethin' like enable()/disable()
+        // get_game()->geom2odeobj[geom.id()]=shared_from_this();
+        LOGDBG("HU");
         classname="ODEBox";
         if (_movable)
@@ -12 +16 @@
 }
 
+void ODEBox::update(NetMsg::pointer msg) {
+        ODEObj<NetEnt::ODEBox, dBox>::update(msg);
+        if (msg->get_state()==NetMsg::StatPacking) {
+                dVector3 lens;
+                geom.getLengths(lens);
+                LOGDBG("Lengths==["<<lens[0]<<","<<lens[1]<<","<<lens[2]<<"]");
+                for(unsigned int i=0; i<3; i++)
+                        msg->pack_ode(lens[i]);
+        } else if (msg->get_state()==NetMsg::StatUnpacking) {
+                dVector3 lens;
+                for(unsigned int i=0; i<3; i++)
+                        msg->unpack_ode(lens[i]);
+                LOGDBG("Lengths==["<<lens[0]<<","<<lens[1]<<","<<lens[2]<<"]");
+                geom.setLengths(lens[0],lens[1],lens[2]);
+        } else 
+                throw std::runtime_error("NetMsg not in packing or unpacking state");
+}
+

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

@@ -12 +12 @@
                 ODEBox(NetGame::pointer game, uint16_t entid, bool _movable=true);
         private:
-                virtual void update(NetMsg::pointer msg) {
-                        ODEObj<NetEnt::ODEBox, dBox>::update(msg);
-                        if (msg->get_state()==NetMsg::StatPacking) {
-                                dVector3 lens;
-                                geom.getLengths(lens);
-                                LOGDBG("Lengths==["<<lens[0]<<","<<lens[1]<<","<<lens[2]<<"]");
-                                for(unsigned int i=0; i<3; i++)
-                                        msg->pack_ode(lens[i]);
-                        } else if (msg->get_state()==NetMsg::StatUnpacking) {
-                                dVector3 lens;
-                                for(unsigned int i=0; i<3; i++)
-                                        msg->unpack_ode(lens[i]);
-                                LOGDBG("Lengths==["<<lens[0]<<","<<lens[1]<<","<<lens[2]<<"]");
-                                geom.setLengths(lens[0],lens[1],lens[2]);
-                        } else 
-                                throw std::runtime_error("NetMsg not in packing or unpacking state");
-                };
+                virtual void update(NetMsg::pointer msg);
 };
 

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

@@ -36 +36 @@
                         movable=false;
                 };
+                ~ODEObj() {
+                        if (geom.id())
+                                game->geom2odeobj.erase(geom.id());
+                }
 
                 bool movable;

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

@@ -3 +3 @@
 using namespace mmp;
 
-ODESphere::ODESphere(NetGame::pointer game, uint16_t entid, bool _movable) : 
-        ODEObj<NetEnt::ODESphere, dSphere>(game, entid) 
+ODESphere::ODESphere(NetGame::pointer _game, uint16_t entid, bool _movable) : 
+        ODEObj<NetEnt::ODESphere, dSphere>(_game, entid) 
 { 
         geom.create(get_space(), 1.0);
-        geom.setBody(*this);
+        //TODO get_game()->geom2odeobj[geom.id()]=shared_from_this();
         classname="ODESphere";
         if (_movable)
@@ -13 +13 @@
 }
 
-/*
-bool ObjSphere::serialize(ostream &o, NetObjMode type) {
 
-        return true;
+void ODESphere::update(NetMsg::pointer msg) {
+        ODEObj<NetEnt::ODESphere, dSphere>::update(msg);
+        if (msg->get_state()==NetMsg::StatPacking) {
+                msg->pack_ode(geom.getRadius());
+        } else if (msg->get_state()==NetMsg::StatUnpacking) {
+                dReal r;
+                msg->unpack_ode(r);
+                geom.setRadius(r);
+        } else 
+                throw std::runtime_error("NetMsg not in packing or unpacking state");
 }
-*/
+

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

@@ -11 +11 @@
                 ODESphere(NetGame::pointer game, uint16_t entid, bool _movable=true);
         private:
-                virtual void update(NetMsg::pointer msg) {
-                        ODEObj<NetEnt::ODESphere, dSphere>::update(msg);
-                        if (msg->get_state()==NetMsg::StatPacking) {
-                                msg->pack_ode(geom.getRadius());
-                        } else if (msg->get_state()==NetMsg::StatUnpacking) {
-                                dReal r;
-                                msg->unpack_ode(r);
-                                geom.setRadius(r);
-                        } else 
-                                throw std::runtime_error("NetMsg not in packing or unpacking state");
-                };
+                virtual void update(NetMsg::pointer msg);
 };