Revert 1469424 and fix wrong char position when doing mouse selection on intlGUIEditB...

[oweals/minetest.git] / src / tileanimation.cpp

diff --git a/src/tileanimation.cpp b/src/tileanimation.cpp
index 891478c9f9b46bd0d017e97913758b51ed875859..67d27d3963bda15dd95201b3cd305df35f63365d 100644 (file)
--- a/src/tileanimation.cpp
+++ b/src/tileanimation.cpp
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 void TileAnimationParams::serialize(std::ostream &os, u16 protocol_version) const
 {
-       if(protocol_version < 29 /* TODO bump */) {
+       if (protocol_version < 29) {
                if (type == TAT_VERTICAL_FRAMES) {
                        writeU8(os, type);
                        writeU16(os, vertical_frames.aspect_w);
@@ -41,47 +41,91 @@ void TileAnimationParams::serialize(std::ostream &os, u16 protocol_version) cons
                writeU16(os, vertical_frames.aspect_w);
                writeU16(os, vertical_frames.aspect_h);
                writeF1000(os, vertical_frames.length);
+       } else if (type == TAT_SHEET_2D) {
+               writeU8(os, sheet_2d.frames_w);
+               writeU8(os, sheet_2d.frames_h);
+               writeF1000(os, sheet_2d.frame_length);
        }
 }
 
 void TileAnimationParams::deSerialize(std::istream &is, u16 protocol_version)
 {
        type = (TileAnimationType) readU8(is);
-       if(protocol_version < 29 /* TODO bump */) {
+       if (protocol_version < 29) {
                vertical_frames.aspect_w = readU16(is);
                vertical_frames.aspect_h = readU16(is);
                vertical_frames.length = readF1000(is);
                return;
        }
 
-       if(type == TAT_VERTICAL_FRAMES) {
+       if (type == TAT_VERTICAL_FRAMES) {
                vertical_frames.aspect_w = readU16(is);
                vertical_frames.aspect_h = readU16(is);
                vertical_frames.length = readF1000(is);
+       } else if (type == TAT_SHEET_2D) {
+               sheet_2d.frames_w = readU8(is);
+               sheet_2d.frames_h = readU8(is);
+               sheet_2d.frame_length = readF1000(is);
        }
 }
 
-void TileAnimationParams::determineParams(v2u32 texture_size, int *frame_count, int *frame_length_ms) const
+void TileAnimationParams::determineParams(v2u32 texture_size, int *frame_count,
+               int *frame_length_ms, v2u32 *frame_size) const
 {
-       if (type == TAT_NONE) {
-               *frame_count = 1;
-               *frame_length_ms = 1000;
-               return;
+       if (type == TAT_VERTICAL_FRAMES) {
+               int frame_height = (float)texture_size.X /
+                               (float)vertical_frames.aspect_w *
+                               (float)vertical_frames.aspect_h;
+               int _frame_count = texture_size.Y / frame_height;
+               if (frame_count)
+                       *frame_count = _frame_count;
+               if (frame_length_ms)
+                       *frame_length_ms = 1000.0 * vertical_frames.length / _frame_count;
+               if (frame_size)
+                       *frame_size = v2u32(texture_size.X, frame_height);
+       } else if (type == TAT_SHEET_2D) {
+               if (frame_count)
+                       *frame_count = sheet_2d.frames_w * sheet_2d.frames_h;
+               if (frame_length_ms)
+                       *frame_length_ms = 1000 * sheet_2d.frame_length;
+               if (frame_size)
+                       *frame_size = v2u32(texture_size.X / sheet_2d.frames_w, texture_size.Y / sheet_2d.frames_h);
        }
-       int frame_height = (float)texture_size.X /
-                       (float)vertical_frames.aspect_w *
-                       (float)vertical_frames.aspect_h;
-       if (frame_count)
-               *frame_count = texture_size.Y / frame_height;
-       if (frame_length_ms)
-               *frame_length_ms = 1000.0 * vertical_frames.length / (texture_size.Y / frame_height);
+       // caller should check for TAT_NONE
 }
 
 void TileAnimationParams::getTextureModifer(std::ostream &os, v2u32 texture_size, int frame) const
 {
        if (type == TAT_NONE)
                return;
-       int frame_count;
-       determineParams(texture_size, &frame_count, NULL);
-       os << "^[verticalframe:" << frame_count << ":" << frame;
+       if (type == TAT_VERTICAL_FRAMES) {
+               int frame_count;
+               determineParams(texture_size, &frame_count, NULL, NULL);
+               os << "^[verticalframe:" << frame_count << ":" << frame;
+       } else if (type == TAT_SHEET_2D) {
+               int q, r;
+               q = frame / sheet_2d.frames_w;
+               r = frame % sheet_2d.frames_w;
+               os << "^[sheet:" << sheet_2d.frames_w << "x" << sheet_2d.frames_h
+                       << ":" << r << "," << q;
+       }
+}
+
+v2f TileAnimationParams::getTextureCoords(v2u32 texture_size, int frame) const
+{
+       v2u32 ret(0, 0);
+       if (type == TAT_VERTICAL_FRAMES) {
+               int frame_height = (float)texture_size.X /
+                               (float)vertical_frames.aspect_w *
+                               (float)vertical_frames.aspect_h;
+               ret = v2u32(0, frame_height * frame);
+       } else if (type == TAT_SHEET_2D) {
+               v2u32 frame_size;
+               determineParams(texture_size, NULL, NULL, &frame_size);
+               int q, r;
+               q = frame / sheet_2d.frames_w;
+               r = frame % sheet_2d.frames_w;
+               ret = v2u32(r * frame_size.X, q * frame_size.Y);
+       }
+       return v2f(ret.X / (float) texture_size.X, ret.Y / (float) texture_size.Y);
 }