Some overload functions

supernovaengine · Jan 2, 2024 · f9ff698 · f9ff698
1 parent 73c5f26
commit f9ff698
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/engine/core/math/Vector2.cpp b/engine/core/math/Vector2.cpp
@@ -1,5 +1,7 @@
 #include "Vector2.h"
 
+#include "Vector3.h"
+
 using namespace Supernova;
 
 const Vector2 Vector2::ZERO( 0, 0);
@@ -32,6 +34,11 @@ Vector2::Vector2( const int afCoordinate[2] ){
 Vector2::Vector2( float* const r ): x( r[0] ), y( r[1] ){
 }
 
+Vector2::Vector2( const Vector3 vec3 ){
+    x = vec3.x;
+    y = vec3.y;
+}
+
 std::string Vector2::toString() const{
     return "Vector2(" + std::to_string(x) + ", " + std::to_string(y) + ")"; 
 }

diff --git a/engine/core/math/Vector2.h b/engine/core/math/Vector2.h
@@ -17,6 +17,8 @@ Supernova::Vector2 operator - (const float lhs, const Supernova::Vector2& rhs);
 
 namespace Supernova {
 
+    class Vector3;
+
     class Vector2
     {
     public:
@@ -41,6 +43,8 @@ namespace Supernova {
 
         explicit Vector2( float* const r );
 
+        explicit Vector2( const Vector3 vec3 );
+
         std::string toString() const;
 
 

diff --git a/engine/core/object/physics/Body2D.cpp b/engine/core/object/physics/Body2D.cpp
@@ -84,6 +84,10 @@ int Body2D::createRectShape(float width, float height){
     return index;
 }
 
+int Body2D::createCenteredRectShape(float width, float height){
+    return createCenteredRectShape(width, height, Vector2(0, 0), 0);
+}
+
 int Body2D::createCenteredRectShape(float width, float height, Vector2 center, float angle){
     int index = scene->getSystem<PhysicsSystem>()->createCenteredRectShape2D(entity, width, height, center, angle);
     return index;

diff --git a/engine/core/object/physics/Body2D.h b/engine/core/object/physics/Body2D.h
@@ -30,6 +30,7 @@ namespace Supernova{
         Object getAttachedObject();
 
         int createRectShape(float width, float height);
+        int createCenteredRectShape(float width, float height);
         int createCenteredRectShape(float width, float height, Vector2 center, float angle);
         int createPolygonShape(std::vector<Vector2> vertices);
         int createCircleShape(Vector2 center, float radius);

diff --git a/engine/core/script/binding/ObjectClassesLua.cpp b/engine/core/script/binding/ObjectClassesLua.cpp
@@ -605,7 +605,9 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addConstructor <void (Scene*, Entity)> ()
         .addFunction("getAttachedObject", &Body2D::getAttachedObject)
         .addFunction("createRectShape", &Body2D::createRectShape)
-        .addFunction("createCenteredRectShape", &Body2D::createCenteredRectShape)
+        .addFunction("createCenteredRectShape", 
+            luabridge::overload<float, float>(&Body2D::createCenteredRectShape),
+            luabridge::overload<float, float, Vector2, float>(&Body2D::createCenteredRectShape))
         .addFunction("createPolygonShape", &Body2D::createPolygonShape)
         .addFunction("createCircleShape", &Body2D::createCircleShape)
         .addFunction("createTwoSidedEdgeShape", &Body2D::createTwoSidedEdgeShape)