Pull in changes from FGJ2024

Laguna1989 · Jan 23, 2025 · ae2b6bb · ae2b6bb
1 parent 8fa2496
commit ae2b6bb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/impl/jamtemplate/common/tilemap/tileson_loader.cpp b/impl/jamtemplate/common/tilemap/tileson_loader.cpp
@@ -216,6 +216,9 @@ jt::TilemapCollisions jt::tilemap::TilesonLoader::loadCollisionsFromLayer(
             if (!blockedProperty) {
                 continue;
             }
+            if (!blockedProperty->getValue<bool>()) {
+                continue;
+            }
 
             auto posx = std::get<0>(pos);
             auto posy = std::get<1>(pos);

diff --git a/impl/jamtemplate/common/vector.cpp b/impl/jamtemplate/common/vector.cpp
@@ -15,6 +15,13 @@ jt::Vector2f& jt::operator-=(jt::Vector2f& lhs, jt::Vector2f const& rhs) noexcep
     return lhs;
 }
 
+jt::Vector2f& jt::operator*=(jt::Vector2f& lhs, float const& rhs) noexcept
+{
+    lhs.x *= rhs;
+    lhs.y *= rhs;
+    return lhs;
+}
+
 std::ostream& jt::operator<<(std::ostream& os, jt::Vector2f const& vec)
 {
     return os << "(" << vec.x << ", " << vec.y << ")";

diff --git a/impl/jamtemplate/common/vector.hpp b/impl/jamtemplate/common/vector.hpp
@@ -39,6 +39,7 @@ constexpr jt::Vector2f operator-(jt::Vector2f const& a, jt::Vector2f const& b) n
 
 jt::Vector2f& operator+=(jt::Vector2f& lhs, jt::Vector2f const& rhs) noexcept;
 jt::Vector2f& operator-=(jt::Vector2f& lhs, jt::Vector2f const& rhs) noexcept;
+jt::Vector2f& operator*=(jt::Vector2f& lhs, float const& rhs) noexcept;
 
 constexpr jt::Vector2f operator*(float const f, jt::Vector2f const& v) noexcept
 {