Misc

README.md

@@ -77,6 +77,8 @@ The included example Font, [Droid Sans Mono](http://www.droidfonts.com/licensing
 
 The included sample WAV file is made from the [Falling Mate ringtone](http://brechler-web.de/fallingmate/) by [Plaetzchen](http://plaetzchen.cc).
 
+The included Unit Test Framework [greatest](https://github.com/silentbicycle/greatest/) by Scott Vokes is licensed under the [ISC License](http://www.isc.org/downloads/software-support-policy/isc-license/).
+
 OpenRaider is based on code, specs, and alogrithms from:
 
 + GooseEgg/Freyja 3d Modelers by Mongoose

include/MatMath.h

@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : Freyja
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
  * Email   : stu7440@westga.edu
- * Object  : 
+ * Object  :
  * License : No use w/o permission (C) 2002 Mongoose
- * Comments: 
+ * Comments:
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.05.11:
  * Mongoose - Created
@@ -83,7 +83,7 @@ vec_t helDistToBboxFromPlane3v(vec3_t min, vec3_t max, vec4_t plane);
 
 vec_t helDist3v(vec3_t a, vec3_t b);
 /*------------------------------------------------------
- * Pre  : Given point A and B 
+ * Pre  : Given point A and B
  * Post : Returns length of line segment
  *
  *-- History ------------------------------------------
@@ -94,7 +94,7 @@ vec_t helDist3v(vec3_t a, vec3_t b);
 
 void helMidpoint3v(vec3_t a, vec3_t b, vec3_t mid);
 /*------------------------------------------------------
- * Pre  : Given point A and B 
+ * Pre  : Given point A and B
  * Post : Returns midpoint of line segment
  *
  *-- History ------------------------------------------
@@ -128,6 +128,4 @@ vec_t helRadToDeg(vec_t rad);
 
 vec_t helRandomNum(vec_t from, vec_t to);
 
-/* Some cruft for ye olde mtk3d compatibility */
-void helVectorMatrixMult4dv(double v[4], matrix_t m, double result[4]);
 #endif

src/MatMath.cpp

@@ -9,22 +9,6 @@
 
 #define COMPUTE
 
-void helVectorMatrixMult4dv(double v[4], matrix_t m, double result[4])
-{
-	/* Column major */
-	result[0] = m[ 0] * v[0] + m[ 4] * v[1] + m[ 8] * v[2] + m[12] * v[3];
-	result[1] = m[ 1] * v[0] + m[ 5] * v[1] + m[ 9] * v[2] + m[13] * v[3];
-	result[2] = m[ 2] * v[0] + m[ 6] * v[1] + m[10] * v[2] + m[14] * v[3];
-	result[3] = m[ 3] * v[0] + m[ 7] * v[1] + m[11] * v[2] + m[15] * v[3];
-
-	/* Row major */
-   //result[0] = m[ 0] * v[0] + m[ 1] * v[1] + m[ 2] * v[2] + m[ 3] * v[3];
-	//result[1] = m[ 4] * v[0] + m[ 5] * v[1] + m[ 6] * v[2] + m[ 7] * v[3];
-	//result[2] = m[ 8] * v[0] + m[ 9] * v[1] + m[10] * v[2] + m[11] * v[3];
-	//result[3] = m[12] * v[0] + m[13] * v[1] + m[14] * v[2] + m[15] * v[3];
-}
-
-
 bool tmpHelSphereIntersectLine(Vector3d pos, Vector3d lastPos,
 										 Vector3d center, vec_t radius)
 {

test/greatest.h

@@ -17,6 +17,12 @@
 #ifndef GREATEST_H
 #define GREATEST_H
 
+#ifdef __cplusplus
+#define __STDC_VERSION__ 19901L
+extern "C"
+{
+#endif
+
 #define GREATEST_VERSION_MAJOR 0
 #define GREATEST_VERSION_MINOR 9
 #define GREATEST_VERSION_PATCH 3
@@ -295,13 +301,13 @@ void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, void *udata);
         }                                                               \
         greatest_info.msg = NULL;                                       \
     } while (0)
-        
+
 #define GREATEST_PASSm(MSG)                                             \
     do {                                                                \
         greatest_info.msg = MSG;                                        \
         return 0;                                                       \
     } while (0)
-        
+
 #define GREATEST_FAILm(MSG)                                             \
     do {                                                                \
         greatest_info.fail_file = __FILE__;                             \
@@ -588,4 +594,8 @@ greatest_run_info greatest_info
 #define RUN_TESTp      GREATEST_RUN_TESTp
 #endif /* USE_ABBREVS */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

test/mtk_tga.cpp

@@ -6,35 +6,42 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <mtk_tga.h>
-
 #include "greatest.h"
 
-#define TESTFILE "data/font-0.tga"
-FILE *f = NULL;
-
-TEST checkFile() {
-    ASSERTm("File wasn't opened. Please run the suite!", f != NULL);
+//! \todo generate list?
+const char *testFiles[] = {
+    "data/font-0.tga",
+    "data/particle.tga",
+    "data/snow.tga",
+    "data/snow2.tga",
+    "data/splash.tga",
+    "data/white.tga"
+};
+
+TEST checkFile(FILE *f) {
+    ASSERTm("File wasn't opened.", f != NULL);
     ASSERT_FALSEm("File is invalid?!", mtk_image__tga_check(f));
     PASS();
 }
 
-TEST loadFile() {
+TEST loadFile(FILE *f) {
     unsigned char *image;
     unsigned int width, height;
     char type;
-    ASSERTm("File wasn't opened. Please run the suite!", f != NULL);
+    ASSERTm("File wasn't opened.", f != NULL);
     ASSERT_FALSEm("File couldn't be loaded!", mtk_image__tga_load(f, &image, &width, &height, &type));
     printf("\nWidth: %u\nHeight: %u\nType: %d\n", width, height, type);
     PASS();
 }
 
 SUITE(tgaSuite) {
-    f = fopen(TESTFILE, "r");
-    RUN_TEST(checkFile);
-    RUN_TEST(loadFile);
-    fclose(f);
+    for (int i = 0; i < (sizeof(testFiles) / sizeof(testFiles[0])); i++) {
+        FILE *f = fopen(testFiles[i], "r");
+        RUN_TESTp(checkFile, f);
+        RUN_TESTp(loadFile, f);
+        fclose(f);
+    }
 }
 
 GREATEST_MAIN_DEFS();