Linux c++11

Makefile

@@ -0,0 +1,38 @@
+# CYCLONEPHYSICS LIB
+CXXFLAGS=-O2 -I./include -fPIC
+CYCLONEOBJS=src/body.o src/collide_coarse.o src/collide_fine.o src/contacts.o src/core.o src/fgen.o src/joints.o src/particle.o src/pcontacts.o src/pfgen.o src/plinks.o src/pworld.o src/random.o src/world.o
+
+
+# DEMO FILES
+SOURCES=body
+LDFLAGS=-lGL -lglut -lGLU -L./Debug -std=c++0x
+DEMO_CPP=./src/demos/app.cpp ./src/demos/timing.cpp ./src/demos/main.cpp
+CYCLONELIB=./lib/libcyclone.so
+
+DEMOS=ballistic bigballistic blob bridge explosion fireworks flightsim fracture platform ragdoll sailboat
+
+
+
+all:	libcyclone.so $(DEMOS)
+
+libcyclone.so: $(CYCLONEOBJS)
+	$(CXX) $(CYCLONEOBJS) -shared -dynamiclib -o lib/libcyclone.so
+
+$(DEMOS): 
+	$(CXX) -o ./bin/$@ $(DEMO_CPP) $(CYCLONELIB) ./src/demos/$@/[email protected] $(CXXFLAGS) $(LDFLAGS) 
+
+
+clean:
+	rm -f src/*.o lib/libcyclone.so
+	rm -f 		\
+	./bin/fireworks		\
+	./bin/fracture		\
+	./bin/flightsim		\
+	./bin/bridge		\
+	./bin/sailboat		\
+	./bin/explosion		\
+	./bin/ballistic		\
+	./bin/platform		\
+	./bin/bigballistic	\
+	./bin/blob		\
+	./bin/ragdoll

include/cyclone/collide_fine.h

@@ -44,8 +44,8 @@ namespace cyclone {
          * and intersection routines, so they should have
          * access to its data.
          */
-        friend IntersectionTests;
-        friend CollisionDetector;
+        friend class IntersectionTests;
+        friend class CollisionDetector;
 
         /**
          * The rigid body that is represented by this primitive.
@@ -309,4 +309,4 @@ namespace cyclone {
 
 } // namespace cyclone
 
-#endif // CYCLONE_COLLISION_FINE_H
+#endif // CYCLONE_COLLISION_FINE_H

include/cyclone/contacts.h

@@ -64,7 +64,7 @@ namespace cyclone {
          * The contact resolver object needs access into the contacts to
          * set and effect the contact.
          */
-        friend ContactResolver;
+        friend class ContactResolver;
 
     public:
         /**

include/cyclone/core.h

@@ -86,7 +86,8 @@
  * the accompanying software and documentation license.
  */
 
-#include <math.h>
+#include <cmath>
+#include <cstddef>
 
 /**
  * @file

include/cyclone/pcontacts.h

@@ -53,7 +53,7 @@ namespace cyclone {
          * The contact resolver object needs access into the contacts to
          * set and effect the contact.
          */
-        friend ParticleContactResolver;
+        friend class ParticleContactResolver;
 
 
     public:
@@ -194,4 +194,4 @@ namespace cyclone {
 
 } // namespace cyclone
 
-#endif // CYCLONE_CONTACTS_H
+#endif // CYCLONE_CONTACTS_H

include/cyclone/random.h

