Refactored AnchorPoint and improved TextArea

Semphris · Semphris · commit 2dde3cde1fdf · 2022-03-19T12:04:35.000-04:00
diff --git a/src/math/anchor_point.cpp b/src/math/anchor_point.cpp
@@ -23,53 +23,42 @@
 
 #include "math/rectf.hpp"
 #include "util/log.hpp"
+#include "util/gettext.hpp"
+
+std::vector<std::string> get_anchor_names()
+{
+  // Must be dynamic because language can change at runtime (+ tinygettext must
+  // be init'ed)
+  return {
+    _("Top Left"),
+    _("Top"),
+    _("Top Right"),
+    _("Left"),
+    _("Middle"),
+    _("Right"),
+    _("Bottom Left"),
+    _("Bottom"),
+    _("Bottom Right"),
+  };
+}
 
 std::string anchor_point_to_string(AnchorPoint point)
 {
-  switch (point) {
-    case ANCHOR_TOP_LEFT:
-      return "topleft";
-    case ANCHOR_TOP:
-      return "top";
-    case ANCHOR_TOP_RIGHT:
-      return "topright";
-    case ANCHOR_LEFT:
-      return "left";
-    case ANCHOR_MIDDLE:
-      return "middle";
-    case ANCHOR_RIGHT:
-      return "right";
-    case ANCHOR_BOTTOM_LEFT:
-      return "bottomleft";
-    case ANCHOR_BOTTOM:
-      return "bottom";
-    case ANCHOR_BOTTOM_RIGHT:
-      return "bottomright";
-    default:
-      throw std::runtime_error("Invalid anchor point");
+  try
+  {
+    return g_anchor_keys.at(point);
+  }
+  catch(const std::out_of_range&)
+  {
+    throw std::runtime_error("Invalid anchor point");
   }
 }
 
 AnchorPoint string_to_anchor_point(const std::string& str)
 {
-  if (str == "topleft")
-    return ANCHOR_TOP_LEFT;
-  else if (str == "top")
-    return ANCHOR_TOP;
-  else if (str == "topright")
-    return ANCHOR_TOP_RIGHT;
-  else if (str == "left")
-    return ANCHOR_LEFT;
-  else if (str == "middle")
-    return ANCHOR_MIDDLE;
-  else if (str == "right")
-    return ANCHOR_RIGHT;
-  else if (str == "bottomleft")
-    return ANCHOR_BOTTOM_LEFT;
-  else if (str == "bottom")
-    return ANCHOR_BOTTOM;
-  else if (str == "bottomright")
-    return ANCHOR_BOTTOM_RIGHT;
+  for (size_t i = 0; i < g_anchor_keys.size(); i++)
+    if (g_anchor_keys.at(i) == str)
+      return static_cast<AnchorPoint>(i);
 
   std::ostringstream msg;
   msg << "Unknown anchor '" << str << "'";
@@ -80,14 +69,14 @@ Vector get_anchor_pos(const Rectf& rect, AnchorPoint point)
 {
   Vector result(0.0f, 0.0f);
 
-  switch (point & ANCHOR_V_MASK) {
-    case ANCHOR_LEFT:
+  switch (point % 3) {
+    case 0: // left
       result.x = rect.get_left();
       break;
-    case ANCHOR_MIDDLE:
+    case 1: // middle
       result.x = rect.get_left() + (rect.get_right() - rect.get_left()) / 2.0f;
       break;
-    case ANCHOR_RIGHT:
+    case 2: // right
       result.x = rect.get_right();
       break;
     default:
@@ -96,14 +85,14 @@ Vector get_anchor_pos(const Rectf& rect, AnchorPoint point)
       break;
   }
 
-  switch (point & ANCHOR_H_MASK) {
-    case ANCHOR_TOP:
+  switch (point / 3) {
+    case 0: // top
       result.y = rect.get_top();
       break;
-    case ANCHOR_MIDDLE:
+    case 1: // middle
       result.y = rect.get_top() + (rect.get_bottom() - rect.get_top()) / 2.0f;
       break;
-    case ANCHOR_BOTTOM:
+    case 2: // bottom
       result.y = rect.get_bottom();
       break;
     default:
@@ -120,14 +109,14 @@ Vector get_anchor_pos(const Rectf& destrect, float width, float height,
 {
   Vector result(0.0f, 0.0f);
 
-  switch (point & ANCHOR_V_MASK) {
-    case ANCHOR_LEFT:
+  switch (point % 3) {
+    case 0: // left
       result.x = destrect.get_left();
       break;
-    case ANCHOR_MIDDLE:
+    case 1: // middle
       result.x = destrect.get_middle().x - width / 2.0f;
       break;
-    case ANCHOR_RIGHT:
+    case 2: // right
       result.x = destrect.get_right() - width;
       break;
     default:
@@ -136,14 +125,14 @@ Vector get_anchor_pos(const Rectf& destrect, float width, float height,
       break;
   }
 
-  switch (point & ANCHOR_H_MASK) {
-    case ANCHOR_TOP:
+  switch (point / 3) {
+    case 0: // top
       result.y = destrect.get_top();
       break;
-    case ANCHOR_MIDDLE:
+    case 1: // middle
       result.y = destrect.get_middle().y - height / 2.0f;
       break;
-    case ANCHOR_BOTTOM:
+    case 2: // bottom
       result.y = destrect.get_bottom() - height;
       break;
     default:
diff --git a/src/math/anchor_point.hpp b/src/math/anchor_point.hpp
@@ -18,26 +18,31 @@
 #define HEADER_SUPERTUX_MATH_ANCHOR_POINT_HPP
 
 #include <string>
+#include <vector>
 
 #include "math/vector.hpp"
 
 class Rectf;
 
 enum AnchorPoint {
-  ANCHOR_H_MASK = 0x00f0,
-  ANCHOR_TOP    = 0x0010,
-  ANCHOR_BOTTOM = 0x0020,
-  ANCHOR_V_MASK = 0x000f,
-  ANCHOR_LEFT   = 0x0001,
-  ANCHOR_RIGHT  = 0x0002,
-  ANCHOR_MIDDLE = 0x0000,
-
-  ANCHOR_TOP_LEFT = ANCHOR_TOP | ANCHOR_LEFT,
-  ANCHOR_TOP_RIGHT = ANCHOR_TOP | ANCHOR_RIGHT,
-  ANCHOR_BOTTOM_LEFT = ANCHOR_BOTTOM | ANCHOR_LEFT,
-  ANCHOR_BOTTOM_RIGHT = ANCHOR_BOTTOM | ANCHOR_RIGHT
+  ANCHOR_TOP_LEFT,
+  ANCHOR_TOP,
+  ANCHOR_TOP_RIGHT,
+  ANCHOR_LEFT,
+  ANCHOR_MIDDLE,
+  ANCHOR_RIGHT,
+  ANCHOR_BOTTOM_LEFT,
+  ANCHOR_BOTTOM,
+  ANCHOR_BOTTOM_RIGHT,
+  ANCHOR_LAST = ANCHOR_BOTTOM_RIGHT
 };
 
+const std::vector<std::string> g_anchor_keys = {
+  "topleft", "top", "topright", "left", "middle", "right", "bottomleft",
+  "bottom", "bottomright"
+};
+
+std::vector<std::string> get_anchor_names();
 std::string anchor_point_to_string(AnchorPoint point);
 AnchorPoint string_to_anchor_point(const std::string& str);
 Vector get_anchor_pos(const Rectf& rect, AnchorPoint point);
diff --git a/src/scripting/anchor_points.hpp b/src/scripting/anchor_points.hpp
@@ -20,15 +20,15 @@
 namespace scripting {
 
 // TODO get these from the definitions in anchor.h (needs miniswig update)
-static const int ANCHOR_TOP         = 0x0010;
-static const int ANCHOR_BOTTOM      = 0x0020;
-static const int ANCHOR_LEFT        = 0x0001;
-static const int ANCHOR_RIGHT       = 0x0002;
-static const int ANCHOR_MIDDLE      = 0x0000;
-static const int ANCHOR_TOP_LEFT    = 0x0011;
-static const int ANCHOR_TOP_RIGHT   = 0x0012;
-static const int ANCHOR_BOTTOM_LEFT = 0x0021;
-static const int ANCHOR_BOTTOM_RIGHT = 0x0022;
+static const int ANCHOR_TOP_LEFT     = 0;
+static const int ANCHOR_TOP          = 1;
+static const int ANCHOR_TOP_RIGHT    = 2;
+static const int ANCHOR_LEFT         = 3;
+static const int ANCHOR_MIDDLE       = 4;
+static const int ANCHOR_RIGHT        = 5;
+static const int ANCHOR_BOTTOM_LEFT  = 6;
+static const int ANCHOR_BOTTOM       = 7;
+static const int ANCHOR_BOTTOM_RIGHT = 8;
 
 } // namespace scripting
 
diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
@@ -11092,6 +11092,66 @@ static SQInteger WorldMap_release_hook(SQUserPointer ptr, SQInteger )
   return 0;
 }
 
+static SQInteger WorldMap_get_tux_x_wrapper(HSQUIRRELVM vm)
+{
+  SQUserPointer data;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, nullptr)) || !data) {
+    sq_throwerror(vm, _SC("'get_tux_x' called without instance"));
+    return SQ_ERROR;
+  }
+  auto _this = reinterpret_cast<scripting::WorldMap*> (data);
+
+  if (_this == nullptr) {
+    return SQ_ERROR;
+  }
+
+
+  try {
+    float return_value = _this->get_tux_x();
+
+    sq_pushfloat(vm, return_value);
+    return 1;
+
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_tux_x'"));
+    return SQ_ERROR;
+  }
+
+}
+
+static SQInteger WorldMap_get_tux_y_wrapper(HSQUIRRELVM vm)
+{
+  SQUserPointer data;
+  if(SQ_FAILED(sq_getinstanceup(vm, 1, &data, nullptr)) || !data) {
+    sq_throwerror(vm, _SC("'get_tux_y' called without instance"));
+    return SQ_ERROR;
+  }
+  auto _this = reinterpret_cast<scripting::WorldMap*> (data);
+
+  if (_this == nullptr) {
+    return SQ_ERROR;
+  }
+
+
+  try {
+    float return_value = _this->get_tux_y();
+
+    sq_pushfloat(vm, return_value);
+    return 1;
+
+  } catch(std::exception& e) {
+    sq_throwerror(vm, e.what());
+    return SQ_ERROR;
+  } catch(...) {
+    sq_throwerror(vm, _SC("Unexpected exception while executing function 'get_tux_y'"));
+    return SQ_ERROR;
+  }
+
+}
+
 static SQInteger display_wrapper(HSQUIRRELVM vm)
 {
   return scripting::display(vm);
@@ -12980,56 +13040,56 @@ void register_supertux_wrapper(HSQUIRRELVM v)
 {
   using namespace wrapper;
 
+  sq_pushstring(v, "ANCHOR_TOP_LEFT", -1);
+  sq_pushinteger(v, 0);
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_TOP_LEFT'");
+  }
+
   sq_pushstring(v, "ANCHOR_TOP", -1);
-  sq_pushinteger(v, 16);
+  sq_pushinteger(v, 1);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register constant 'ANCHOR_TOP'");
   }
 
-  sq_pushstring(v, "ANCHOR_BOTTOM", -1);
-  sq_pushinteger(v, 32);
+  sq_pushstring(v, "ANCHOR_TOP_RIGHT", -1);
+  sq_pushinteger(v, 2);
   if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_BOTTOM'");
+    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_TOP_RIGHT'");
   }
 
   sq_pushstring(v, "ANCHOR_LEFT", -1);
-  sq_pushinteger(v, 1);
+  sq_pushinteger(v, 3);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register constant 'ANCHOR_LEFT'");
   }
 
-  sq_pushstring(v, "ANCHOR_RIGHT", -1);
-  sq_pushinteger(v, 2);
-  if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_RIGHT'");
-  }
-
   sq_pushstring(v, "ANCHOR_MIDDLE", -1);
-  sq_pushinteger(v, 0);
+  sq_pushinteger(v, 4);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register constant 'ANCHOR_MIDDLE'");
   }
 
-  sq_pushstring(v, "ANCHOR_TOP_LEFT", -1);
-  sq_pushinteger(v, 17);
+  sq_pushstring(v, "ANCHOR_RIGHT", -1);
+  sq_pushinteger(v, 5);
   if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_TOP_LEFT'");
+    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_RIGHT'");
   }
 
-  sq_pushstring(v, "ANCHOR_TOP_RIGHT", -1);
-  sq_pushinteger(v, 18);
+  sq_pushstring(v, "ANCHOR_BOTTOM_LEFT", -1);
+  sq_pushinteger(v, 6);
   if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_TOP_RIGHT'");
+    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_BOTTOM_LEFT'");
   }
 
-  sq_pushstring(v, "ANCHOR_BOTTOM_LEFT", -1);
-  sq_pushinteger(v, 33);
+  sq_pushstring(v, "ANCHOR_BOTTOM", -1);
+  sq_pushinteger(v, 7);
   if(SQ_FAILED(sq_createslot(v, -3))) {
-    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_BOTTOM_LEFT'");
+    throw SquirrelError(v, "Couldn't register constant 'ANCHOR_BOTTOM'");
   }
 
   sq_pushstring(v, "ANCHOR_BOTTOM_RIGHT", -1);
-  sq_pushinteger(v, 34);
+  sq_pushinteger(v, 8);
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register constant 'ANCHOR_BOTTOM_RIGHT'");
   }
@@ -14792,6 +14852,20 @@ void register_supertux_wrapper(HSQUIRRELVM v)
     msg << "Couldn't create new class 'WorldMap'";
     throw SquirrelError(v, msg.str());
   }
+  sq_pushstring(v, "get_tux_x", -1);
+  sq_newclosure(v, &WorldMap_get_tux_x_wrapper, 0);
+  sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, "x|t");
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'get_tux_x'");
+  }
+
+  sq_pushstring(v, "get_tux_y", -1);
+  sq_newclosure(v, &WorldMap_get_tux_y_wrapper, 0);
+  sq_setparamscheck(v, SQ_MATCHTYPEMASKSTRING, "x|t");
+  if(SQ_FAILED(sq_createslot(v, -3))) {
+    throw SquirrelError(v, "Couldn't register function 'get_tux_y'");
+  }
+
   if(SQ_FAILED(sq_createslot(v, -3))) {
     throw SquirrelError(v, "Couldn't register class 'WorldMap'");
   }
diff --git a/src/trigger/text_area.cpp b/src/trigger/text_area.cpp
diff --git a/src/trigger/text_area.hpp b/src/trigger/text_area.hpp
