Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-09 11:37:35 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

forgot to add mirroredrepeat flag to flags file. fixed.

Browse Source
This commit is contained in:
romulox_x 2015-06-25 15:41:12 -07:00
parent 85e49d4e75
commit acb5cdb574
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/png/resource_saver_png.cpp
View File

@ -75,6 +75,9 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t
if (bool(texture->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR)) { if (bool(texture->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR)) {
text+="tolinear=true\n"; text+="tolinear=true\n";
} }
if (bool(texture->get_flags()&Texture::FLAG_MIRRORED_REPEAT)) {
text+="mirroredrepeat=true\n";
}
if (text!="" || FileAccess::exists(p_path+".flags")) { if (text!="" || FileAccess::exists(p_path+".flags")) {

5
scene/io/resource_format_image.cpp
View File

@ -180,6 +180,11 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina
if (flags_found["tolinear"]) if (flags_found["tolinear"])
flags|=Texture::FLAG_CONVERT_TO_LINEAR; flags|=Texture::FLAG_CONVERT_TO_LINEAR;
} }
if (flags_found.has("mirroredrepeat")) {
if (flags_found["mirroredrepeat"])
flags|=Texture::FLAG_MIRRORED_REPEAT;
}
if (debug_load_times) if (debug_load_times)
begtime=OS::get_singleton()->get_ticks_usec(); begtime=OS::get_singleton()->get_ticks_usec();

2
scene/resources/texture.h
View File

@ -51,12 +51,12 @@ public:
enum Flags { enum Flags {
FLAG_MIPMAPS=VisualServer::TEXTURE_FLAG_MIPMAPS, FLAG_MIPMAPS=VisualServer::TEXTURE_FLAG_MIPMAPS,
FLAG_REPEAT=VisualServer::TEXTURE_FLAG_REPEAT, FLAG_REPEAT=VisualServer::TEXTURE_FLAG_REPEAT,
FLAG_MIRRORED_REPEAT=VisualServer::TEXTURE_FLAG_MIRRORED_REPEAT,
FLAG_FILTER=VisualServer::TEXTURE_FLAG_FILTER, FLAG_FILTER=VisualServer::TEXTURE_FLAG_FILTER,
FLAG_ANISOTROPIC_FILTER=VisualServer::TEXTURE_FLAG_ANISOTROPIC_FILTER, FLAG_ANISOTROPIC_FILTER=VisualServer::TEXTURE_FLAG_ANISOTROPIC_FILTER,
FLAG_CONVERT_TO_LINEAR=VisualServer::TEXTURE_FLAG_CONVERT_TO_LINEAR, FLAG_CONVERT_TO_LINEAR=VisualServer::TEXTURE_FLAG_CONVERT_TO_LINEAR,
FLAG_VIDEO_SURFACE=VisualServer::TEXTURE_FLAG_VIDEO_SURFACE, FLAG_VIDEO_SURFACE=VisualServer::TEXTURE_FLAG_VIDEO_SURFACE,
FLAGS_DEFAULT=FLAG_MIPMAPS|FLAG_REPEAT|FLAG_FILTER, FLAGS_DEFAULT=FLAG_MIPMAPS|FLAG_REPEAT|FLAG_FILTER,
FLAG_MIRRORED_REPEAT=VisualServer::TEXTURE_FLAG_MIRRORED_REPEAT
}; };