@@ -32,6 +32,15 @@ namespace cyclone {
     class Random
     {
     public:
+    	/**
+    	 * left bitwise rotation
+    	 */
+
+    	unsigned rotl(unsigned n, unsigned r);
+    	/**
+    	 * right bitwise rotation
+    	 */
+    	unsigned rotr(unsigned n, unsigned r);
 
         /**
          * Creates a new random number stream with a seed based on
@@ -122,4 +131,4 @@ namespace cyclone {
 
 } // namespace cyclone
 
-#endif // CYCLONE_BODY_H
+#endif // CYCLONE_BODY_H

include/cyclone/world.h

@@ -116,4 +116,4 @@ namespace cyclone {
 
 } // namespace cyclone
 
-#endif // CYCLONE_PWORLD_H
+#endif // CYCLONE_PWORLD_H

src/collide_fine.cpp

@@ -286,7 +286,7 @@ static inline real penetrationOnAxis(
 static inline bool tryAxis(
     const CollisionBox &one,
     const CollisionBox &two,
-    Vector3& axis,
+    Vector3 axis,
     const Vector3& toCentre,
     unsigned index,
 
@@ -420,7 +420,7 @@ unsigned CollisionDetector::boxAndBox(
 
     // We start assuming there is no contact
     real pen = REAL_MAX;
-    unsigned best = 0xffffff;
+    unsigned best = (~0);
 
     // Now we check each axes, returning if it gives us
     // a separating axis, and keeping track of the axis with
@@ -448,7 +448,7 @@ unsigned CollisionDetector::boxAndBox(
     CHECK_OVERLAP(one.getAxis(2) % two.getAxis(2), 14);
 
     // Make sure we've got a result.
-    assert(best != 0xffffff);
+    assert(best != (~0));
 
     // We now know there's a collision, and we know which
     // of the axes gave the smallest penetration. We now
@@ -695,10 +695,10 @@ unsigned CollisionDetector::boxAndHalfSpace(
             // Move onto the next contact
             contact++;
             contactsUsed++;
-            if (contactsUsed == data->contactsLeft) return contactsUsed;
+            if (contactsUsed == (unsigned)data->contactsLeft) return contactsUsed;
         }
     }
 
     data->addContacts(contactsUsed);
     return contactsUsed;
-}
+}

src/contacts.cpp

@@ -154,7 +154,8 @@ void Contact::calculateDesiredDeltaVelocity(real duration)
 
     if (body[0]->getAwake())
     {
-        body[0]->getLastFrameAcceleration() * duration * contactNormal;
+	velocityFromAcc+= 
+	    body[0]->getLastFrameAcceleration() * duration * contactNormal;
     }
 
     if (body[1] && body[1]->getAwake())

src/demos/app.cpp

@@ -166,7 +166,7 @@ void MassAggregateApplication::display()
         p++)
     {
         cyclone::Particle *particle = *p;
-        cyclone::Vector3 &pos = particle->getPosition();
+        const cyclone::Vector3 &pos = particle->getPosition();
         glPushMatrix();
         glTranslatef(pos.x, pos.y, pos.z);
         glutSolidSphere(0.1f, 20, 10);
@@ -324,4 +324,4 @@ void RigidBodyApplication::key(unsigned char key)
     }
 
     Application::key(key);
-}
+}

src/demos/ballistic/ballistic.cpp

@@ -38,7 +38,7 @@ class BallisticDemo : public Application
     {
         cyclone::Particle particle;
         ShotType type;
-        unsigned startTime;
+        double startTime;
 
         /** Draws the round. */
         void render()
@@ -272,4 +272,4 @@ void BallisticDemo::key(unsigned char key)
 Application* getApplication()
 {
     return new BallisticDemo();
-}
+}

src/demos/bigballistic/bigballistic.cpp

@@ -30,7 +30,7 @@ class AmmoRound : public cyclone::CollisionSphere
 {
 public:
     ShotType type;
-    unsigned startTime;
+    double startTime;
 
     AmmoRound()
     {
@@ -460,4 +460,4 @@ void BigBallisticDemo::key(unsigned char key)
 Application* getApplication()
 {
     return new BigBallisticDemo();
-}
+}

src/demos/fireworks/fireworks.cpp

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-static cyclone::Random random;
+static cyclone::Random crandom;
 
 /**
  * Fireworks are particles, with additional data for rendering and
@@ -143,7 +143,7 @@ struct FireworkRule
     void create(Firework *firework, const Firework *parent = NULL) const
     {
         firework->type = type;
-        firework->age = random.randomReal(minAge, maxAge);
+        firework->age = crandom.randomReal(minAge, maxAge);
 
         cyclone::Vector3 vel;
         if (parent) {
@@ -154,12 +154,12 @@ struct FireworkRule
         else
         {
             cyclone::Vector3 start;
-            int x = (int)random.randomInt(3) - 1;
+            int x = (int)crandom.randomInt(3) - 1;
             start.x = 5.0f * cyclone::real(x);
             firework->setPosition(start);
         }
 
-        vel += random.randomVector(minVelocity, maxVelocity);
+        vel += crandom.randomVector(minVelocity, maxVelocity);
         firework->setVelocity(vel);
 
         // We use a mass of one in all cases (no point having fireworks
@@ -442,7 +442,7 @@ void FireworksDemo::display()
             case 9: glColor3f(1,0.5f,0.5f); break;
             };
 
-            cyclone::Vector3 &pos = firework->getPosition();
+            const cyclone::Vector3 &pos = firework->getPosition();
             glVertex3f(pos.x-size, pos.y-size, pos.z);
             glVertex3f(pos.x+size, pos.y-size, pos.z);
             glVertex3f(pos.x+size, pos.y+size, pos.z);
@@ -481,4 +481,4 @@ void FireworksDemo::key(unsigned char key)
 Application* getApplication()
 {
     return new FireworksDemo();
-}
+}

src/demos/main.cpp

@@ -100,7 +100,7 @@ void motion(int x, int y)
 /**
  * The main entry point. We pass arguments onto GLUT.
  */
-void main(int argc, char** argv)
+int main(int argc, char** argv)
 {
     // Set up GLUT and the timers
     glutInit(&argc, argv);
@@ -126,4 +126,4 @@ void main(int argc, char** argv)
     app->deinit();
     delete app;
     TimingData::deinit();
-}
+}