Changeset 182

Timestamp:

02/27/2010 05:20:57 PM (2 years ago)

Author:

magicd

Message:

collision detection goes more ;p

Files:

• trunk/include/waterworld/sim2/Animats.h (modified) (1 diff)
• trunk/include/waterworld/sim2/PhysicalBody.h (modified) (1 diff)
• trunk/include/waterworld/sim2/World.h (modified) (1 diff)
• trunk/src/waterworld/sim2/World.cpp (modified) (2 diffs)

trunk/include/waterworld/sim2/Animats.h

@@ -12 +12 @@
-         */
-        typedef std::set<boost::intrusive_ptr<Animat> > Animats;
+
+        /**
+         * List of bodies
+         */
+        //typedef std::set<boost::intrusive_ptr<palBodyBase> > Bodies;
-}
-

trunk/include/waterworld/sim2/PhysicalBody.h

@@ -22 +22 @@
-        class PhysicalBody : public IntrusivePtrBase, private boost::noncopyable
-        {
-
-
+
-                PhysicalBody(PhysicalBody const &body);
-                PhysicalBody &operator=(PhysicalBody const &body);
+                palBody *m_body;
-        public:
+                
-                PhysicalBody();
-                PhysicalBody(boost::intrusive_ptr<Animat> animat);

trunk/include/waterworld/sim2/World.h

@@ -20 +20 @@
-        {
-                Animats m_animats;
+                //Bodies m_bodies;
-                World();
-                World(World const &);

trunk/src/waterworld/sim2/World.cpp

@@ -57 +57 @@
-        {
-                for(Animats::iterator i=m_animats.begin();i!=m_animats.end();++i)
+                {
-                        (*i)->update(this, dt);
+                        palContact contact;
+                        pcd->GetContacts((palBodyBase *)(*i)->getPhysicalBody()->getBody(),contact);
+                }
-                palPhysics *tmp = getPhysics();
-                if (tmp!=NULL)
@@ -92 +96 @@
-                body->setBody(sphere);
-                animat->setPhysicalBody(body);
+
+                if(pcd)pcd->NotifyCollision((palBodyBase *) sphere,true);        //enable collision detection for the body
+
-                return body;
-        }