feat Create Vector4D

1 files changed, 12 insertions, 12 deletions

diff --git a/src/sprite.cpp b/src/sprite.cpp
index 2aad6d6..7c1f109 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -16,8 +16,9 @@
 
 #include "sprite.hpp"
 
-#include "vk/sprite.hpp"
 #include "texture.hpp"
+#include "vk/sprite.hpp"
+#include "vector_4d.hpp"
 
 void
 cg_free_sprite(mrb_state *mrb, void* obj)
@@ -33,20 +34,19 @@ const struct mrb_data_type cg_sprite_type = { "CG_Sprite", cg_free_sprite };
 static mrb_value
 cg_cSprite_initialize(mrb_state *mrb, mrb_value self)
 {
-  mrb_float x, y, w, h;
-
+  std::shared_ptr<glm::vec4> *vector_4d;
   std::shared_ptr<VK::Texture> *texture;
   std::shared_ptr<VK::Sprite> *ptr;
 
-  mrb_get_args(mrb, "dffff", &texture, &cg_texture_type, &x, &y, &w, &h);
+  mrb_get_args(
+    mrb, "dd", &texture, &cg_texture_type, &vector_4d, &cg_vector_4d_type);
   ptr = (std::shared_ptr<VK::Sprite>*)DATA_PTR(self);
   if(ptr) mrb_free(mrb, ptr);
   ptr = (std::shared_ptr<VK::Sprite>*)mrb_malloc(
     mrb, sizeof(std::shared_ptr<VK::Sprite>));
 
-  glm::vec4 rect{x, y, w, h};
   new(ptr)std::shared_ptr<VK::Sprite>(
-    std::make_shared<VK::Sprite>(*texture, rect));
+    std::make_shared<VK::Sprite>(*texture, *vector_4d->get()));
 
   mrb_data_init(self, ptr, &cg_sprite_type);
   return self;
@@ -56,13 +56,13 @@ static mrb_value
 cg_cSprite_draw(mrb_state *mrb, mrb_value self)
 {
   auto *ptr = (std::shared_ptr<VK::Sprite>*)DATA_PTR(self);
-  mrb_float x, y, w, h;
 
-  mrb_get_args(mrb, "ffff", &x, &y, &w, &h);
+  std::shared_ptr<glm::vec4> *position;
+
+  mrb_get_args(mrb, "d", &position, &cg_vector_4d_type);
   auto &positions = cg_core.vk_graphics_pipeline_2d->sprites_to_draw[
     cg_core.vk_renderer->current_frame][*ptr];
-  glm::vec4 position{x, y, w, h};
-  positions.push_back(position);
+  positions.push_back(*position->get());
 
   return self;
 }
@@ -76,6 +76,6 @@ cg_sprite_init(mrb_state *mrb)
   cg_cSprite = mrb_define_class_under(mrb, cg_m, "Sprite", mrb->object_class);
   MRB_SET_INSTANCE_TT(cg_cSprite, MRB_TT_DATA);
   mrb_define_method(
-    mrb, cg_cSprite, "initialize", cg_cSprite_initialize, MRB_ARGS_REQ(5));
-  mrb_define_method(mrb, cg_cSprite, "draw", cg_cSprite_draw, MRB_ARGS_REQ(4));
+    mrb, cg_cSprite, "initialize", cg_cSprite_initialize, MRB_ARGS_REQ(2));
+  mrb_define_method(mrb, cg_cSprite, "draw", cg_cSprite_draw, MRB_ARGS_REQ(1));
 }