Changeset 5279 in orxonox.OLD for trunk

Timestamp:

Oct 4, 2005, 9:20:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: almost mac compatibility

Location:

trunk

Files:

• configure.ac (modified) (4 diffs)
• src/defs/glincl.h (modified) (1 diff)
• src/lib/collision_detection/bounding_volume.h (modified) (1 diff)
• src/lib/collision_detection/bv_tree.h (modified) (1 diff)
• src/lib/collision_detection/bv_tree_node.h (modified) (1 diff)
• src/lib/event/event_listener.h (modified) (1 diff)
• src/lib/graphics/render2D/element_2d.h (modified) (1 diff)
• src/lib/lang/base_object.h (modified) (1 diff)
• src/lib/shell/shell_command.h (modified) (1 diff)
• src/lib/sound/ogg_player.h (modified) (1 diff)
• src/lib/sound/sound_engine.cc (modified) (1 diff)
• src/util/fast_factory.h (modified) (1 diff)
• src/util/loading/load_param.h (modified) (1 diff)

trunk/configure.ac

@@ -374 +374 @@
 # openGL #
 #--------#
-ac_save_LDFLAGS="${LDFLAGS}"
-
 # checking gl header
    AC_CHECK_HEADERS([GL/gl.h] ,,
@@ -381 +379 @@
 
 #  checking for Unix GL
-   AC_CHECK_LIB([GL], [main], [FOUND_GL=yes; LIBS="$LIBS -lGL"; LDFLAGS="${LDFLAGS} -lGL"])
+   AC_CHECK_LIB([GL], [main], [FOUND_GL=yes; LIBS="$LIBS -lGL"])
    if test x$FOUND_GL != xyes ; then
          echo "------------------"
@@ -414 +412 @@
          exit -1
    fi
-## resetting LD-flags as before GL
-LDFLAGS="${ac_save_LDFLAGS}"
 
 #--------#
@@ -480 +476 @@
 
    LIBS="$LIBS -framework OpenGL"
+
+
+
+# checking for GLEW-headers
+   AC_CHECK_HEADERS([GL/glew.h] ,,
+      [AC_MSG_ERROR([cannot find glew headers]) ])
+# checking for GLEW-lib
+  AC_CHECK_LIB([GLEW], [main], [FOUND_GLEW=yes; LIBS="$LIBS -lGLEW"])
+   if test x$FOUND_GLEW != xyes ; then
+         echo "------------------"
+         echo "glew not found."
+         echo "please install the glew package which can be found at http://glew.sourceforge.net"
+         echo "------------------"
+         exit -1
+   fi
+
 
    AC_CHECK_HEADERS([OpenAL/al.h] ,,

trunk/src/defs/glincl.h

@@ -14 +14 @@
 #include <GL/glu.h>
 #else
-#include <OpenGL/glew.h>
+#include <GL/glew.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>

trunk/src/lib/collision_detection/bounding_volume.h

@@ -25 +25 @@
 
     sVec3D* getVertices() const { return this->vertices; }
-    virtual void mergeWith(const BoundingVolume &bv) = NULL;
+    virtual void mergeWith(const BoundingVolume &bv) = 0;
 
-    virtual void drawBV(int currentDepth, int drawMode) const = NULL;
+    virtual void drawBV(int currentDepth, int drawMode) const = 0;
 
 

trunk/src/lib/collision_detection/bv_tree.h

@@ -39 +39 @@
   virtual ~BVTree();
 
-  virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length) = NULL;
-  virtual void flushTree() = NULL;
+  virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length) = 0;
+  virtual void flushTree() = 0;
 
-  virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
-  virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = NULL;
+  virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
+  virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = 0;
 
-  virtual void drawBV(int depth, int drawMode) const = NULL;
+  virtual void drawBV(int depth, int drawMode) const = 0;
 
 

trunk/src/lib/collision_detection/bv_tree_node.h

@@ -25 +25 @@
   virtual ~BVTreeNode();
 
-  virtual void spawnBVTree(const int depth, sVec3D *verticesList, const int length ) = NULL;
+  virtual void spawnBVTree(const int depth, sVec3D *verticesList, const int length ) = 0;
 
-  virtual BoundingVolume* getBV(int index) const = NULL;
+  virtual BoundingVolume* getBV(int index) const = 0;
   inline const int getIndex() { return this->treeIndex; }
 
-  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
+  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
 
-  virtual void drawBV(int depth, int drawMode) = NULL;
+  virtual void drawBV(int depth, int drawMode) = 0;
 
 

trunk/src/lib/event/event_listener.h

@@ -21 +21 @@
    * @param event: the event
   */
-  virtual void process(const Event &event) = NULL;
+  virtual void process(const Event &event) = 0;
 };
 

trunk/src/lib/graphics/render2D/element_2d.h

@@ -177 +177 @@
   public:
     virtual void tick(float dt);
-    virtual void draw() const = NULL;
+    virtual void draw() const = 0;
 
   private:

trunk/src/lib/lang/base_object.h

@@ -12 +12 @@
 #include "class_id.h"
 #ifndef NULL
-#define NULL 0x0        //!< NULL
+#define NULL     0    //!< NULL
 #endif
 

trunk/src/lib/shell/shell_command.h

@@ -106 +106 @@
   private:
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void executeCommand (BaseObject* object, const char* parameters) = NULL;
+    virtual void executeCommand (BaseObject* object, const char* parameters) = 0;
 
   protected:

trunk/src/lib/sound/ogg_player.h

@@ -13 +13 @@
 #include "base_object.h"
 
-#include <AL/al.h>
+#include "alincl.h"
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>

trunk/src/lib/sound/sound_engine.cc

@@ -60 +60 @@
   /* according to http://www.edenwaith.com/products/pige/tutorials/openal.php the alutLoadWAVFile differs from platform to platform*/
 #ifdef __APPLE__
-  alutLoadWAVFile(fileName, &format, &data, &this->size, &freq);
-#elifdef __WIN32__
+  alutLoadWAVFile((ALbyte*)fileName, &format, &data, &this->size, &freq);
+#elif defined __WIN32__
   alutLoadWAVFile(fileName, &format, &data, &size, &freq, &this->loop);
 #else

trunk/src/util/fast_factory.h

@@ -83 +83 @@
 
     /** generates a new Object of the Class T */
-    virtual void fabricate() = NULL;
+    virtual void fabricate() = 0;
 
   private:

trunk/src/util/loading/load_param.h

@@ -307 +307 @@
     {
       const TiXmlElement* elem = root->FirstChildElement(paramName);
-      if (likely(elem != NULL))
+      if (elem != NULL)
         (*pt2Object.*function)(elem);
       else