TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

FCollada changes to ptloader

Browse Source
This commit is contained in:
rdb 2009-01-06 18:46:11 +00:00
parent ecb6b7f507
commit 40aad1a910
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandatool/src/ptloader/Sources.pp
View File

@ -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
pandatool/src/ptloader/config_ptloader.cxx
View File

@ -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