Changeset 30967

Timestamp:

2008-08-25 23:18:56 (3 months ago)

Author:

erluk

Message:

• Removed SCF factories from the remains of the thing plugin
  

• Replaced individual includes inside thingldr.cpp with the CS master header. For some reason, this fixes the genmeshify linker errors in MSVC's DLL builds. Simply appending this include would also have fixed the build. Further investigation might be needed.
  

Location:

CS/trunk/apps/tools/genmeshify/thing

Files:

• object/thing.cpp (modified) (1 diff)
• persist/thingldr.cpp (modified) (2 diffs)

CS/trunk/apps/tools/genmeshify/thing/object/thing.cpp

@@ -2519 +2519 @@
 //---------------------------------------------------------------------------
 
-SCF_IMPLEMENT_FACTORY (csThingObjectType)
-
 csThingObjectType::csThingObjectType (iBase *pParent) :
   scfImplementationType (this, pParent),

CS/trunk/apps/tools/genmeshify/thing/persist/thingldr.cpp

@@ -17 +17 @@
 */
 
-#include "cssysdef.h"
-
-#include "csgeom/math3d.h"
-#include "csgeom/matrix3.h"
-#include "csgeom/transfrm.h"
-#include "csutil/cscolor.h"
-#include "csutil/csstring.h"
-#include "csutil/dirtyaccessarray.h"
-#include "csutil/flags.h"
-#include "csutil/scanstr.h"
-#include "csutil/scfstr.h"
-#include "csutil/util.h"
-
-
-#include "iengine/engine.h"
-#include "iengine/mesh.h"
-#include "iengine/material.h"
-#include "iengine/portal.h"
-#include "iengine/portalcontainer.h"
-#include "iengine/texture.h"
-#include "imap/ldrctxt.h"
-#include "imap/loader.h"
-#include "imap/services.h"
-#include "imesh/object.h"
+#include "crystalspace.h"
+
 #include "../thing.h"
-#include "iutil/comp.h"
-#include "iutil/document.h"
-#include "iutil/eventh.h"
-#include "iutil/object.h"
-#include "iutil/objreg.h"
-#include "iutil/plugin.h"
-#include "iutil/vfs.h"
-#include "ivaria/reporter.h"
-#include "ivideo/graph3d.h"
-#include "ivideo/material.h"
-#include "ivideo/texture.h"
 #include "../object/thing.h"
 
 
 #include "thingldr.h"
+
 
 enum
@@ -99 +67 @@
 };
 
-SCF_IMPLEMENT_FACTORY (csThingLoader)
-SCF_IMPLEMENT_FACTORY (csThingFactoryLoader)
-SCF_IMPLEMENT_FACTORY (csThingSaver)
-SCF_IMPLEMENT_FACTORY (csThingFactorySaver)
-
 static csRef<iMeshObjectType> GetThing (iObjectRegistry* object_reg)
 {