Changeset 9095 in orxonox.OLD

Timestamp:

Jul 4, 2006, 3:11:27 AM (18 years ago)

Author:

bensch

Message:

presentation: links and checks agains lm

Location:

branches/presentation

Files:

• config.h.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/lib/math/quaternion.cc (modified) (3 diffs)
• src/world_entities/npcs/generic_npc.cc (modified) (1 diff)

branches/presentation/config.h.in

@@ -24 +24 @@
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
 
 /* Define to 1 if you have the `OpenGL' library (-lOpenGL). */

branches/presentation/configure.ac

@@ -621 +621 @@
 
 # FIXME: Replace `main' with a function in `-lm':
- AC_CHECK_LIB([m], [main])
+ AX_CHECK_REQUIRED_HEADER_LIB([math.h], [m], [sqrt])
  AX_CHECK_REQUIRED_HEADER_LIB([zlib.h], [z], [zlibVersion],,, [http://www.zlib.net])
 

branches/presentation/src/lib/math/quaternion.cc

@@ -28 +28 @@
   #define PRINT(x) printf
 #endif
-
-using namespace std;
 
 /////////////////
@@ -58 +56 @@
   m[0][1] = x.y;
   m[0][2] = x.z;
-  m[0][3] = 0;
+  m[0][3] = 0.0;
   m[1][0] = y.x;
   m[1][1] = y.y;
   m[1][2] = y.z;
-  m[1][3] = 0;
+  m[1][3] = 0.0;
   m[2][0] = z.x;
   m[2][1] = z.y;
   m[2][2] = z.z;
-  m[2][3] = 0;
-  m[3][0] = 0;
-  m[3][1] = 0;
-  m[3][2] = 0;
-  m[3][3] = 1;
+  m[2][3] = 0.0;
+  m[3][0] = 0.0;
+  m[3][1] = 0.0;
+  m[3][2] = 0.0;
+  m[3][3] = 1.0;
 
   this->from4x4(m);
@@ -285 +283 @@
   int    i, j, k;
 
-  int nxt[3] = {1, 2, 0};
+  static int nxt[3] = {1, 2, 0};
 
   tr = m[0][0] + m[1][1] + m[2][2];

branches/presentation/src/world_entities/npcs/generic_npc.cc

@@ -222 +222 @@
         Vector dir = (currentAnimation.v - this->getAbsCoor());
         dir.y = 0.0f;
-        dir.getNormalized();
+        dir.normalize();
         this->setAbsDir(Quaternion(dir, Vector(0.0, 1.0, 0.0)) * Quaternion(-M_PI_2, Vector(0.0, 1.0, 0.0)));