TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Write texture types when pview failed to recognise extension

Browse Source
This commit is contained in:
rdb 2016-09-27 21:32:55 +02:00
parent 7b555b17b1
commit 3ee033eeeb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/framework/windowFramework.cxx
View File

@ -639,10 +639,13 @@ load_model(const NodePath &parent, Filename filename) {
extension = Filename(filename.get_basename_wo_extension()).get_extension(); extension = Filename(filename.get_basename_wo_extension()).get_extension();
} }
#endif // HAVE_ZLIB #endif // HAVE_ZLIB
TexturePool *texture_pool = TexturePool::get_global_ptr();
LoaderFileType *model_type = NULL;
if (!extension.empty()) { if (!extension.empty()) {
LoaderFileTypeRegistry *reg = LoaderFileTypeRegistry::get_global_ptr(); LoaderFileTypeRegistry *reg = LoaderFileTypeRegistry::get_global_ptr();
LoaderFileType *model_type = model_type = reg->get_type_from_extension(extension);
reg->get_type_from_extension(extension);
if (model_type == (LoaderFileType *)NULL) { if (model_type == (LoaderFileType *)NULL) {
// The extension isn't a known model file type; is it a known // The extension isn't a known model file type; is it a known
// image file extension? // image file extension?
@ -652,7 +655,6 @@ load_model(const NodePath &parent, Filename filename) {
is_image = true; is_image = true;
} else { } else {
TexturePool *texture_pool = TexturePool::get_global_ptr();
if (texture_pool->get_texture_type(extension) != NULL) { if (texture_pool->get_texture_type(extension) != NULL) {
// It is a known image file extension. // It is a known image file extension.
is_image = true; is_image = true;
@ -674,6 +676,13 @@ load_model(const NodePath &parent, Filename filename) {
node = load_image_as_model(filename); node = load_image_as_model(filename);
} else { } else {
node = loader.load_sync(filename, options); node = loader.load_sync(filename, options);
// It failed to load. Is it because the extension isn't recognised? If
// so, then we just got done printing out the known scene types, and we
// should also print out the supported texture types.
if (node == (PandaNode *)NULL && !is_image && model_type == NULL) {
texture_pool->write_texture_types(nout, 2);
}
} }
if (node == (PandaNode *)NULL) { if (node == (PandaNode *)NULL) {