added support for both ent and def files at the same time

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@95 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 71adb8462ad383dd5c54741a5f54881118bfb4dd..9917b21592901c2ff6b9d22b06ee1aa8952aff29 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ SPoG
 - Fixed title of wait-dialog when loading a model.
 - Fixed doom3 func_static with blank 'model' key being invisible.
 - Changed doom3 func_static model creation to replace selected models.
+- Added support for loading both .ent and .def files at the same time.
 
 09/07/2006
 Shaderman

diff --git a/include/ieclass.h b/include/ieclass.h
index 210810948882af545868a4dbda7925160c936aeb..89b86ca974cc68e3471e8777ffd53d530bebe4e1 100644 (file)
--- a/include/ieclass.h
+++ b/include/ieclass.h
@@ -63,17 +63,17 @@ struct EntityClassScanner
 #include "modulesystem.h"
 
 template<typename Type>
-class GlobalModule;
-typedef GlobalModule<EntityClassScanner> GlobalEClassModule;
+class ModuleRef;
+typedef ModuleRef<EntityClassScanner> EClassModuleRef;
 
 template<typename Type>
-class GlobalModuleRef;
-typedef GlobalModuleRef<EntityClassScanner> GlobalEClassModuleRef;
+class Modules;
+typedef Modules<EntityClassScanner> EClassModules;
+
+template<typename Type>
+class ModulesRef;
+typedef ModulesRef<EntityClassScanner> EClassModulesRef;
 
-inline EntityClassScanner& GlobalEClassLoader()
-{
-  return GlobalEClassModule::getTable();
-}
 
 
 

diff --git a/include/modulesystem.h b/include/modulesystem.h
index 4c5495d299d682dc170e8cc7c2a7950f42e8108b..dd7c59ad2b2e545693822ca9209f206d8c3050bb 100644 (file)
--- a/include/modulesystem.h
+++ b/include/modulesystem.h
@@ -54,7 +54,7 @@ public:
   class Visitor
   {
   public:
-    virtual void visit(const char* name, Module& module) = 0;
+    virtual void visit(const char* name, Module& module) const = 0;
   };
 
   virtual void setError(bool error) = 0;
@@ -66,7 +66,7 @@ public:
 
   virtual void registerModule(const char* type, int version, const char* name, Module& module) = 0;
   virtual Module* findModule(const char* type, int version, const char* name) const = 0;
-  virtual void foreachModule(const char* type, int version, Visitor& visitor) = 0;
+  virtual void foreachModule(const char* type, int version, const Visitor& visitor) = 0;
 };
 
 class ModuleServerHolder
@@ -112,11 +112,11 @@ public:
   class Visitor
   {
   public:
-    virtual void visit(const char* name, const Type& table) = 0;
+    virtual void visit(const char* name, const Type& table) const = 0;
   };
 
   virtual Type* findModule(const char* name) = 0;
-  virtual void foreachModule(Visitor& visitor) = 0;
+  virtual void foreachModule(const Visitor& visitor) = 0;
 };
 
 #include "debugging/debugging.h"

diff --git a/libs/modulesystem/modulesmap.h b/libs/modulesystem/modulesmap.h
index 44b62bdb33bc11379ff48b67ef826a47e3af9eff..dfc2ea4524e0654a4a7ad85a74c35abb882c5589 100644 (file)
--- a/libs/modulesystem/modulesmap.h
+++ b/libs/modulesystem/modulesmap.h
@@ -80,7 +80,7 @@ public:
   {
     return find(name);
   }
-  void foreachModule(typename Modules<Type>::Visitor& visitor)
+  void foreachModule(const typename Modules<Type>::Visitor& visitor)
   {
     for(modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i)
     {
@@ -98,7 +98,7 @@ public:
     : m_modules(modules)
   {
   }
-  void visit(const char* name, Module& module)
+  void visit(const char* name, Module& module) const
   {
     m_modules.insert(name, module);
   }

diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp
index 9a2a4388a3621aefa7c0a0fc48891ff326837d3d..edbf4156dc84d32026005b73f81f77f24cfd7c7a 100644 (file)
--- a/radiant/eclass.cpp
+++ b/radiant/eclass.cpp
@@ -50,6 +50,8 @@ namespace
   ListAttributeTypes g_listTypes;
 }
 
+EClassModules& EntityClassManager_getEClassModules();
+
 /*!
 implementation of the EClass manager API
 */
@@ -144,9 +146,10 @@ public:
 
 class EntityClassesLoadFile
 {
+  const EntityClassScanner& scanner;
   const char* m_directory;
 public:
-  EntityClassesLoadFile(const char* directory) : m_directory(directory)
+  EntityClassesLoadFile(const EntityClassScanner& scanner, const char* directory) : scanner(scanner), m_directory(directory)
   {
   }
   void operator()(const char* name) const
@@ -178,7 +181,7 @@ public:
     StringOutputStream relPath(256);
     relPath << m_directory << name;
 
-    GlobalEClassLoader().scanFile(g_collector, relPath.c_str());
+    scanner.scanFile(g_collector, relPath.c_str());
   }
 };
 
