Simplified Render Texture loading

include/Game.h

@@ -60,7 +60,6 @@ private:
     TombRaider mTombRaider;
 
     unsigned int mTextureStart;
-    unsigned int mTextureLevelOffset;
     unsigned int mTextureOffset;
 };
 

include/Render.h

@@ -152,14 +152,11 @@ public:
                           unsigned int id);
 
     /*!
-     * \brief Sets up textures for OpenRaider.
+     * \brief Sets up textures for OpenRaider
      * \param textureDir Is valid and exists with textures
-     * \param numLoaded returns number of loaded textures and will update
-     * number of external textures loaded
-     * \param nextId will update next level texture id
+     * \returns number of loaded textures
      */
-    void initTextures(char *textureDir, unsigned int *numLoaded,
-                            unsigned int *nextId);
+    int initTextures(char *textureDir);
 
     /*!
      * Removes current world/entity/etc geometry
@@ -318,8 +315,6 @@ private:
 
     unsigned int mFlags;                  //!< Rendering flags
     unsigned int mMode;                   //!< Rendering mode
-    unsigned int *mNumTexturesLoaded;
-    unsigned int *mNextTextureId;
     int mLock;
     int mSkyMesh;                         //!< Skymesh model id
     bool mSkyMeshRotation;                //!< Should Skymesh be rotated?

src/Game.cpp

@@ -43,7 +43,6 @@ Game::Game() {
     mLara = NULL;
 
     mTextureStart = 0;
-    mTextureLevelOffset = 0;
     mTextureOffset = 0;
 }
 
@@ -53,7 +52,7 @@ Game::~Game() {
 
 int Game::initialize() {
     // Enable Renderer
-    getRender().initTextures(getOpenRaider().mDataDir, &mTextureStart, &mTextureLevelOffset);
+    mTextureStart = getRender().initTextures(getOpenRaider().mDataDir);
     getRender().setMode(Render::modeLoadScreen);
 
     // Enable World Hopping
@@ -235,19 +234,19 @@ void Game::processTextures()
         mTombRaider.Texture(i, &image, &bumpmap);
 
         // Overwrite any previous level textures on load
-        getRender().loadTexture(image, 256, 256, mTextureLevelOffset + i);
+        getRender().loadTexture(image, 256, 256, (mTextureStart - 1) + i);
 
 #ifdef MULTITEXTURE
-        gMapTex2Bump[mTextureLevelOffset + i] = -1;
+        gMapTex2Bump[(mTextureStart - 1) + i] = -1;
 #endif
 
         if (bumpmap)
         {
 #ifdef MULTITEXTURE
-            gMapTex2Bump[mTextureLevelOffset + i] = mTextureLevelOffset + i +
+            gMapTex2Bump[(mTextureStart - 1) + i] = (mTextureStart - 1) + i +
                     mTombRaider.NumTextures();
 #endif
-            getRender().loadTexture(bumpmap, 256, 256, mTextureLevelOffset + i +
+            getRender().loadTexture(bumpmap, 256, 256, (mTextureStart - 1) + i +
                     mTombRaider.NumTextures());
         }
 
@@ -261,7 +260,7 @@ void Game::processTextures()
         //fflush(stdout);
     }
 
-    mTextureOffset = mTextureLevelOffset + mTombRaider.NumTextures();
+    mTextureOffset = (mTextureStart - 1) + mTombRaider.NumTextures();
 
     printf("Done! Found %d textures.\n", mTombRaider.NumTextures());
 }

src/Render.cpp

@@ -92,9 +92,6 @@ Render::Render()
     mFlags = (fRoomAlpha | fViewModel | fSprites |
             fRoomModels | fEntityModels |
             fUsePortals | fUpdateRoomListPerFrame);
-
-    mNextTextureId = NULL;
-    mNumTexturesLoaded = NULL;
 }
 
 
@@ -137,26 +134,17 @@ void Render::loadTexture(unsigned char *image,
 }
 
 
-void Render::initTextures(char *textureDir, unsigned int *numLoaded,
-        unsigned int *nextId)
-{
+int Render::initTextures(char *textureDir) {
     char filename[128];
-    int bg;
     unsigned int numTextures = 0;
     unsigned char color[4];
 
-    // We want to update as needed later
-    mNumTexturesLoaded = numLoaded;
-    mNextTextureId = nextId;
-
     mTexture.reset();
     mTexture.setMaxTextureCount(128);  /* TR never needs more than 32 iirc
                                           However, color texturegen is a lot */
 
     mTexture.setFlag(Texture::fUseMipmaps);
 
-    printf("Processing Textures:\n");
-
     color[0] = 0xff;
     color[1] = 0xff;
     color[2] = 0xff;
@@ -165,17 +153,13 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     if (mTexture.loadColorTexture(color, 32, 32) > -1)
         numTextures++;
 
+    //! \fixme Error Checking. Return negative error code, check in calling place too
     snprintf(filename, 126, "%s/%s", textureDir, "splash.tga");
     filename[127] = 0;
-
-    if ((bg = mTexture.loadTGA(filename)) > -1)
+    if (mTexture.loadTGA(filename) > -1)
         numTextures++;
 
-    // Weird that it isn't linear, must be some storage deal in Texture
-    // I forgot about Id allocation
-    *nextId = bg;
-
-    *numLoaded = numTextures;
+    return numTextures;
 }