made operator==() and \!=() const (still doesn't make them correct probably)

[wxWidgets.git] / samples / opengl / penguin / lw.cpp

diff --git a/samples/opengl/penguin/lw.cpp b/samples/opengl/penguin/lw.cpp
index 027cf0eb985c42f1908d0e77aa505a04ae661049..7d83324bbd8d5e05d852b603df2d00cf2b884711 100644 (file)
--- a/samples/opengl/penguin/lw.cpp
+++ b/samples/opengl/penguin/lw.cpp
@@ -20,17 +20,22 @@
 #include <windows.h>
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
 #include "lw.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 
-#ifndef __WXMAC__
-// does this not give redefine errors on other platforms ?
-#define wxInt32 int
-#define wxUint32 unsigned int
-#endif
-
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -40,9 +45,9 @@
 #endif
 
 #define MK_ID(a,b,c,d) ((((wxUint32)(a))<<24)| \
-                       (((wxUint32)(b))<<16)| \
-                       (((wxUint32)(c))<< 8)| \
-                       (((wxUint32)(d))    ))
+            (((wxUint32)(b))<<16)| \
+            (((wxUint32)(c))<< 8)| \
+            (((wxUint32)(d))    ))
 
 #define ID_FORM MK_ID('F','O','R','M')
 #define ID_LWOB MK_ID('L','W','O','B')
@@ -123,9 +128,9 @@ static void read_srfs(FILE *f, int nbytes, lwObject *lwo)
     nbytes -= read_string(f,material->name);
 
     /* defaults */
-    material->r = 0.7;
-    material->g = 0.7;
-    material->b = 0.7;
+    material->r = 0.7f;
+    material->g = 0.7f;
+    material->b = 0.7f;
   }
   lwo->material = (lwMaterial*) realloc(lwo->material, sizeof(lwMaterial)*lwo->material_cnt);
 }
@@ -207,9 +212,9 @@ static void read_pols(FILE *f, int nbytes, lwObject *lwo)
       det_cnt = read_short(f);
       nbytes -= 2;
       while (det_cnt-- > 0) {
-       int cnt = read_short(f);
-       fseek(f, cnt*2+2, SEEK_CUR);
-       nbytes -= cnt*2+2;
+    int cnt = read_short(f);
+    fseek(f, cnt*2+2, SEEK_CUR);
+    nbytes -= cnt*2+2;
       }
     }
     face->material -= 1;
@@ -375,13 +380,13 @@ void lw_object_show(const lwObject *lw_object)
       prev_index_cnt = face->index_cnt;
       switch (face->index_cnt) {
       case 3:
-       glBegin(GL_TRIANGLES);
-       break;
+    glBegin(GL_TRIANGLES);
+    break;
       case 4:
-       glBegin(GL_QUADS);
-       break;
+    glBegin(GL_QUADS);
+    break;
       default:
-       glBegin(GL_POLYGON);
+    glBegin(GL_POLYGON);
       }
     }
 
@@ -389,8 +394,8 @@ void lw_object_show(const lwObject *lw_object)
     if (prev_material != face->material) {
       prev_material = face->material;
       glColor3f(lw_object->material[face->material].r,
-               lw_object->material[face->material].g,
-               lw_object->material[face->material].b);
+        lw_object->material[face->material].g,
+        lw_object->material[face->material].b);
     }
 
     /* update normal if necessary */