Added time utils, docLocalFull target

CMakeLists.txt

@@ -67,6 +67,16 @@ if (DOXYGEN_FOUND)
         COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
         COMMAND sed -i '' "s/HAVE_DOT               = NO/HAVE_DOT               = YES/g" Doxyfile
         SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+
+    # Add custom target to create local documentation with call and caller graphs
+    add_custom_target (docLocalFull
+        COMMAND sed -i '' "s/CALL_GRAPH             = NO/CALL_GRAPH             = YES/g" Doxyfile
+        COMMAND sed -i '' "s/CALLER_GRAPH           = NO/CALLER_GRAPH           = YES/g" Doxyfile
+        COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
+        COMMAND cp -R doc/html/* ${PROJECT_SOURCE_DIR}/../apache/
+        COMMAND sed -i '' "s/CALL_GRAPH             = YES/CALL_GRAPH             = NO/g" Doxyfile
+        COMMAND sed -i '' "s/CALLER_GRAPH           = YES/CALLER_GRAPH           = NO/g" Doxyfile
+        SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
 endif (DOXYGEN_FOUND)
 
 # Clean doc files

ChangeLog

@@ -8,6 +8,7 @@
 	[ 20140307 ]
 	* Removed duplicated GL initialization code
 	* Removed duplicated TGA writing code from Texture
+	* Moved system_timer into time utilities, changed its API
 
 	[ 20140306 ]
 	* Created utility library

include/System.h

@@ -179,13 +179,4 @@ protected:
     unsigned int mConsoleKey;          //!< Console toggle event now handled lower
 };
 
-//! \todo Could make these static methods later, depends on API evolution
-
-/*!
- * \brief Sets timer state and returns number of ticks
- * \param state 0 - reset, 1 - get number of ticks
- * \returns number of ticks
- */
-unsigned int system_timer(int state);
-
 #endif

include/utils/time.h

@@ -0,0 +1,32 @@
+/*!
+ * \file include/utils/time.h
+ * \brief Time handling utilities
+ *
+ * \author xythobuz
+ * \author Mongoose
+ */
+
+#ifndef _UTILS_TIME_H_
+#define _UTILS_TIME_H_
+
+#if defined(linux) || defined(__APPLE__)
+#include <time.h>
+#include <sys/time.h>
+#endif
+
+extern struct timeval system_timer_start; //!< System timer start time
+extern struct timeval system_timer_stop; //!< System timer last read time
+extern struct timezone system_timer_tz; //!< System timer timezone info
+
+/*!
+ * \brief Read the system timer
+ * \returns number of ticks
+ */
+unsigned int system_timer();
+
+/*!
+ * \brief Reset the system timer
+ */
+void system_timer_reset();
+
+#endif

src/SDLSystem.cpp

@@ -104,24 +104,6 @@ void SDLSystem::resize(unsigned int width, unsigned int height) {
     m_width = width;
     m_height = height;
 
-    glViewport(0, 0, width, height);
-
-    /* All this is already done in System::resizeGL() !?
-    GLfloat aspect = (GLfloat)width/(GLfloat)height;
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-
-    // gluPerspective is deprecated!
-    // gluPerspective(m_fovY, aspect, m_clipNear, m_clipFar);
-    // fix: http://stackoverflow.com/a/2417756
-    GLfloat fH = tanf(m_fovY * HEL_PI / 360.0f) * m_clipNear;
-    GLfloat fW = fH * aspect;
-    glFrustum(-fW, fW, -fH, fH, m_clipNear, m_clipFar);
-
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    */
-
     // Resize context
     resizeGL(width, height);
 }

src/System.cpp

@@ -23,24 +23,15 @@
 #include <GL/glu.h>
 #endif
 
-#if defined(linux) || defined(__APPLE__)
-#include <time.h>
-#include <sys/time.h>
-#endif
-
 #include "utils/math.h"
+#include "utils/time.h"
 #include "System.h"
 
-////////////////////////////////////////////////////////////
-// Constructors
-////////////////////////////////////////////////////////////
-
-System::System()
-{
+System::System() {
     m_width = 800;
     m_height = 600;
 
-    m_driver = 0x0;
+    m_driver = NULL;
 
     m_clipFar  = 4000.0f;
     m_clipNear = 4.0f;
@@ -63,25 +54,18 @@ System::System()
 #endif
 }
 
-
-System::~System()
-{
+System::~System() {
 }
 
-
-////////////////////////////////////////////////////////////
-// Public Accessors
-////////////////////////////////////////////////////////////
-
-
-unsigned int System::getTicks()
-{
-    return system_timer(1);
+unsigned int System::getTicks() {
+    return system_timer();
 }
 
+void System::resetTicks() {
+    system_timer_reset();
+}
 
-int System::createDir(char *path)
-{
+int System::createDir(char *path) {
 #ifdef WIN32
     return _mkdir(path);
 #else
@@ -89,80 +73,57 @@ int System::createDir(char *path)
 #endif
 }
 
-
-////////////////////////////////////////////////////////////
-// Public Mutators
-////////////////////////////////////////////////////////////
-
-unsigned int System::addCommandMode(const char *command)
-{
-    if (command && command[0] == '[')
-    {
+unsigned int System::addCommandMode(const char *command) {
+    if (command && command[0] == '[') {
         mCmdModes.pushBack(command);
         return (mCmdModes.size() - 1);
-    }
-    else
-    {
+    } else {
         return 0;
     }
 }
 
 //! \fixme Modifer support later
-void System::bindKeyCommand(const char *cmd, unsigned int key, int event)
-{
+void System::bindKeyCommand(const char *cmd, unsigned int key, int event) {
     printf("Bound command '%s' -> event %i (0x%x key)\n", cmd, event, key);
     mKeyEvents[key] = event;
 }
 
-
-void System::command(const char *cmd)
-{
+void System::command(const char *cmd) {
     bool modeFound = false;
     char *cmdbuf;
 
-
     if (!cmd || !cmd[0]) // Null command string
         return;
 
-    if (cmd[0] == '[') // Set a mode, eg "[Engine.OpenGL.Driver]"
-    {
-        for (mCmdModes.start(); mCmdModes.forward(); mCmdModes.next())
-        {
-            if (strcmp(cmd, mCmdModes.current()) == 0)
-            {
+    if (cmd[0] == '[') { // Set a mode, eg "[Engine.OpenGL.Driver]"
+        for (mCmdModes.start(); mCmdModes.forward(); mCmdModes.next()) {
+            if (strcmp(cmd, mCmdModes.current()) == 0) {
                 mCommandMode = mCmdModes.getCurrentIndex();
                 modeFound = true;
             }
         }
 
-        if (!modeFound)
-        {
+        if (!modeFound) {
             //  mCommandMode = 0;
             printf("Command> Unknown mode '%s'\n", cmd);
         }
-    }
-    else // Execute a command in current mode, eg "stat fps"
-    {
+    } else { // Execute a command in current mode, eg "stat fps"
         cmdbuf = new char[strlen(cmd) + 1];
         strncpy(cmdbuf, cmd, strlen(cmd) + 1);
         handleCommand(cmdbuf, mCommandMode);
     }
 }
 
-
-int System::loadResourceFile(const char *filename)
-{
+int System::loadResourceFile(const char *filename) {
     char buffer[256];
     bool line_comment = false;
     FILE *f;
     char c;
     int i, j;
 
-
     f = fopen(filename, "r");
 
-    if (!f)
-    {
+    if (!f) {
         perror(filename);
         return -1;
     }
@@ -173,19 +134,16 @@ int System::loadResourceFile(const char *filename)
     buffer[0] = 0;
 
     // Strip out whitespace and comments
-    while (fscanf(f, "%c", &c) != EOF)
-    {
+    while (fscanf(f, "%c", &c) != EOF) {
         if (line_comment && c != '\n')
             continue;
 
-        if (i > 254)
-        {
+        if (i > 254) {
             printf("loadResourceFile> Overflow handled\n");
             i = 254;
         }
 
-        switch (c)
-        {
+        switch (c) {
             case '\v':
             case '\t':
                 break;
@@ -195,12 +153,9 @@ int System::loadResourceFile(const char *filename)
                 break;
             case '\n':
                 if (line_comment)
-                {
                     line_comment = false;
-                }
 
-                if (buffer[0] == 0)
-                {
+                if (buffer[0] == 0) {
                     i = 0;
                     continue;
                 }
@@ -209,12 +164,9 @@ int System::loadResourceFile(const char *filename)
                 //printf("'%s'\n", buffer);
 
                 // 'Preprocessor' commands
-                if (buffer[0] == '@')
-                {
-                    if (strncmp(buffer, "@include ", 9) == 0)
-                    {
-                        for (j = 9; j < i; ++j)
-                        {
+                if (buffer[0] == '@') {
+                    if (strncmp((buffer + 1), "include ", 8) == 0) {
+                        for (j = 9; j < i; ++j) {
                             buffer[j-9] = buffer[j];
                             buffer[j-8] = 0;
                         }
@@ -223,9 +175,7 @@ int System::loadResourceFile(const char *filename)
 
                         loadResourceFile(fullPath(buffer, 0));
                     }
-                }
-                else
-                {
+                } else {
                     command(buffer);
                 }
 
@@ -242,19 +192,13 @@ int System::loadResourceFile(const char *filename)
     return 0;
 }
 
-
-void System::setDriverGL(const char *driver)
-{
+void System::setDriverGL(const char *driver) {
     unsigned int len;
 
-
     if (m_driver)
-    {
         delete [] m_driver;
-    }
 
-    if (driver && driver[0])
-    {
+    if (driver && driver[0]) {
         len = strlen(driver);
         m_driver = new char[len+1];
         strncpy(m_driver, driver, len);
@@ -262,17 +206,8 @@ void System::setDriverGL(const char *driver)
     }
 }
 
-
-void System::resetTicks()
-{
-    system_timer(0);
-}
-
-
-void System::resizeGL(unsigned int w, unsigned int h)
-{
-    if (!w || !h)
-    {
+void System::resizeGL(unsigned int w, unsigned int h) {
+    if (!w || !h) {
         printf("resizeGL> ERROR assertions 'w > 0', 'h > 0' failed\n");
         return;
     }
@@ -290,51 +225,6 @@ void System::resizeGL(unsigned int w, unsigned int h)
     glFrustum(-fW, fW, -fH, fH, m_clipNear, m_clipFar);
 
     glMatrixMode(GL_MODELVIEW);
-}
-
-////////////////////////////////////////////////////////////
-// Private Accessors
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Private Mutators
-////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////
-// Gobal helper functions
-////////////////////////////////////////////////////////////
-
-
-unsigned int system_timer(int state)
-{
-    static struct timeval start;
-    static struct timeval stop;
-    static struct timezone tz;
-
-
-    switch (state)
-    {
-        case 0:
-            gettimeofday(&start, &tz);
-            break;
-        case 1:
-            gettimeofday(&stop, &tz);
-
-            if (start.tv_usec > stop.tv_usec)
-            {
-                stop.tv_usec += 1000000;
-                stop.tv_sec--;
-            }
-
-            stop.tv_usec -= start.tv_usec;
-            stop.tv_sec -= start.tv_sec;
-
-            return ((stop.tv_sec - start.tv_sec) * 1000) + ((stop.tv_usec - start.tv_usec) / 1000);
-    }
-
-    return 0;
+    glLoadIdentity();
 }
 

src/utils/CMakeLists.txt

@@ -2,6 +2,7 @@
 set (UTIL_SRCS ${UTIL_SRCS} "math.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
+set (UTIL_SRCS ${UTIL_SRCS} "time.cpp")
 
 # Include directory
 include_directories ("${PROJECT_SOURCE_DIR}/include")

src/utils/time.cpp

@@ -0,0 +1,33 @@
+/*!
+ * \file include/utils/time.h
+ * \brief Time handling utilities
+ *
+ * \author xythobuz
+ * \author Mongoose
+ */
+
+#include "utils/time.h"
+
+struct timeval system_timer_start;
+struct timeval system_timer_stop;
+struct timezone system_timer_tz;
+
+unsigned int system_timer() {
+    gettimeofday(&system_timer_stop, &system_timer_tz);
+
+    if (system_timer_start.tv_usec > system_timer_stop.tv_usec) {
+        system_timer_stop.tv_usec += 1000000;
+        system_timer_stop.tv_sec--;
+    }
+
+    system_timer_stop.tv_usec -= system_timer_start.tv_usec;
+    system_timer_stop.tv_sec -= system_timer_start.tv_sec;
+
+    return ((system_timer_stop.tv_sec - system_timer_start.tv_sec) * 1000)
+        + ((system_timer_stop.tv_usec - system_timer_start.tv_usec) / 1000);
+}
+
+void system_timer_reset() {
+    gettimeofday(&system_timer_start, &system_timer_tz);
+}
+

test/math.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file test/MatMath.cpp
+ * \file test/math.cpp
  * \brief Mat Math Unit Test
  *
  * \todo Also test the geometric methods (intersection, distance, midpoint)