Implementing rendering

4 files changed, 45 insertions, 28 deletions

diff --git a/src/gui/button.c b/src/gui/button.c
index 03addf8..a55796d 100644
--- a/src/gui/button.c
+++ b/src/gui/button.c
@@ -7,8 +7,6 @@
 #include <gui/component.h>
 
 bool button_is_selected(int x, int y, Button *button) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(button != NULL);
   int x1 = button->component.x_pos;
   int y1 = button->component.y_pos;
@@ -28,8 +26,6 @@ void button_print(Component *parameterSelf) {
 }
 
 void button_click_test(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -37,8 +33,6 @@ void button_click_test(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_add_constraint(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -47,8 +41,6 @@ void button_click_add_constraint(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_show_hide(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self)) {
@@ -61,8 +53,6 @@ void button_click_show_hide(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_exit(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -71,8 +61,6 @@ void button_click_exit(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_less_frame(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -85,8 +73,6 @@ void button_click_less_frame(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_more_frame(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -99,8 +85,6 @@ void button_click_more_frame(int x, int y, Component *parameterSelf) {
 }
 
 void button_click_rendering(int x,int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -109,8 +93,6 @@ void button_click_rendering(int x,int y, Component *parameterSelf) {
 }
 
 void button_click_none(int x, int y, Component *parameterSelf) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(parameterSelf != NULL);
 }
 
diff --git a/src/gui/gui.c b/src/gui/gui.c
new file mode 100644
index 0000000..2a3d018
--- /dev/null
+++ b/src/gui/gui.c
@@ -0,0 +1,4 @@
+//
+// Created by adam on 01/01/18.
+//
+
diff --git a/src/gui/pictureframe.c b/src/gui/pictureframe.c
index 4126f59..a6a94bf 100644
--- a/src/gui/pictureframe.c
+++ b/src/gui/pictureframe.c
@@ -17,7 +17,7 @@ void pictureframe_draw_canvas(PictureFrame *pictureFrame){
 void pictureframe_print(Component *parameterSelf) {
   PictureFrame *self = (PictureFrame *) parameterSelf;
   pictureframe_draw_canvas(self);
-  if (mode != WAITING_BUTTON_HIDE) {
+  if (mode != WAITING_BUTTON_HIDE && mode != RENDERING) {
     TriangleMap *p = self->morphing->first;
     CartesianVector p1;
     CartesianVector p2;
@@ -30,9 +30,9 @@ void pictureframe_print(Component *parameterSelf) {
       p2 = self->cartesianMappingDivision(&(p->vertices[1]));
       p3 = self->cartesianMappingDivision(&(p->vertices[2]));
 
-      pointToPrint1 = pictureframe_conversion_to_picture(p1.x, p1.y, self);
-      pointToPrint2 = pictureframe_conversion_to_picture(p2.x, p2.y, self);
-      pointToPrint3 = pictureframe_conversion_to_picture(p3.x, p3.y, self);
+      pointToPrint1 = pictureframe_conversion_to_origin(p1.x, p1.y, self);
+      pointToPrint2 = pictureframe_conversion_to_origin(p2.x, p2.y, self);
+      pointToPrint3 = pictureframe_conversion_to_origin(p3.x, p3.y, self);
 
       MLV_draw_filled_circle(pointToPrint1.x, pointToPrint1.y, 2, MLV_COLOR_RED);
       MLV_draw_filled_circle(pointToPrint2.x, pointToPrint2.y, 2, MLV_COLOR_RED);
@@ -47,8 +47,6 @@ void pictureframe_print(Component *parameterSelf) {
 }
 
 bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame) {
-  assert(x >= 0);
-  assert(y >= 0);
   assert(pictureFrame != NULL);
   int x1 = pictureFrame->component.x_pos;
   int y1 = pictureFrame->component.y_pos;
@@ -60,14 +58,14 @@ bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame) {
   return false;
 }
 
-CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame) {
+CartesianVector pictureframe_conversion_to_pic(int x, int y, PictureFrame *pictureFrame) {
   CartesianVector vector;
   vector.x = x - pictureFrame->component.x_pos;
   vector.y = y - pictureFrame->component.y_pos;
   return vector;
 }
 
-CartesianVector pictureframe_conversion_to_picture(int x, int y, PictureFrame *pictureFrame) {
+CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame) {
   CartesianVector vector;
   vector.x = x + pictureFrame->component.x_pos;
   vector.y = y + pictureFrame->component.y_pos;
@@ -77,7 +75,7 @@ CartesianVector pictureframe_conversion_to_picture(int x, int y, PictureFrame *p
 void pictureframe_click_handler_origin(int x_pos, int y_pos, Component *parameterSelf) {
   PictureFrame *self = (PictureFrame *) parameterSelf;
   if (pictureframe_is_selected(x_pos, y_pos, self) && mode == INSERT_ORIGIN) {
-    CartesianVector vector = pictureframe_conversion_to_origin(x_pos, y_pos, self);
+    CartesianVector vector = pictureframe_conversion_to_pic(x_pos, y_pos, self);
     MLV_draw_filled_circle(x_pos, y_pos, 2, MLV_COLOR_BLUE);
     savedPoint = vector;
     MLV_actualise_window();
@@ -88,7 +86,7 @@ void pictureframe_click_handler_origin(int x_pos, int y_pos, Component *paramete
 void pictureframe_click_handler_target(int x_pos, int y_pos, Component *parameterSelf) {
   PictureFrame *self = (PictureFrame *) parameterSelf;
   if (pictureframe_is_selected(x_pos, y_pos, self) && mode == INSERT_TARGET) {
-    CartesianVector vector = pictureframe_conversion_to_origin(x_pos, y_pos, self);
+    CartesianVector vector = pictureframe_conversion_to_pic(x_pos, y_pos, self);
     morphing_add_constraint(self->morphing, savedPoint, vector);
     mode = PRINTING;
   }
diff --git a/src/gui/window.c b/src/gui/window.c
index 6e287e5..32aeb26 100644
--- a/src/gui/window.c
+++ b/src/gui/window.c
@@ -3,6 +3,10 @@
 #include <gui/button.h>
 #include <gui/pictureframe.h>
 #include <gui/group.h>
+#include <MLV/MLV_keyboard.h>
+#include <MLV/MLV_all.h>
+#include <caca_conio.h>
+#include <painter/rasterizer.h>
 #include "common/mem.h"
 #include "string.h"
 #include "assert.h"
@@ -57,4 +61,33 @@ void window_print_pictureframes(Window *window) {
   assert(window != NULL);
   window->group_pictureframe->component.print_method(&(window->group_pictureframe->component));
   MLV_actualise_window();
+}
+
+void window_wait_keyboard_or_mouse(MLV_Keyboard_button *keyboardButton, MLV_Keyboard_modifier *keyboardModifier,
+                                   int *unicode, int *mouse_x, int *mouse_y) {
+  *mouse_x = -1;
+  *mouse_y = -1;
+  *keyboardButton = MLV_KEYBOARD_NONE;
+  MLV_wait_keyboard_or_mouse(keyboardButton, keyboardModifier, unicode, mouse_x, mouse_y);
+}
+
+void window_click_keyboard_handler(Window *window, MLV_Keyboard_button *keyboardButton,
+                                   MLV_Keyboard_modifier *keyboardModifier,
+                                   int *unicode, int *mouse_x, int *mouse_y) {
+  window_wait_keyboard_or_mouse(keyboardButton,keyboardModifier,unicode,mouse_x,mouse_y);
+  group_click_handler(*mouse_x, *mouse_y, &(window->group_buttons->component));
+  group_click_handler(*mouse_x, *mouse_y, &(window->group_pictureframe->component));
+}
+
+void window_rendering(Window *window,PictureFrame *pictureFrame1,Canvas *canvasSrc, Canvas *canvasTarget, Morphing *morphing){