wip

leonmavr · Jul 12, 2023 · 6213866 · 6213866
1 parent 7a7918d
commit 6213866
Showing 1 changed file with 78 additions and 56 deletions.
diff --git a/demos/06_moving_in_world.c b/demos/06_moving_in_world.c
@@ -1,6 +1,7 @@
 #include "objects.h"
 #include "renderer.h"
 #include "arg_parser.h" // CFG_DIR
+#include "utils.h" // CFG_DIR
 #include <math.h> // sin, cos
 #include <unistd.h> // for usleep
 #include <stdbool.h> // bool
@@ -24,15 +25,14 @@ struct termios old_terminal_settings;
 struct termios new_terminal_settings;
 
 mesh_t** obj;
-size_t n_objects;
 
 /* Callback that clears the screen and makes the cursor visible when the user hits Ctr+C */
 static void interrupt_handler(int int_num) {
-	// restore the terminal settings to their prvious state
-	if (tcsetattr(0, TCSANOW, &old_terminal_settings) < 0)
-		perror("tcsetattr ICANON");
-	for (int i = 0; i < 5; ++i)
-		obj_mesh_free(obj[i]);
+    // restore the terminal settings to their prvious state
+    if (tcsetattr(0, TCSANOW, &old_terminal_settings) < 0)
+        perror("tcsetattr ICANON");
+    for (int i = 0; i < 5; ++i)
+        obj_mesh_free(obj[i]);
     if (int_num == SIGINT) {
         render_end();
         exit(SIGINT);
@@ -55,17 +55,21 @@ static int is_key_pressed(void)
 }
 
 static void set_terminal() {
-	// Get the current terminal settings
-	if (tcgetattr(0, &old_terminal_settings) < 0)
-		perror("tcgetattr()");
-	memcpy(&new_terminal_settings, &old_terminal_settings, sizeof(struct termios));
-	// disable canonical mode processing in the line discipline driver,
-	// disable echoing chracters
-	new_terminal_settings.c_lflag &= ~ICANON;
-	new_terminal_settings.c_lflag &= ~ECHO;
-	// apply our new settings
-	if (tcsetattr(0, TCSANOW, &new_terminal_settings) < 0)
-		perror("tcsetattr ICANON");
+    // Get the current terminal settings
+    if (tcgetattr(0, &old_terminal_settings) < 0)
+        perror("tcgetattr()");
+    memcpy(&new_terminal_settings, &old_terminal_settings, sizeof(struct termios));
+    // disable canonical mode processing in the line discipline driver,
+    // disable echoing chracters
+    new_terminal_settings.c_lflag &= ~ICANON;
+    new_terminal_settings.c_lflag &= ~ECHO;
+    // apply our new settings
+    if (tcsetattr(0, TCSANOW, &new_terminal_settings) < 0)
+        perror("tcsetattr ICANON");
+}
+
+static int sign(int x) {
+    return (x >= 0) - (x < 0);
 }
 
 int main(int argc, char** argv) {
@@ -77,7 +81,6 @@ int main(int argc, char** argv) {
     // make sure we end gracefully if the user hits Ctr+C
     signal(SIGINT, interrupt_handler);
 
-	obj = malloc(sizeof(mesh_t*) * 5);
     // path to directory where meshes are stored - stored in CFG_DIR prep. constant
     const char* mesh_dir = STRINGIFY(CFG_DIR);
     // select file from mesh directory
@@ -88,7 +91,7 @@ int main(int argc, char** argv) {
     assert(access(cube_filepath, F_OK) == 0);
     assert(access(coffin_filepath, F_OK) == 0);
 
-	set_terminal();
+    set_terminal();
 /**
  *                  *                  V: viewer
  *                  __                 C: coffin
@@ -114,55 +117,74 @@ int main(int argc, char** argv) {
     // create 1 coffin and 4 cubes at 12, 3, 6 and 9 o' clock
     int coffinx = 0, coffiny = 0, coffinz = 900;
     unsigned dist = 120;
-    int cubex = coffinx + dist, cubey = coffiny;
+    obj = malloc(sizeof(mesh_t*) * 5);
     // coffin
     obj[0] = obj_mesh_from_file(coffin_filepath, coffinx, coffiny+50, coffinz, w, 1.3*h, 0.8*d);
-    // 3 o'clock cube
-    obj[1] = obj_mesh_from_file(cube_filepath, dist, 0, coffinz, w, h, d);
-    // 9 o'clock cube
-    obj[2] = obj_mesh_from_file(cube_filepath, 0, 0, coffinz+200, w, h, d);
-    // 12 o'clock cube
-    obj[3] = obj_mesh_from_file(cube_filepath, -dist, 0, coffinz, w, h, d);
-    // 6 o'clock cube
-    obj[4] = obj_mesh_from_file(cube_filepath, 0, cubey-30, coffinz-200, w, h, d);
+    // cubes at 3, 6, 9, 12 o'clock cubes
+    obj[1] = obj_mesh_from_file(cube_filepath, dist,  0, coffinz,     w, h, d);
+    obj[2] = obj_mesh_from_file(cube_filepath, 0,     0, coffinz+200, w, h, d);
+    obj[3] = obj_mesh_from_file(cube_filepath, -dist, 0, coffinz,     w, h, d);
+    obj[4] = obj_mesh_from_file(cube_filepath, 0,     0, coffinz-200, w, h, d);
 
-    render_use_perspective(0, 0, focal_length);
     // do the actual rendering
+    render_use_perspective(0, 0, focal_length);
     render_init();
+
+    unsigned rad = 2*dist;
+    int sign_x = 1, sign_y = 1;
     for (size_t t = 0; t < UINT_MAX; ++t) {
-		// Check if a key is pressed.  If it is, call getchar to fetch it.
-		int dx = 0, dy = 0, dz = 0;
-		if (is_key_pressed())
-		{
-			char ch = getchar();
-			if (ch == 'a')
-				dx = 10;
-			else if (ch == 's')
-				dz = 10;
-			else if (ch == 'd')
-				dx = -10;
-			else if (ch == 'w')
-				dz = -10;
-		}
-
-		for (int i = 0; i < 5; ++i)
-			obj_mesh_translate_by(obj[i], dx, dy, dz);
-		for (int i = 0; i < 5; ++i) {
-			if (obj[i]->center->x != 0)
-				obj_mesh_rotate_to(obj[i], atan(obj[i]->center->y/obj[i]->center->x), 0, 0);
-		}
-
-        //obj_mesh_rotate_to(obj1, 0.0/10*t, 0*t, 0.0/15*t);
-		for (int i = 0; i < 5; ++i)
-			render_write_shape(obj[i]);
+        int dx[4] = {0}, dy[4] = {0}, dz[4] = {0};
+        // Check if a key is pressed.  If it is, call getchar to fetch it.
+        if (is_key_pressed()) {
+            char ch = getchar();
+            if (ch == 'a')
+                dx[0] += 10;
+            else if (ch == 's')
+                dz[0] += 10;
+            else if (ch == 'd')
+                dx[0] -= 10;
+            else if (ch == 'w')
+                dz[0] -= 10;
+        }
+
+			sign_x = (t % rad == 0) ? -sign_x: sign_x;
+			sign_y = ((t + rad/2) % rad == 0) ? -sign_y: sign_y;
+
+			dx[0] += sign_x;
+			//dz += -sign(obj[i]->center->z - coffinz)*sign_y;
+			dz[0] += sign_y;
+			// 1st cube at 1st quarter
+			if (dx[0] > 0 && dz[0] > 0) {
+				dx[1] = dx[0];
+				dz[1] = -dz[0];
+				dx[2] = -dx[0];
+				dz[2] = -dz[0];
+				dx[3] = -dx[0];
+				dz[3] = dz[0];
+			// 1st cube at 2nd quarter
+			} else if (dx[0] > 0 && dz[0] < 0) {
+				//dx[1] = dx[0];
+				//dz[1] = -dz[0];
+			}
+			obj_mesh_translate_by(obj[1], dx[0], dy[0], dz[0]);
+			if ((obj[1]->center->x <= coffinx) && (obj[1]->center->z <= coffinz + rad))
+				printf("dz = %d, z = %d/%d\n", dz[0], obj[1]->center->z, coffinz);
+        for (int i = 0; i < 5; ++i) {
+            if (obj[i]->center->x != 0)
+                obj_mesh_rotate_to(obj[i], atan(obj[i]->center->y/obj[i]->center->x), 0, 0);
+        }
+
+        obj_mesh_rotate_to(obj[1], 1.0/10*t, 0*t, 1.0/15*t);
+        for (int i = 0; i < 5; ++i)
+            render_write_shape(obj[i]);
         render_flush();
 #ifndef _WIN32
         // nanosleep does not work on Windows
         nanosleep((const struct timespec[]) {{0, (int)(1.0 / 60 * 1e9)}}, NULL);
 #endif
     }
-	for (int i = 0; i < 5; ++i)
-		obj_mesh_free(obj[i]);
+    for (int i = 0; i < 5; ++i)
+        obj_mesh_free(obj[i]);
 
     render_end();
 }