Changeset 179

Timestamp:

02/25/2010 08:28:52 AM (2 years ago)

Author:

mceier

Message:

4 animats colliding

Signed-off-by: Mariusz Ceier <mceier@gmail.com>

Files:

• trunk/src/gui2/Application.cpp (modified) (1 diff)
• trunk/src/waterworld4.cpp (modified) (3 diffs)

trunk/src/gui2/Application.cpp

@@ -28 +28 @@
-                glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-                glLoadIdentity();
+                glScalef(0.1,0.1,0.1);
-                if((m_renderer)&&(m_world))
-                for(waterworld::Animats::const_iterator i=m_world->getAnimats().begin();
-                        i!=m_world->getAnimats().end();++i)
-                {
-0.1
+1.0
-                }
-                SDL_GL_SwapBuffers();

trunk/src/waterworld4.cpp

@@ -27 +27 @@
-                using namespace std;
-                m_alpha += m_omega*dt;
-0.002
+20.0
-                //cout << "updating force: alpha = " << m_alpha << endl;
-        }
@@ -52 +52 @@
-        boost::intrusive_ptr<Animat> animat = new Animat(animatGenID);
-        boost::intrusive_ptr<PhysicalBody> body = 
-
-
+
+
+
-        myWorld->getAnimats().insert(animat);
-        boost::intrusive_ptr<Animat> animat2 = new Animat(animatGenID);
-        boost::intrusive_ptr<PhysicalBody> body2 = 
-
-
+
+
+
-        myWorld->getAnimats().insert(animat2);
-        boost::intrusive_ptr<Animat> animat3 = new Animat(animatGenID);
-        boost::intrusive_ptr<PhysicalBody> body3 = 
-
-
+
+
+
-        myWorld->getAnimats().insert(animat3);
+        boost::intrusive_ptr<Animat> animat4 = new Animat(animatGenID);
+        boost::intrusive_ptr<PhysicalBody> body4 = 
+                myWorld->createAnimatsBody(animat4,1.0,0.1,makePosition(0,-4,0));
+        animat4->getActuators().push_back(new Actuator(makeForce(0.0,1,0.0), makePosition(0,0,0)));
+        animat4->getActuators().push_back(new Actuator(makeForce(0.0,-0.1*palPhysicsDesc::DEFAULT_GRAVITY_Y,0.0), makePosition(0,0,0)));
+        myWorld->getAnimats().insert(animat4);
-        gui::Application app(myWorld);
-        quit=!app.init(640,480,16);
@@ -71 +80 @@
-                for(unsigned int i=0;(!quit) && (i<100);++i)
-                {
-
-
-
-
+
-                        app.draw();
-                }