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/image.cpp | |
| parent | b2ce682f6ed9493423be257a5b2e87126692a94f (diff) | |
-Added ATITC texture support
-Fixed bug of some tabs showing wrong names
-Exported properties for viewport
Diffstat (limited to 'core/image.cpp')
| -rw-r--r-- | core/image.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/core/image.cpp b/core/image.cpp index a9485feff2..ccabd04d6f 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -1260,6 +1260,12 @@ int Image::get_format_pixel_size(Format p_format) { return 1; } break; + case FORMAT_ATC: + case FORMAT_ATC_ALPHA_EXPLICIT: + case FORMAT_ATC_ALPHA_INTERPOLATED: { + + return 1; + } break; case FORMAT_ETC: { return 1; @@ -1323,6 +1329,15 @@ void Image::_get_format_min_data_size(Format p_format,int &r_w, int &r_h) { r_w=8; r_h=8; } break; + case FORMAT_ATC: + case FORMAT_ATC_ALPHA_EXPLICIT: + case FORMAT_ATC_ALPHA_INTERPOLATED: { + + r_w=8; + r_h=8; + + } break; + case FORMAT_ETC: { r_w=4; @@ -1339,7 +1354,7 @@ void Image::_get_format_min_data_size(Format p_format,int &r_w, int &r_h) { int Image::get_format_pixel_rshift(Format p_format) { - if (p_format==FORMAT_BC1 || p_format==FORMAT_BC4 || p_format==FORMAT_PVRTC4 || p_format==FORMAT_PVRTC4_ALPHA || p_format==FORMAT_ETC) + if (p_format==FORMAT_BC1 || p_format==FORMAT_BC4 || p_format==FORMAT_ATC || p_format==FORMAT_PVRTC4 || p_format==FORMAT_PVRTC4_ALPHA || p_format==FORMAT_ETC) return 1; else if (p_format==FORMAT_PVRTC2 || p_format==FORMAT_PVRTC2_ALPHA) return 2; |