From c50a5b25b8b8a1f9b788010de993b3fed80e007c Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 3 Nov 2022 01:09:05 +0100 Subject: [PATCH] ptloader: Disable obj2egg from ptloader 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 --- makepanda/makepanda.py | 2 +- pandatool/src/ptloader/CMakeLists.txt | 2 +- pandatool/src/ptloader/config_ptloader.cxx | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 31cc887f1f..d608559d83 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -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') diff --git a/pandatool/src/ptloader/CMakeLists.txt b/pandatool/src/ptloader/CMakeLists.txt index 0d98ee8377..f4d4ab9f04 100644 --- a/pandatool/src/ptloader/CMakeLists.txt +++ b/pandatool/src/ptloader/CMakeLists.txt @@ -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) diff --git a/pandatool/src/ptloader/config_ptloader.cxx b/pandatool/src/ptloader/config_ptloader.cxx index e3fb3f9dd9..5c02a7a146 100644 --- a/pandatool/src/ptloader/config_ptloader.cxx +++ b/pandatool/src/ptloader/config_ptloader.cxx @@ -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