Changeset 464

Timestamp:

01/12/12 14:39:44 (4 months ago)

Author:

Carsten

Message:

Model code:
Dropped the "Assimp"-based model loader as we already have loaders for all major file formats,
all of which are well designed and come with a high-quality implementation.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ModelDocument.cpp (modified) (2 diffs)
• LICENSE.txt (modified) (1 diff)
• Libs/Models/Loader_assimp.cpp (deleted)
• Libs/Models/Loader_assimp.hpp (deleted)
• Libs/SConscript (modified) (1 diff)
• SConscript (modified) (1 diff)
• SConstruct (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -28 +28 @@
 #include "GuiSys/GuiImpl.hpp"
 #include "Models/Loader_ase.hpp"
-#include "Models/Loader_assimp.hpp"
 #include "Models/Loader_cmdl.hpp"
 #include "Models/Loader_dlod.hpp"
@@ -276 +275 @@
     else if (cf::String::EndsWith(fn, "obj"    )) { LoaderFbxT    Loader(fn, UserCbs, Flags); return new CafuModelT(Loader); }
 
-    LoaderAssimpT Loader(fn, Flags);
-    return new CafuModelT(Loader);
-}
+    throw ModelLoaderT::LoadErrorT(
+        "No loader is available for model files of this type.\n"
+        "Export or convert your model to one of the supported file formats, "
+        "or contact the support forums for additional help.");
+
+    // We never get here.
+    return NULL;
+}

cafu/trunk/LICENSE.txt

@@ -73 +73 @@
   the custom licenses by Carsten Fuchs Software for closed-source
   commercial use.
-
-      Open Asset Import Library,
-      copyright (c) 2006-2010 Assimp Development Team,
-      http://assimp.sourceforge.net
 
       Bullet Continuous Collision Detection and Physics Library,

cafu/trunk/Libs/SConscript

@@ -33 +33 @@
 envModelLoaders = env.Clone()
 
-envModelLoaders.Append(CPPPATH=["#/ExtLibs/assimp/include"])
-
 if os.path.exists(Dir("#/ExtLibs/fbx/include").abspath):
     envModelLoaders.Append(CPPDEFINES=["HAVE_FBX_SDK"])
     envModelLoaders.Append(CPPPATH=["#/ExtLibs/fbx/include"])
 
-envModelLoaders.StaticLibrary("ModelLoaders", ["Models/Loader_assimp.cpp", "Models/Loader_fbx.cpp"])
+envModelLoaders.StaticLibrary("ModelLoaders", ["Models/Loader_fbx.cpp"])
 
 

cafu/trunk/SConscript

@@ -152 +152 @@
 envCaWE = wxEnv.Clone()
 envCaWE.Append(CPPPATH=['ExtLibs/lua/src', 'ExtLibs/noise/src'])
-envCaWE.Append(LIBS=Split("SceneGraph MatSys ClipSys cfsLib ModelLoaders cfs_jpeg assimp bulletcollision noise lua minizip lightwave freetype png z"))
+envCaWE.Append(LIBS=Split("SceneGraph MatSys ClipSys cfsLib ModelLoaders cfs_jpeg bulletcollision noise lua minizip lightwave freetype png z"))
 
 SourceFilesList = (Glob("CaWE/*.cpp")

cafu/trunk/SConstruct

@@ -236 +236 @@
 
 
-ExtLibsList = ["assimp",
-               "bullet",
+ExtLibsList = ["bullet",
                "freealut",
                "freetype",