ソースを参照

FCollada changes to ptloader

rdb 17 年 前
コミット
40aad1a910

+ 1 - 1
pandatool/src/ptloader/Sources.pp

@@ -5,7 +5,7 @@
   #define BUILDING_DLL BUILDING_PTLOADER
   #define BUILDING_DLL BUILDING_PTLOADER
   #define LOCAL_LIBS \
   #define LOCAL_LIBS \
     fltegg flt lwoegg lwo dxfegg dxf vrmlegg pvrml xfileegg xfile \
     fltegg flt lwoegg lwo dxfegg dxf vrmlegg pvrml xfileegg xfile \
-    converter pandatoolbase
+    converter pandatoolbase $[if $[HAVE_FCOLLADA],daeegg]
   #define OTHER_LIBS \
   #define OTHER_LIBS \
     egg2pg:c egg:c pandaegg:m \
     egg2pg:c egg:c pandaegg:m \
     pstatclient:c mathutil:c linmath:c putil:c \
     pstatclient:c mathutil:c linmath:c putil:c \

+ 6 - 0
pandatool/src/ptloader/config_ptloader.cxx

@@ -23,6 +23,7 @@
 #include "vrmlToEggConverter.h"
 #include "vrmlToEggConverter.h"
 #include "config_xfile.h"
 #include "config_xfile.h"
 #include "xFileToEggConverter.h"
 #include "xFileToEggConverter.h"
+#include "daeToEggConverter.h"
 
 
 #include "dconfig.h"
 #include "dconfig.h"
 #include "loaderFileTypeRegistry.h"
 #include "loaderFileTypeRegistry.h"
@@ -79,6 +80,11 @@ init_libptloader() {
   XFileToEggConverter *xfile = new XFileToEggConverter;
   XFileToEggConverter *xfile = new XFileToEggConverter;
   reg->register_type(new LoaderFileTypePandatool(xfile));
   reg->register_type(new LoaderFileTypePandatool(xfile));
 
 
+#ifdef HAVE_FCOLLADA
+  DAEToEggConverter *dae = new DAEToEggConverter;
+  reg->register_type(new LoaderFileTypePandatool(dae));
+#endif
+
 #ifdef HAVE_MAYA
 #ifdef HAVE_MAYA
   // Register the Maya converter as a deferred type.  We don't compile
   // Register the Maya converter as a deferred type.  We don't compile
   // it in directly, because it's big and bulky; we don't need to
   // it in directly, because it's big and bulky; we don't need to