diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:08:17 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:08:17 -0300 |
| commit | ed6d9463d264d0983f75c2dc93191c8526e9115b (patch) | |
| tree | 3518ba92d9e4fa5b5d36e7272faa3faa01f908c7 /core/io/resource_format_xml.cpp | |
| parent | b2ce682f6ed9493423be257a5b2e87126692a94f (diff) | |
| download | redot-engine-ed6d9463d264d0983f75c2dc93191c8526e9115b.tar.gz | |
-Added ATITC texture support
-Fixed bug of some tabs showing wrong names
-Exported properties for viewport
Diffstat (limited to 'core/io/resource_format_xml.cpp')
| -rw-r--r-- | core/io/resource_format_xml.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index bd8e46556c..fc5aecfd99 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -551,6 +551,12 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name) imgformat=Image::FORMAT_PVRTC4_ALPHA; } else if (format=="etc") { imgformat=Image::FORMAT_ETC; + } else if (format=="atc") { + imgformat=Image::FORMAT_ATC; + } else if (format=="atcai") { + imgformat=Image::FORMAT_ATC_ALPHA_INTERPOLATED; + } else if (format=="atcae") { + imgformat=Image::FORMAT_ATC_ALPHA_EXPLICIT; } else if (format=="custom") { imgformat=Image::FORMAT_CUSTOM; } else { @@ -1937,6 +1943,9 @@ void ResourceFormatSaverXMLInstance::write_property(const String& p_name,const V case Image::FORMAT_PVRTC4: params+=" format=\"pvrtc4\""; break; case Image::FORMAT_PVRTC4_ALPHA: params+=" format=\"pvrtc4a\""; break; case Image::FORMAT_ETC: params+=" format=\"etc\""; break; + case Image::FORMAT_ATC: params+=" format=\"atc\""; break; + case Image::FORMAT_ATC_ALPHA_EXPLICIT: params+=" format=\"atcae\""; break; + case Image::FORMAT_ATC_ALPHA_INTERPOLATED: params+=" format=\"atcai\""; break; case Image::FORMAT_CUSTOM: params+=" format=\"custom\" custom_size=\""+itos(img.get_data().size())+"\""; break; default: {} } |