godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more extensions to the dummy texture loader 

This should make headless exporting work in projects using textures
in any format.

Error messages should no longer appear when running a project
that used image formats that were previously not present in the list.
This commit is contained in:
Hugo Locurcio 2019-02-02 00:11:56 +01:00
parent b80631a394
commit 3007c7e2a3
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/dummy/texture_loader_dummy.cpp
View File

@ -67,10 +67,19 @@ RES ResourceFormatDummyTexture::load(const String &p_path, const String &p_origi
} }
void ResourceFormatDummyTexture::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatDummyTexture::get_recognized_extensions(List<String> *p_extensions) const {
p_extensions->push_back("png"); p_extensions->push_back("bmp");
p_extensions->push_back("hdr"); p_extensions->push_back("dds");
p_extensions->push_back("exr");
p_extensions->push_back("jpeg");
p_extensions->push_back("jpg"); p_extensions->push_back("jpg");
p_extensions->push_back("hdr");
p_extensions->push_back("pkm");
p_extensions->push_back("png");
p_extensions->push_back("pvr");
p_extensions->push_back("svg");
p_extensions->push_back("svgz");
p_extensions->push_back("tga"); p_extensions->push_back("tga");
p_extensions->push_back("webp");
} }
bool ResourceFormatDummyTexture::handles_type(const String &p_type) const { bool ResourceFormatDummyTexture::handles_type(const String &p_type) const {
@ -79,7 +88,22 @@ bool ResourceFormatDummyTexture::handles_type(const String &p_type) const {
String ResourceFormatDummyTexture::get_resource_type(const String &p_path) const { String ResourceFormatDummyTexture::get_resource_type(const String &p_path) const {
String extension = p_path.get_extension().to_lower(); String extension = p_path.get_extension().to_lower();
if (extension == "png" || extension == "hdr" || extension == "jpg" || extension == "tga") if (
extension == "bmp" ||
extension == "dds" ||
extension == "exr" ||
extension == "jpeg" ||
extension == "jpg" ||
extension == "hdr" ||
extension == "pkm" ||
extension == "png" ||
extension == "pvr" ||
extension == "svg" ||
extension == "svgz" ||
extension == "tga" ||
extension == "webp") {
return "ImageTexture"; return "ImageTexture";
}
return ""; return "";
} }