Translated using Weblate (Italian)

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

diff --git a/src/tileanimation.cpp b/src/tileanimation.cpp
index a23eecc2ea7d6d9287db7eff77c05725988c793c..930fd94731013089bda7a8dde8c243f4c92eba77 100644 (file)
--- a/src/tileanimation.cpp
+++ b/src/tileanimation.cpp
@@ -19,57 +19,37 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tileanimation.h"
 #include "util/serialize.h"
 
-void TileAnimationParams::serialize(std::ostream &os, u16 protocol_version) const
+void TileAnimationParams::serialize(std::ostream &os, u8 tiledef_version) const
 {
-       if (protocol_version < 29) {
-               if (type == TAT_VERTICAL_FRAMES) {
-                       writeU8(os, type);
-                       writeU16(os, vertical_frames.aspect_w);
-                       writeU16(os, vertical_frames.aspect_h);
-                       writeF1000(os, vertical_frames.length);
-               } else {
-                       writeU8(os, TAT_NONE);
-                       writeU16(os, 1);
-                       writeU16(os, 1);
-                       writeF1000(os, 1.0);
-               }
-               return;
-       }
-
        writeU8(os, type);
        if (type == TAT_VERTICAL_FRAMES) {
                writeU16(os, vertical_frames.aspect_w);
                writeU16(os, vertical_frames.aspect_h);
-               writeF1000(os, vertical_frames.length);
+               writeF32(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);
+               writeF32(os, sheet_2d.frame_length);
        }
 }
 
-void TileAnimationParams::deSerialize(std::istream &is, u16 protocol_version)
+void TileAnimationParams::deSerialize(std::istream &is, u8 tiledef_version)
 {
        type = (TileAnimationType) readU8(is);
-       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) {
                vertical_frames.aspect_w = readU16(is);
                vertical_frames.aspect_h = readU16(is);
-               vertical_frames.length = readF1000(is);
+               vertical_frames.length = readF32(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);
+               sheet_2d.frame_length = readF32(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_VERTICAL_FRAMES) {
                int frame_height = (float)texture_size.X /
@@ -80,15 +60,17 @@ void TileAnimationParams::determineParams(v2u32 texture_size, int *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;
-       } else { // TAT_NONE
-               *frame_count = 1;
-               *frame_length_ms = 1000;
+               if (frame_size)
+                       *frame_size = v2u32(texture_size.X / sheet_2d.frames_w, texture_size.Y / sheet_2d.frames_h);
        }
+       // caller should check for TAT_NONE
 }
 
 void TileAnimationParams::getTextureModifer(std::ostream &os, v2u32 texture_size, int frame) const
@@ -97,7 +79,7 @@ void TileAnimationParams::getTextureModifer(std::ostream &os, v2u32 texture_size
                return;
        if (type == TAT_VERTICAL_FRAMES) {
                int frame_count;
-               determineParams(texture_size, &frame_count, NULL);
+               determineParams(texture_size, &frame_count, NULL, NULL);
                os << "^[verticalframe:" << frame_count << ":" << frame;
        } else if (type == TAT_SHEET_2D) {
                int q, r;
@@ -107,3 +89,22 @@ void TileAnimationParams::getTextureModifer(std::ostream &os, v2u32 texture_size
                        << ":" << 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);
+}