TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

ptloader: Disable obj2egg from ptloader

Browse Source 
It doesn't support materials and textures, so it's not really useful to have this registered with the loader by default, especially since we have much better support for .obj through Assimp

Fixes #738
This commit is contained in:
rdb 2022-11-03 01:09:05 +01:00
parent 45ce3f348f
commit c50a5b25b8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -5821,7 +5821,7 @@ if not PkgSkip("PANDATOOL") and not PkgSkip("EGG"):
TargetAdd('libp3ptloader.dll', input='libp3lwo.lib')
TargetAdd('libp3ptloader.dll', input='libp3dxfegg.lib')
TargetAdd('libp3ptloader.dll', input='libp3dxf.lib')
TargetAdd('libp3ptloader.dll', input='libp3objegg.lib')
#TargetAdd('libp3ptloader.dll', input='libp3objegg.lib')
TargetAdd('libp3ptloader.dll', input='libp3vrmlegg.lib')
TargetAdd('libp3ptloader.dll', input='libp3vrml.lib')
TargetAdd('libp3ptloader.dll', input='libp3xfileegg.lib')

2
pandatool/src/ptloader/CMakeLists.txt
View File

@ -16,7 +16,7 @@ composite_sources(p3ptloader P3PTLOADER_SOURCES)
add_library(p3ptloader ${MODULE_TYPE} ${P3PTLOADER_HEADERS} ${P3PTLOADER_SOURCES})
set_target_properties(p3ptloader PROPERTIES DEFINE_SYMBOL BUILDING_PTLOADER)
target_link_libraries(p3ptloader PRIVATE
p3dxfegg p3fltegg p3lwoegg p3objegg p3vrmlegg p3xfileegg
p3dxfegg p3fltegg p3lwoegg p3vrmlegg p3xfileegg
p3converter)
if(HAVE_FCOLLADA)

10
pandatool/src/ptloader/config_ptloader.cxx
View File

@ -26,8 +26,8 @@
#include "lwoToEggConverter.h"
#include "dxfToEggConverter.h"
#include "vrmlToEggConverter.h"
#include "objToEggConverter.h"
#include "eggToObjConverter.h"
//#include "objToEggConverter.h"
//#include "eggToObjConverter.h"
#include "config_xfile.h"
#include "xFileToEggConverter.h"
@ -97,9 +97,9 @@ init_libptloader() {
XFileToEggConverter *xfile = new XFileToEggConverter;
reg->register_type(new LoaderFileTypePandatool(xfile));
ObjToEggConverter *obj_egg = new ObjToEggConverter;
EggToObjConverter *egg_obj = new EggToObjConverter;
reg->register_type(new LoaderFileTypePandatool(obj_egg, egg_obj));
//ObjToEggConverter *obj_egg = new ObjToEggConverter;
//EggToObjConverter *egg_obj = new EggToObjConverter;
//reg->register_type(new LoaderFileTypePandatool(obj_egg, egg_obj));
// #ifdef HAVE_FCOLLADA DAEToEggConverter *dae = new DAEToEggConverter;
// reg->register_type(new LoaderFileTypePandatool(dae)); #endif