@@ -206,23 +209,16 @@ public:
   }
 };
 
-#if 0
-void EntityClassQuake3_constructDirectory(const char* directory, const char* extension)
-{
-  globalOutputStream() << "EntityClass: searching " << makeQuoted(directory) << " for *." << extension << '\n'; 
-  Directory_forEach(directory, matchFileExtension(extension, EntityClassesLoadFile(directory)));
-}
-#else
+
 void EntityClassQuake3_constructDirectory(const char* directory, const char* extension, Paths& paths)
 {
   globalOutputStream() << "EntityClass: searching " << makeQuoted(directory) << " for *." << extension << '\n'; 
   Directory_forEach(directory, matchFileExtension(extension, PathsInsert(paths, directory)));
 }
-#endif
+
 
 void EntityClassQuake3_Construct()
 {
-#if 1
   StringOutputStream baseDirectory(256);
   StringOutputStream gameDirectory(256);
   const char* basegame = GlobalRadiant().getRequiredGameDescriptionKeyValue("basegame");
@@ -230,22 +226,32 @@ void EntityClassQuake3_Construct()
   baseDirectory << GlobalRadiant().getGameToolsPath() << basegame << '/';
   gameDirectory << GlobalRadiant().getGameToolsPath() << gamename << '/';
 
-  Paths paths;
-  EntityClassQuake3_constructDirectory(baseDirectory.c_str(), GlobalEClassLoader().getExtension(), paths);
-  if(!string_equal(basegame, gamename))
+  class LoadEntityDefinitionsVisitor : public EClassModules::Visitor
   {
-    EntityClassQuake3_constructDirectory(gameDirectory.c_str(), GlobalEClassLoader().getExtension(), paths);
-  }
+    const char* baseDirectory;
+    const char* gameDirectory;
+  public:
+    LoadEntityDefinitionsVisitor(const char* baseDirectory, const char* gameDirectory)
+      : baseDirectory(baseDirectory), gameDirectory(gameDirectory)
+    {
+    }
+    void visit(const char* name, const EntityClassScanner& table) const
+    {
+      Paths paths;
+      EntityClassQuake3_constructDirectory(baseDirectory, table.getExtension(), paths);
+      if(!string_equal(baseDirectory, gameDirectory))
+      {
+        EntityClassQuake3_constructDirectory(gameDirectory, table.getExtension(), paths);
+      }
 
-  for(Paths::iterator i = paths.begin(); i != paths.end(); ++i)
-  {
-    EntityClassesLoadFile((*i).second)((*i).first.c_str());
-  }
-#else
-  StringOutputStream directory(256);
-  directory << GlobalRadiant().getGameToolsPath() << GlobalRadiant().getGameName() << '/';
-  EntityClassQuake3_constructDirectory(directory.c_str(), GlobalEClassLoader().getExtension());
-#endif
+      for(Paths::iterator i = paths.begin(); i != paths.end(); ++i)
+      {
+        EntityClassesLoadFile(table, (*i).second)((*i).first.c_str());
+      }
+    }
+  };
+
+  EntityClassManager_getEClassModules().foreachModule(LoadEntityDefinitionsVisitor(baseDirectory.c_str(), gameDirectory.c_str()));
 }
 
 EntityClass *Eclass_ForName(const char *name, bool has_brushes)
@@ -338,16 +344,22 @@ void EntityClassQuake3_destroy()
   eclass_bad->free(eclass_bad);
 }
 
+#include "modulesystem/modulesmap.h"
+
 class EntityClassQuake3Dependencies :
   public GlobalRadiantModuleRef,
   public GlobalFileSystemModuleRef,
-  public GlobalShaderCacheModuleRef,
-  public GlobalEClassModuleRef
+  public GlobalShaderCacheModuleRef
 {
+  EClassModulesRef m_eclass_modules;
 public:
   EntityClassQuake3Dependencies() :
-    GlobalEClassModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("entityclasstype"))
+    m_eclass_modules(GlobalRadiant().getRequiredGameDescriptionKeyValue("entityclasstype"))
+  {
+  }
+  EClassModules& getEClassModules()
   {
+    return m_eclass_modules.get();
   }
 };
 
