Added basic movement

include/Game.h

@@ -42,8 +42,6 @@ public:
 
     void display();
 
-    void percentCallback(int percent);
-
     World mWorld;
     entity_t *mLara;
     Render *mRender;
@@ -58,8 +56,8 @@ private:
     void processMoveable(int index, int i, int *ent,
                             std::vector<skeletal_model_t *> &cache2,
                             std::vector<unsigned int> &cache, int object_id);
-    void processModel(int index);
-    void processRoom(int index);
+    void processModels();
+    void processRooms();
     void setupTextureColor(texture_tri_t *r_tri, float *colorf);
 
     bool mLoaded;

include/TombRaider.h

@@ -129,16 +129,11 @@ public:
     /*!
      * \brief Loads TombRaider 1-5 pak into memory
      * and does some processing.
-     *
-     * At 10% all textures are loaded. The exact figure
-     * '10' will always be passed to allow for texture
-     * caching while meshes load for TR4.
      * \param filename points to valid TombRaider pak
-     * \param percent load progress callback
      * \returns 0 on success, < 0 on error
      * \sa TombRaider::loadTR5()
      */
-    int Load(char *filename, void (*percent)(int, void *), void *obj);
+    int Load(char *filename);
 
     /*!
      * \brief Makes a clamped 0.0 to 1.0 texel from coord pair
@@ -659,15 +654,10 @@ private:
 
     /*!
      * \brief Loads a TR5 pak into memory.
-     *
-     * At 10% all textures are loaded
-     * the exact figure '10' will always be passed to
-     * allow for texture caching while meshes load.
      * \param f valid FILE
-     * \param percent callback for loading progress
      * \returns 0 on success, < 0 on error
      */
-    int loadTR5(FILE *f, void (*percent)(int, void *), void *obj);
+    int loadTR5(FILE *f);
 
     static void print(const char *methodName, const char *s, ...) __attribute__((format(printf, 2, 3)));
 

src/TombRaider.cpp

@@ -393,7 +393,7 @@ int TombRaider::checkMime(char *filename) {
 }
 
 
-int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
+int TombRaider::Load(char *filename)
 {
     FILE *f;
     int i, j, l;
@@ -413,9 +413,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
     }
 
 
-    if (percent)
-        (*percent)(1, obj);
-
     mReset = false;
 
     Fread(&mPakVersion, sizeof(mPakVersion), 1, f);
@@ -451,7 +448,7 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
             {
                 printDebug("Load", "This is really a TR5 pak");
                 mEngineVersion = TR_VERSION_5;
-                return loadTR5(f, percent, obj);
+                return loadTR5(f);
             }
 
             break;
@@ -459,9 +456,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
             mEngineVersion = TR_VERSION_UNKNOWN;
     }
 
-    if (percent)
-        (*percent)(5, obj);
-
     printDebug("Load", "mEngineVersion = 0x%x", mPakVersion);
 
     if (mEngineVersion == TR_VERSION_UNKNOWN)
@@ -509,9 +503,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
                 sz);
         usz = foo;
 
-        if (percent)
-            (*percent)(6, obj);
-
         printDebug("LoadTR4", "textile decompress  [%s]",
                 (zerr == Z_OK) ? "OK" : "ERROR");
 
@@ -559,9 +550,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
                 sz);
         usz = foo;
 
-        if (percent)
-            (*percent)(7, obj);
-
         //     printDebug("Load", "TR4 textile decompress  [%s]",
         //    (zerr == Z_OK) ? "OK" : "ERROR");
 
@@ -642,9 +630,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
             delete [] compressed_data;
         }
 
-        if (percent)
-            (*percent)(9, obj);
-
         // Read the sizes of the level data
         Fread(&usz, sizeof(usz), 1, f);
         Fread(&sz, sizeof(sz), 1, f);
@@ -721,9 +706,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
         }
     }
 
-    if (percent)
-        (*percent)(10, obj);
-
     /* 32-bit unknown - seems to always be 0 */
     Fread(&_unknown_t, sizeof(_unknown_t), 1, f);
     printDebug("Load", "_unknown_t = 0x%x", _unknown_t);
@@ -739,11 +721,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
     /* Extract room details */
     for (i = 0; i < _num_rooms; ++i)
     {
-        if (percent)
-        {
-            (*percent)(11 + (int)(((float)i/(float)_num_rooms)*70.0), obj);
-        }
-
         /* Read RoomInfo */
         //! \fixme endian check needed
         Fread(&_rooms[i].info, sizeof(tr2_room_info_t), 1, f);
@@ -1204,9 +1181,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
     //! \fixme endian
 
 
-    if (percent)
-        (*percent)(80, obj);
-
     printDebug("Load", "_num_state_changes = %u", _num_state_changes);
 
     if (_num_state_changes > 0)
@@ -1355,9 +1329,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
     }
 
 
-    if (percent)
-        (*percent)(90, obj);
-
     if (mEngineVersion == TR_VERSION_4)
     {
         unsigned char zzbuf[4];
@@ -1922,9 +1893,6 @@ int TombRaider::Load(char *filename, void (*percent)(int, void *), void *obj)
 
     fclose(f);
 
-    if (percent)
-        (*percent)(100, obj);
-
     return 0;
 }
 
@@ -5000,7 +4968,7 @@ unsigned char *TombRaider::getTexTile(int texture)
 
 
 //! \fixme Move these data about to make full use in the class  ;)
-int TombRaider::loadTR5(FILE *f, void (*percent)(int, void *), void *obj)
+int TombRaider::loadTR5(FILE *f)
 {
     unsigned int level_data_sz, riffOffset, seperator0;
     unsigned int portalOffset, nextRoomOffset, thisRoomOffset;
@@ -5012,9 +4980,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int, void *), void *obj)
     u_int8_t *meshData;
     char check[32];
 
-    if (percent)
-        (*percent)(5, obj);
-
     printDebug("Load", "mEngineVersion = 0x%x", mPakVersion);
 
     if (mEngineVersion != TR_VERSION_5)
@@ -5108,9 +5073,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int, void *), void *obj)
             sz);
     usz = foo;
 
-    if (percent)
-        (*percent)(7, obj);
-
     printDebug("LoadTR5", "textile decompress  [%s]",
             (zerr == Z_OK) ? "OK" : "ERROR");
 
@@ -5185,9 +5147,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int, void *), void *obj)
         delete [] compressed_data;
     }
 
-    if (percent)
-        (*percent)(10, obj);
-
     // Mongoose 2002.01.08, Michiel has discovered the
     //   first 4 bytes here are 2 bitu16 flags for Lara type and weather
     u_int16_t laraType, weather;
@@ -5230,9 +5189,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int, void *), void *obj)
 
     for (i = 0; i < _num_rooms; ++i)
     {
-        if (percent)
-            (*percent)(11 + (int)(((float)i/(float)_num_rooms)*90.0), obj);
-
         thisRoomOffset = ftell(f);
 
         Fread(&mRoomsTR5[i].checkXELA, 4, 1, f);