Changeset 10165 in orxonox.OLD for branches/mount_points

Timestamp:

Jan 3, 2007, 3:19:45 PM (18 years ago)

Author:

patrick

Message:

some warnings fixed

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/bsp/bsp_file.cc (modified) (3 diffs)
• lib/graphics/importer/static_model.cc (modified) (3 diffs)
• lib/graphics/importer/static_model_data.h (modified) (1 diff)
• story_entities/movie_loader.cc (modified) (4 diffs)

branches/mount_points/src/lib/graphics/importer/bsp/bsp_file.cc

@@ -430 +430 @@
   char fileName [500];
   char ext [500];
-  struct stat results;
 
 
@@ -660 +659 @@
   int      errorCode = 0;           //!< the error code for the texture loading functions
   unsigned int   lightMap;          //!< the OpenGL texture handle
-  int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
-  int      mipmapWidth = 0;         //!< the width of the mipmap
-  int      mipmapHight = 0;         //!< the height of the mipmap3
+  //int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
+  //int      mipmapWidth = 0;         //!< the width of the mipmap
+  //int      mipmapHight = 0;         //!< the height of the mipmap3
   float sc, scale, temp;
   for(int i = 0; i < 128*128*3 ; i++)
@@ -1101 +1100 @@
   {
     int sto  =  array[0];
-    array[0] =  scale * array[1] ;
-    array[1] =  scale * array[2];
-    array[2] =  scale * sto ;
+    array[0] =  (int) scale * array[1] ;
+    array[1] =  (int) scale * array[2];
+    array[2] =  (int) scale * sto ;
   }
 

branches/mount_points/src/lib/graphics/importer/static_model.cc

@@ -116 +116 @@
 
       // now check if it is a mount point identifier
-      if( this->data->getGroups().size() != 5) {
-        PRINTF(1)("the face count of %s is wrong, perhaps you missnamed this object or used the wrong mount point object\n", groupName.c_str());
+      if( (*groupIt)._faces.size() != 6) {        PRINTF(1)("the face count of %s is wrong, perhaps you missnamed this object or used the wrong mount point object (got %i faces)\n", groupName.c_str(), (*groupIt)._faces.size());
       }
 
@@ -135 +134 @@
       }
 
-      // vertex with the max count is the up-point
+      // vertex with the max surrounding faces is the up-point (pyramid like object)
       std::vector<Vector>::const_iterator it = vertices.begin();
       Vector tmpPoint;
@@ -167 +166 @@
       center /= vertices.size();
 
+      PRINTF(0)("Up Point\n");
+      upPoint.debug();
+
+      PRINTF(0)("Center\n");
+      center.debug();
 
     }

branches/mount_points/src/lib/graphics/importer/static_model_data.h

@@ -41 +41 @@
   ObjectListDeclaration(StaticModelData);
 
-private:
+public:
   ////////////////////
   /// SUB-ELEMENTS ///

branches/mount_points/src/story_entities/movie_loader.cc

@@ -63 +63 @@
 
 
-ErrorMessage MovieLoader::init() {}
+ErrorMessage MovieLoader::init() {  return ErrorMessage();}
 
 
-ErrorMessage MovieLoader::loadData() {}
+ErrorMessage MovieLoader::loadData() {  return ErrorMessage();}
 
 
@@ -72 +72 @@
 {
   this->unsubscribeEvents(ES_GAME);
+
+  return ErrorMessage();
 }
 
@@ -82 +84 @@
   this->bRunning = true;
   this->run();
+
+  return true;
 }
 
@@ -89 +93 @@
 
   this->bRunning = false;
+
+  return true;
 }
 
-bool MovieLoader::pause() { }
-bool MovieLoader::resume() { }
+bool MovieLoader::pause() { return false; }
+bool MovieLoader::resume() { return false; }
 
 void MovieLoader::run()