Nicer style for GLString

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = OpenRaider
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.1.2
+PROJECT_NUMBER         = 0.1.2-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Makefile

@@ -202,7 +202,7 @@ OBJS = \
 	$(BUILDDIR)/Sound.o \
 	$(BUILDDIR)/System.o \
 	$(BUILDDIR)/Texture.o \
-	$(BUILDDIR)/TGA.o \
+	$(BUILDDIR)/tga.o \
 	$(BUILDDIR)/TombRaider.o \
 	$(BUILDDIR)/Vector3d.o \
 	$(BUILDDIR)/ViewVolume.o \
@@ -293,7 +293,7 @@ TEST_MAP_TR3=~/.OpenRaider/paks/tr3/scotland.tr2
 TEST_MAP_TR2=~/.OpenRaider/paks/tr2/unwater.tr2
 TEST_MAP_TR1=~/.OpenRaider/paks/tr1/level1.phd
 
-test.build: Matrix.test Math.test Memory.test Network.test Sound.test TGA.test GLString.test TombRaider.test
+test.build: Matrix.test Math.test Memory.test Network.test Sound.test tga.test GLString.test TombRaider.test
 
 test: test.build
 	@-echo "================================================="
@@ -310,7 +310,7 @@ test: test.build
 	$(BUILD_TEST_DIR)/Sound.test
 	@-echo "================================================="
 	@-echo "Running TGA unit test"
-	$(BUILD_TEST_DIR)/TGA.test
+	$(BUILD_TEST_DIR)/tga.test
 	@-echo "================================================="
 	@-echo "Running GLString unit test"
 	$(BUILD_TEST_DIR)/GLString.test
@@ -332,7 +332,7 @@ TombRaider.test:
 	@-mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
 	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/TGA.o $(BUILD_TEST_DIR)/memory_test.o" \
+	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o $(BUILD_TEST_DIR)/memory_test.o" \
 	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
 	LD_FLAGS="-lz -lstdc++"
 
@@ -386,10 +386,10 @@ Sound.test:
 
 #################################################################
 
-TGA.test:
+tga.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) $(WARNINGS) \
-		src/TGA.cpp test/TGA.cpp -o $(BUILD_TEST_DIR)/TGA.test
+		src/tga.cpp test/tga.cpp -o $(BUILD_TEST_DIR)/tga.test
 
 #################################################################
 

src/GLString.cpp

@@ -3,6 +3,7 @@
  * \brief Open GL rendering font/string class
  *
  * \author Mongoose
+ * \author xythobuz
  */
 
 #include <string.h>
@@ -23,8 +24,7 @@
 #endif
 
 