@@ -395,4 +407,8 @@ typedef SingletonModule<EclassManagerAPI, EntityClassQuake3Dependencies> EclassM
 typedef Static<EclassManagerModule> StaticEclassManagerModule;
 StaticRegisterModule staticRegisterEclassManager(StaticEclassManagerModule::instance());
 
+EClassModules& EntityClassManager_getEClassModules()
+{
+  return StaticEclassManagerModule::instance().getDependencies().getEClassModules();
+}
 

diff --git a/radiant/image.cpp b/radiant/image.cpp
index 7375efbc1888539f70f19eb048b42b59a47723ea..7495db68a2d0f8ca44e5cdb1636cd85b690f5cfd 100644 (file)
--- a/radiant/image.cpp
+++ b/radiant/image.cpp
@@ -47,7 +47,7 @@ Image* QERApp_LoadImage(void* environment, const char* name)
       : m_name(name), m_image(image)
     {
     }
-    void visit(const char* name, const _QERPlugImageTable& table)
+    void visit(const char* name, const _QERPlugImageTable& table) const
     {
       if(m_image == 0)
       {
@@ -61,9 +61,9 @@ Image* QERApp_LoadImage(void* environment, const char* name)
         }
       }
     }
-  } visitor(name, image);
+  };
 
-  Textures_getImageModules().foreachModule(visitor);
+  Textures_getImageModules().foreachModule(LoadImageVisitor(name, image));
 
   return image;
 }

diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp
index d9ed04abce560ff892cdafa55b1a7897883eb0a6..35933014641d472b6641173165870b277a4c9ba7 100644 (file)
--- a/radiant/pluginmanager.cpp
+++ b/radiant/pluginmanager.cpp
@@ -214,7 +214,7 @@ void FillPluginSlots(CPluginSlots& slots, GtkWidget* main_window)
       : m_slots(slots), m_main_window(main_window)
     {
     }
-    void visit(const char* name, const _QERPluginTable& table)
+    void visit(const char* name, const _QERPluginTable& table) const
     {
       m_slots.AddPluginSlot(m_main_window, name, table);
     }

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index d471565a4664e7853612745dcfa2b28438268644..4612fbd465bcc3b0b5834024227274617b079f79 100644 (file)
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -113,7 +113,7 @@ void PluginToolbar_populate()
       : m_toolbar(toolbar)
     {
     }
-    void visit(const char* name, const _QERPlugToolbarTable& table)
+    void visit(const char* name, const _QERPlugToolbarTable& table) const
     {
       const std::size_t count = table.m_pfnToolbarButtonCount();
       for(std::size_t i=0;i<count;++i)

diff --git a/radiant/server.cpp b/radiant/server.cpp
index 28b5659d4ea51e0f65d10bfa2ecff02b4d6d5f45..a4c7b83a9a5988dd7534feccd0345212ef3eaca2 100644 (file)
--- a/radiant/server.cpp
+++ b/radiant/server.cpp
@@ -88,7 +88,7 @@ public:
     return 0;
   }
 
-  void foreachModule(const char* type, int version, Visitor& visitor)
+  void foreachModule(const char* type, int version, const Visitor& visitor)
   {
     for(Modules_::const_iterator i = m_modules.begin(); i != m_modules.end(); ++i)
     {

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index d19d8710510494405c099f6b66b4fbbb9f5064b1..04476866c241560e748ca109b5ef007b9ee25386 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -888,7 +888,7 @@ public:
     : m_dirstring(dirstring)
   {
   }
-  void visit(const char* minor, const _QERPlugImageTable& table)
+  void visit(const char* minor, const _QERPlugImageTable& table) const
   {
     GlobalFileSystem().forEachFile(m_dirstring, minor, TextureDirectoryLoadTextureCaller(m_dirstring));
   }
@@ -919,10 +919,7 @@ void TextureBrowser_ShowDirectory(TextureBrowser& textureBrowser, const char* di
       StringOutputStream dirstring(64);
       dirstring << "textures/" << directory;
 
-      {
-        LoadTexturesByTypeVisitor visitor(dirstring.c_str());
-        Radiant_getImageModules().foreachModule(visitor);
-      }
+      Radiant_getImageModules().foreachModule(LoadTexturesByTypeVisitor(dirstring.c_str()));
     }
   }