Changeset 1808Tweet

Timestamp:

Aug 24, 2012, 12:51:51 PM (9 years ago)

Author:

sam

Message:

build: fix shitloads of warnings.

Location:

trunk/src

Files:

• bullet/LinearMath/btConvexHull.cpp (modified) (7 diffs)
• bullet/LinearMath/btConvexHull.h (modified) (1 diff)
• bullet/LinearMath/btQuickprof.cpp (modified) (1 diff)
• easymesh/easymesh-scanner.l (modified) (1 diff)
• eglapp.cpp (modified) (1 diff)
• generated/easymesh-scanner.cpp (modified) (1 diff)
• platform/sdl/sdlinput.cpp (modified) (1 diff)
• tileset.cpp (modified) (1 diff)

trunk/src/bullet/LinearMath/btConvexHull.cpp

@@ -276 +276 @@
                                 for(btScalar xx = x-btScalar(40.0) ; xx <= x ; xx+= btScalar(5.0))
                                 {
-                                        btScalar s = btSin(SIMD_RADS_PER_DEG*(xx));
-                                        btScalar c = btCos(SIMD_RADS_PER_DEG*(xx));
-                                        int md = maxdirfiltered(p,count,dir+(u*s+v*c)*btScalar(0.025),allow);
+// LOL BEGIN
+                                        btScalar ss = btSin(SIMD_RADS_PER_DEG*(xx));
+                                        btScalar cc = btCos(SIMD_RADS_PER_DEG*(xx));
+                                        int md = maxdirfiltered(p,count,dir+(u*ss+v*cc)*btScalar(0.025),allow);
+// LOL END
                                         if(mc==m && md==m)
                                         {
@@ -310 +312 @@
 
 
-int above(btVector3* vertices,const int3& t, const btVector3 &p, btScalar epsilon);
-int above(btVector3* vertices,const int3& t, const btVector3 &p, btScalar epsilon) 
+// LOL BEGIN
+int above(btVector3 const* vertices,const int3& t, const btVector3 &p, btScalar epsilon);
+int above(btVector3 const* vertices,const int3& t, const btVector3 &p, btScalar epsilon) 
+// LOL END
 {
         btVector3 n=TriNormal(vertices[t[0]],vertices[t[1]],vertices[t[2]]);
@@ -487 +491 @@
 
 
-int4 HullLibrary::FindSimplex(btVector3 *verts,int verts_count,btAlignedObjectArray<int> &allow)
+// LOL BEGIN
+int4 HullLibrary::FindSimplex(btVector3 const *verts,int verts_count,btAlignedObjectArray<int> &allow)
+// LOL END
 {
         btVector3 basis[3];
@@ -523 +529 @@
 }
 
-int HullLibrary::calchullgen(btVector3 *verts,int verts_count, int vlimit)
+// LOL BEGIN
+int HullLibrary::calchullgen(btVector3 const *verts,int verts_count, int vlimit)
+// LOL END
 {
         if(verts_count <4) return 0;
@@ -571 +579 @@
         while(vlimit >0 && ((te=extrudable(epsilon)) != 0))
         {
-                int3 ti=*te;
+// LOL BEGIN
+                //int3 ti=*te;
+// LOL END
                 int v=te->vmax;
                 btAssert(v != -1);
@@ -623 +633 @@
 }
 
-int HullLibrary::calchull(btVector3 *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit) 
+// LOL BEGIN
+int HullLibrary::calchull(btVector3 const *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit) 
+// LOL END
 {
         int rc=calchullgen(verts,verts_count,  vlimit) ;
@@ -659 +671 @@
         
         int    tris_count;
-        int ret = calchull( (btVector3 *) vertices, (int) vcount, result.m_Indices, tris_count, static_cast<int>(vlimit) );
+// LOL BEGIN
+        int ret = calchull( vertices, (int) vcount, result.m_Indices, tris_count, static_cast<int>(vlimit) );
+// LOL END
         if(!ret) return false;
         result.mIndexCount = (unsigned int) (tris_count*3);

trunk/src/bullet/LinearMath/btConvexHull.h

@@ -210 +210 @@
         btHullTriangle* extrudable(btScalar epsilon);
 
-        int calchull(btVector3 *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit);
-
-        int calchullgen(btVector3 *verts,int verts_count, int vlimit);
-
-        int4 FindSimplex(btVector3 *verts,int verts_count,btAlignedObjectArray<int> &allow);
+// LOL BEGIN
+        int calchull(btVector3 const *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit);
+
+        int calchullgen(btVector3 const *verts,int verts_count, int vlimit);
+
+        int4 FindSimplex(btVector3 const *verts,int verts_count,btAlignedObjectArray<int> &allow);
+// LOL END
 
         class ConvexH* ConvexHCrop(ConvexH& convex,const btPlane& slice);

trunk/src/bullet/LinearMath/btQuickprof.cpp

@@ -527 +527 @@
                 float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
                 {
-                        int i;  for (i=0;i<spacing;i++) printf(".");
+// LOL BEGIN
+                        int j;  for (j=0;j<spacing;j++) printf(".");
+// LOL END
                 }
                 printf("%d -- %s (%.2f %%) :: %.3f ms / frame (%d calls)\n",i, profileIterator->Get_Current_Name(), fraction,(current_total_time / (double)frames_since_reset),profileIterator->Get_Current_Total_Calls());

trunk/src/easymesh/easymesh-scanner.l

@@ -128 +128 @@
 int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
 {
+    (void)max_size; /* unused for now */
+
     buf[0] = m_input[0];
     if (buf[0])

trunk/src/eglapp.cpp

@@ -264 +264 @@
 void EglApp::ShowPointer(bool show)
 {
-    ;
+    /* FIXME: unimplemented (do we have a mouse pointer anyway? */
+    (void)show;
 }
 

trunk/src/generated/easymesh-scanner.cpp

@@ -1845 +1845 @@
 int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
 {
+    (void)max_size; /* unused for now */
+
     buf[0] = m_input[0];
     if (buf[0])

trunk/src/platform/sdl/sdlinput.cpp

@@ -197 +197 @@
         if (keystate[i])
             Input::KeyPressed(i, seconds);
+#else
+    (void)seconds;
 #endif
 #endif

trunk/src/tileset.cpp

@@ -231 +231 @@
 ivec2 TileSet::GetSize(int tileid) const
 {
+    (void)tileid;
+
     return data->size;
 }