-GLString::GLString()
-{
+GLString::GLString() {
     _num_string_max = 0;
     _num_string = 0;
     _scale = 1.0;
@@ -32,111 +32,68 @@ GLString::GLString()
 }
 
 
-GLString::~GLString()
-{
-    unsigned int i;
-
-    if (_string)
-    {
-
-        for (i = 0; i < _num_string; ++i)
-        {
+GLString::~GLString() {
+    if (_string) {
+        for (unsigned int i = 0; i < _num_string; ++i) {
             if (_string[i].text)
-            {
                 delete [] _string[i].text;
-            }
         }
-
         delete [] _string;
     }
 }
 
 
-void GLString::Init(unsigned int max_strings)
-{
+void GLString::Init(unsigned int max_strings) {
     if (!max_strings)
-    {
         return;
-    }
 
     _num_string_max = max_strings;
     _string = new gl_string_t[max_strings];
 }
 
 
-void GLString::SetChar(unsigned int string, unsigned int pos, char c)
-{
+void GLString::SetChar(unsigned int string, unsigned int pos, char c) {
     gl_string_t *str = GetString(string);
-
-
     if (str && pos < str->len)
-    {
         str->text[pos] = c;
-    }
 }
 
 
-unsigned int GLString::GetStringLen(unsigned int string)
-{
+unsigned int GLString::GetStringLen(unsigned int string) {
     gl_string_t *str = GetString(string);
-
-
     if (str)
-    {
         return str->len;
-    }
-
     return 0;
 }
 
 
-char *GLString::GetBuffer(unsigned int string)
-{
+char *GLString::GetBuffer(unsigned int string) {
     gl_string_t *str = GetString(string);
-
-
     if (str)
-    {
         return str->text;
-    }
-
     return 0;
 }
 
 
-void GLString::setActive(unsigned int string, bool active)
-{
-    gl_string_t *str;
-
-
-    str = GetString(string);
-
+void GLString::setActive(unsigned int string, bool active) {
+    gl_string_t *str = GetString(string);
     if (str)
-    {
         str->active = active;
-    }
 }
 
 
-void GLString::SetString(unsigned int string, const char *s, ...)
-{
+void GLString::SetString(unsigned int string, const char *s, ...) {
     va_list args;
     gl_string_t *str;
     unsigned int len;
 
-
     str = GetString(string);
 
-    if (s && s[0] && str)
-    {
+    if (s && s[0] && str) {
         str->active = true;
-
         len = strlen(s);
-
         if (len > str->len)
-        {
             len = str->len - 1;
-        }
 
         va_start(args, s);
         vsnprintf(str->text, str->len-2, s, args);
@@ -146,14 +103,12 @@ void GLString::SetString(unsigned int string, const char *s, ...)
 }
 
 
-void GLString::Scale(float scale)
-{
+void GLString::Scale(float scale) {
     _scale = scale;
 }
 
 
-int GLString::glPrintf(int x, int y, const char *string, ...)
-{
+int GLString::glPrintf(int x, int y, const char *string, ...) {
     int sz = 60;
     int n;
     va_list args;
@@ -162,14 +117,10 @@ int GLString::glPrintf(int x, int y, const char *string, ...)
     // Mongoose 2002.01.01, Only allow valid strings
     //   we must assume it's NULL terminated also if it passes...
     if (!string || !string[0])
-    {
         return -1;
-    }
 
     if (_num_string > _num_string_max)
-    {
         return -2;
-    }
 
     // Mongoose 2002.01.01, Assume no longer than 'sz' wide lines
     //   on first try
@@ -188,35 +139,25 @@ int GLString::glPrintf(int x, int y, const char *string, ...)
     n = vsnprintf(_string[_num_string].text, sz, string, args);
 
     // Mongoose 2002.01.01, Realloc correct amount if truncated
-    while (1)
-    {
+    while (1) {
         if (n > -1 && n < sz)
-        {
             break;
-        }
 
-        // Mongoose 2002.01.01, For glibc 2.1
-        if (n > -1)
-        {
+        if (n > -1) { // glibc 2.1
             sz = n + 1;
             delete [] _string[_num_string].text;
             _string[_num_string].text = new char[sz];
             n = vsnprintf(_string[_num_string].text, sz, string, args);
-
             break;
-        }
-        else // glibc 2.0
-        {
+        } else { // glibc 2.0
             sz *= 2;
             delete [] _string[_num_string].text;
             _string[_num_string].text = new char[sz];
             n = vsnprintf(_string[_num_string].text, sz, string, args);
         }
     }
-
     va_end(args);
 
-
     // Mongoose 2002.01.04, Remeber string size, for future rebuffering use
     _string[_num_string].len = sz;
 
@@ -228,29 +169,17 @@ int GLString::glPrintf(int x, int y, const char *string, ...)
 }
 
 
-void GLString::Render(int width, int height)
-{
-    unsigned int i;
-
-    for (i = 0; i < _num_string; ++i)
-    {
+void GLString::Render(int width, int height) {
+    for (unsigned int i = 0; i < _num_string; ++i) {
         if (_string[i].active)
-        {
-            glPrint2d(_string[i].x, _string[i].y,
-                    _string[i].scale,
-                    _string[i].text);
-        }
+            glPrint2d(_string[i].x, _string[i].y, _string[i].scale, _string[i].text);
     }
 }
 
 
-gl_string_t *GLString::GetString(unsigned int id)
-{
+gl_string_t *GLString::GetString(unsigned int id) {
     if (id < _num_string)
-    {
         return _string + id;
-    }
-
     return NULL;
 }
 

test/GLString.cpp

@@ -22,15 +22,12 @@ Texture gTexture;
 
 void swap_buffers();
 
-
-void event_resize(int width, int height)
-{
-    GLfloat aspect;
-
+void event_resize(int width, int height) {
     glMatrixMode(GL_PROJECTION);
-    aspect = (GLfloat)width/(GLfloat)height;
+    GLfloat aspect = (GLfloat)width/(GLfloat)height;
 
     // Mongoose 2002.01.01, Setup view volume, with a nice FOV
+    // xythobuz:
     // gluPerspective is deprecated!
     // gluPerspective(40.0, aspect, 1, 2000);
     // fix: http://stackoverflow.com/a/2417756
@@ -41,12 +38,9 @@ void event_resize(int width, int height)
     glMatrixMode(GL_MODELVIEW);
 }
 
-
-void event_display(int width, int height)
-{
+void event_display(int width, int height) {
     static float x = 0.0, y = 0.0, z = -150.0, r = 0.0;
 
-
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
 
@@ -81,20 +75,16 @@ void event_display(int width, int height)
     swap_buffers();
 }
 
-
-void swap_buffers()
-{
+void swap_buffers() {
     SDL_GL_SwapBuffers();
 }
 
 
-void shutdown_gl()
-{
+void shutdown_gl() {
     SDL_Quit();
 }
 
-void init_gl(unsigned int width, unsigned int height)
-{
+void init_gl(unsigned int width, unsigned int height) {
     int i;
     const char *errorText = "TEXT->glPrintf> ERROR code %i\n";
 
@@ -139,9 +129,7 @@ void init_gl(unsigned int width, unsigned int height)
     TEXT->setActive(3, true);
 }
 
-
-int main_gl(int argc, char *argv[])
-{
+int main_gl(int argc, char *argv[]) {
     SDL_Event event;
     unsigned int mkeys, mod, key;
     int flags;
@@ -152,7 +140,6 @@ int main_gl(int argc, char *argv[])
     char *driver = NULL;
 #endif
 
-
     // Setup clean up on exit
     atexit(shutdown_gl);
 
@@ -163,18 +150,15 @@ int main_gl(int argc, char *argv[])
     SDL_Init(SDL_INIT_VIDEO);
 
 #ifndef __APPLE__
-    if (!driver || !driver[0] || SDL_GL_LoadLibrary(driver) < 0)
-    {
+    if (!driver || !driver[0] || SDL_GL_LoadLibrary(driver) < 0) {
         SDL_ClearError();
 
         // Fallback 1
-        if (SDL_GL_LoadLibrary("libGL.so") < 0)
-        {
+        if (SDL_GL_LoadLibrary("libGL.so") < 0) {
             SDL_ClearError();
 
             // Fallback 2
-            if (SDL_GL_LoadLibrary("libGL.so.1") < 0)
-            {
+            if (SDL_GL_LoadLibrary("libGL.so.1") < 0) {
                 fprintf(stderr, "main_gl> SDL_GL_LoadLibrary failed!\n");
                 fprintf(stderr, "main_gl> Error is [%s].\n", SDL_GetError());
                 exit(1);
@@ -185,8 +169,7 @@ int main_gl(int argc, char *argv[])
 
     flags = SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
 
-    if (fullscreen)
-    {
+    if (fullscreen) {
         flags |= SDL_FULLSCREEN;
         SDL_ShowCursor(SDL_DISABLE);
     }
@@ -203,17 +186,14 @@ int main_gl(int argc, char *argv[])
     // Init rendering
     init_gl(width, height);
 
-    for (;;)
-    {
+    for (;;) {
         // Pause for 10-20 ms
         SDL_Delay(10);
 
         event_display(width, height);
 
-        while (SDL_PollEvent(&event))
-        {
-            switch (event.type)
-            {
+        while (SDL_PollEvent(&event)) {
+            switch (event.type) {
                 case SDL_QUIT:
                     exit(0);
                     break;
@@ -282,10 +262,7 @@ int main_gl(int argc, char *argv[])
     return 0;
 }
 
-int main(int argc, char *argv[])
-{
-    printf("[GLString class test]\n");
-
+int main(int argc, char *argv[]) {
     TEXT = new GLString();
     main_gl(argc, argv);
     return 0;