Changeset 344 for ps

Timestamp:

06/02/04 16:27:54 (21 years ago)

Author:

Simon Brenner

Message:

Converted to VFS directory enum

File:

• ps/trunk/source/graphics/TextureManager.cpp (modified) (3 diffs)

ps/trunk/source/graphics/TextureManager.cpp

@@ -9 +9 @@
 #include <algorithm>
 
-const char* SupportedTextureFormats[] = { "png", "dds", "tga", "bmp" };
+const char* SupportedTextureFormats[] = { ".png", ".dds", ".tga", ".bmp" };
 
 
@@ -74 +74 @@
 
     Handle h=tex_load((const char*) pathname);
-    if (!h) {
+    if (h <= 0) {
+        LOG(ERROR, "CTextureManager::AddTexture(): texture %s failed loading\n", pathname.c_str());
         return 0;
     } else {
@@ -142 +143 @@
 void CTextureManager::LoadTerrainTextures(int terraintype,const char* fileext)
 {
-#ifdef _WIN32
-    struct _finddata_t file;
-    long handle;
+    CStr pathname("art/textures/terrain/types/");
+    pathname+=m_TerrainTextures[terraintype].m_Name;
+    pathname+="/";
     
-    // build pathname
-    CStr pathname("mods\\official\\art\\textures\\terrain\\types\\");
-    pathname+=m_TerrainTextures[terraintype].m_Name;
-    pathname+="\\";
+    Handle dir=vfs_open_dir(pathname.c_str());
+    vfsDirEnt dent;
     
-    CStr findname(pathname);
-    findname+="*.";
-    findname+=fileext;
-
-    // Find first matching file in directory for this terrain type
-    if ((handle=_findfirst((const char*) findname,&file))!=-1) {
+    if (dir > 0)
+    {
+        while (vfs_next_dirent(dir, &dent, fileext) == 0)
+        {
+            LOG(NORMAL, "CTextureManager::LoadTerrainTextures(): texture %s added to type %s\n", dent.name, m_TerrainTextures[terraintype].m_Name.c_str());
+            AddTexture(dent.name, terraintype);
+        }
         
-        AddTexture(file.name,terraintype);
-
-        // Find the rest of the matching files
-        while( _findnext(handle,&file)==0) {
-            AddTexture((const char*) file.name,terraintype);
-        }
-
-        _findclose(handle);
+        vfs_close_dir(dir);
     }
-#endif
 }
 
 void CTextureManager::BuildTerrainTypes()
 {
-#ifdef _WIN32
-    struct _finddata_t file;
-    long handle;
+    Handle dir=vfs_open_dir("art/textures/terrain/types/");
+    vfsDirEnt dent;
     
-    // Find first matching directory in terrain\textures
-    if ((handle=_findfirst("mods\\official\\art\\textures\\terrain\\types\\*",&file))!=-1) {
+    if (dir > 0)
+    {
+        while (vfs_next_dirent(dir, &dent, "/") == 0)
+        {
+            AddTextureType(dent.name);
+        }
         
-        if ((file.attrib & _A_SUBDIR) && file.name[0]!='.') {
-            AddTextureType(file.name);
-        }
+        vfs_close_dir(dir);
+    }
 
-        // Find the rest of the matching files
-        while( _findnext(handle,&file)==0) {
-            if ((file.attrib & _A_SUBDIR) && file.name[0]!='.') {
-                AddTextureType(file.name);
-            }
-        }
-
-        _findclose(handle);
-    }
-#endif
 }