From c2adfc2bda610723869360238e7dc5af5932acf6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 17 Oct 2024 11:30:36 -0600 Subject: [PATCH] aiuda --- src/data/cube.h | 50 +++++++----------------- src/main.c | 29 ++++++++++++++ status | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 35 deletions(-) create mode 100644 status diff --git a/src/data/cube.h b/src/data/cube.h index 87ac586..234b58e 100644 --- a/src/data/cube.h +++ b/src/data/cube.h @@ -9,20 +9,6 @@ #define G 1, 1,-1, #define H 1, 1, 1, -vec3 calc_normal(vec3 v1, vec3 v2, vec3 v3) -{ - vec3 lado1, lado2, normal; - - glm_vec3_sub(v2, v1, lado1); - glm_vec3_sub(v3, v1, lado2); - - glm_vec3_cross(lado1, lado2, normal); - - glm_vec3_normalize(normal); - - return normal; -} - narray_float_t d_cube = { 3*3*2*6, @@ -47,31 +33,25 @@ narray_float_t d_cube = }; -narray_float_t n_cube = { +narray_float_t d_cube = +{ 3 * 3 * 2 * 6, + + A C E + C E G - - calc_normal(A, C, E), - calc_normal(A, C, E), - calc_normal(A, C, E), + E G F + G F H - calc_normal(E, G, F), - calc_normal(E, G, F), - calc_normal(E, G, F), + F H B + H B D - calc_normal(A, B, F), - calc_normal(A, B, F), - calc_normal(A, B, F), + B D A + D A C - calc_normal(C, D, G), - calc_normal(C, D, G), - calc_normal(C, D, G), + C D G + D G H - calc_normal(D, H, G), - calc_normal(D, H, G), - calc_normal(D, H, G), - - calc_normal(A, B, E), - calc_normal(A, B, E), - calc_normal(A, B, E), + A B E + B E F }; \ No newline at end of file diff --git a/src/main.c b/src/main.c index 927b0f4..d0d8c4b 100644 --- a/src/main.c +++ b/src/main.c @@ -16,6 +16,23 @@ unsigned char palette[] = 0x7A,0x1C,0xAC,0xff, }; +void calc_normal(float* v1, float* v2, float* v3, float* norm_vec) +{ + vec3 lado1, lado2, normal; + + glm_vec3_sub(v2, v1, lado1); + glm_vec3_sub(v3, v1, lado2); + + glm_vec3_cross(lado1, lado2, normal); + glm_vec3_normalize(normal); + + //para menos p2, ahora lo guarda en norm_vec + norm_vec[0] = normal[0]; + norm_vec[1] = normal[1]; + norm_vec[2] = normal[2]; +} + + const char * wname = "manigraph: manifold grapher"; int main( void ) @@ -32,6 +49,18 @@ int main( void ) glewInit(); + //nostoy seguro de como escribir esto en cube.h, pero supongo que lo que me decias era así. + for (int i = 0; i < 3 * 3 * 2 * 6; i += 9) { + float* v1 = &d_cube[i]; + float* v2 = &d_cube[i + 3]; + float* v3 = &d_cube[i + 6]; + float norm_vec[3]; + calc_normal(v1, v2, v3, norm_vec); + n_cube[i] = norm_vec[0]; + n_cube[i + 1] = norm_vec[1]; + n_cube[i + 2] = norm_vec[2]; + } + if( !( shader = create_shader() ) ) goto error_shader; diff --git a/status b/status new file mode 100644 index 0000000..9686b60 --- /dev/null +++ b/status @@ -0,0 +1,102 @@ +commit 252aab3dd289cdd7cc5f4fe0edb31654e687ec22 (HEAD -> roberto, origin/roberto, origin/main, origin/HEAD, main) +Author: PedroEdiaz +Date: Wed Oct 9 20:45:05 2024 -0600 + + Merge: crisel -> main + +commit e25f509ce112050b265f8740998ce30f5e702dba +Merge: 1997801 a650807 +Author: PedroEdiaz +Date: Wed Oct 9 20:41:43 2024 -0600 + + Merge: issue-01 -> main + +commit 1997801f88c7581849cc52f2b71b3257165fd95b +Author: PedroEdiaz +Date: Fri Oct 4 00:37:52 2024 -0600 + + Merge: doc -> main + +commit d22daff16d9bd7d85cfaeca14f2500bd8686d44c +Author: PedroEdiaz +Date: Wed Oct 2 13:10:08 2024 -0600 + + Merge: doc -> main + +commit a650807b94b69ce45666ed19d57fcbf806ad7d46 +Author: PedroEdiaz +Date: Sun Sep 29 16:08:18 2024 -0600 + + ISSUE #1: Normalize quaternion to avoid deformation + +commit 6c3b268a6598aab4e69201073206b37cd0b823ed +Author: PedroEdiaz +Date: Thu Sep 19 10:37:00 2024 +0600 + + First doc update + +commit 3c9690a2a7db196b851ff64edbe414f18a94d9da +Author: PedroEdiaz +Date: Thu Sep 19 10:15:25 2024 +0600 + + doc/: definir como funcionan los archivos + +commit 86ad43c2dc507b5257685c847683a23420eaf752 +Author: PedroEdiaz +Date: Thu Sep 19 08:58:36 2024 +0600 + + nlroff -> markdown + +commit cb525a1f2033e512aa55af3cd5036b5ee18bc976 +Author: PedroEdiaz +Date: Tue Sep 17 22:05:34 2024 +0000 + + nulldoc -> nlroff + +commit 98b0d7888072bb9beafb4910ec00b86fde18ad87 +Author: PedroEdiaz +Date: Tue Sep 17 22:04:25 2024 +0000 + + Make doc directory + +commit 25e08fc4062a5735e231dc617a70494556a184d7 +Author: PedroEdiaz +Date: Mon Sep 16 23:50:50 2024 +0600 + + Add documentation build + +commit 15dc499cd9233c28778cffc925d9d045f2e39302 +Author: PedroEdiaz +Date: Fri Sep 13 01:23:57 2024 +0600 + + Add src/input.c + +commit 6161d310bcb50a13e9cb853045cbe2da2b0a1957 +Author: PedroEdiaz +Date: Fri Sep 6 05:08:07 2024 +0600 + + 0.3 Rotate axis + +commit 0f387f8a71fd504bc5d08bdae850af6a0c8cba6e +Author: PedroEdiaz +Date: Thu Sep 5 15:05:33 2024 +0000 + + 0.2 Clean up + +commit 06e8e9074b8a55a7854045fcb5cea9e5e1f6018d +Author: PedroEdiaz +Date: Thu Sep 5 14:48:51 2024 +0000 + + 0.2 Draw axis + +commit a2f49afbf412dd4ee39c57438363cb0c1a8d12cd +Author: PedroEdiaz +Date: Thu Sep 5 11:31:50 2024 +0000 + + 0.1 Add external dependecies + +commit cce685d90c3c4abaa6effe291def4d2c42bb6db2 +Author: PedroEdiaz +Date: Wed Sep 4 22:35:31 2024 +0000 + + 0.1 Graph cube