aiuda

2024-10-17 11:30:36 -06:00
parent 29ab40e33d
commit c2adfc2bda
3 changed files with 146 additions and 35 deletions
--- 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
 };
--- 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;

--- a/102
+++ b/102
@@ -0,0 +1,102 @@
+[33mcommit 252aab3dd289cdd7cc5f4fe0edb31654e687ec22[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mroberto[m[33m, [m[1;31morigin/roberto[m[33m, [m[1;31morigin/main[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmain[m[33m)[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Wed Oct 9 20:45:05 2024 -0600
+
+    Merge: crisel -> main
+
+[33mcommit e25f509ce112050b265f8740998ce30f5e702dba[m
+Merge: 1997801 a650807
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Wed Oct 9 20:41:43 2024 -0600
+
+    Merge: issue-01 -> main
+
+[33mcommit 1997801f88c7581849cc52f2b71b3257165fd95b[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Fri Oct 4 00:37:52 2024 -0600
+
+    Merge: doc -> main
+
+[33mcommit d22daff16d9bd7d85cfaeca14f2500bd8686d44c[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Wed Oct 2 13:10:08 2024 -0600
+
+    Merge: doc -> main
+
+[33mcommit a650807b94b69ce45666ed19d57fcbf806ad7d46[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Sun Sep 29 16:08:18 2024 -0600
+
+    ISSUE #1: Normalize quaternion to avoid deformation
+
+[33mcommit 6c3b268a6598aab4e69201073206b37cd0b823ed[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 19 10:37:00 2024 +0600
+
+    First doc update
+
+[33mcommit 3c9690a2a7db196b851ff64edbe414f18a94d9da[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 19 10:15:25 2024 +0600
+
+    doc/: definir como funcionan los archivos
+
+[33mcommit 86ad43c2dc507b5257685c847683a23420eaf752[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 19 08:58:36 2024 +0600
+
+    nlroff -> markdown
+
+[33mcommit cb525a1f2033e512aa55af3cd5036b5ee18bc976[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Tue Sep 17 22:05:34 2024 +0000
+
+    nulldoc -> nlroff
+
+[33mcommit 98b0d7888072bb9beafb4910ec00b86fde18ad87[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Tue Sep 17 22:04:25 2024 +0000
+
+    Make doc directory
+
+[33mcommit 25e08fc4062a5735e231dc617a70494556a184d7[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Mon Sep 16 23:50:50 2024 +0600
+
+    Add documentation build
+
+[33mcommit 15dc499cd9233c28778cffc925d9d045f2e39302[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Fri Sep 13 01:23:57 2024 +0600
+
+    Add src/input.c
+
+[33mcommit 6161d310bcb50a13e9cb853045cbe2da2b0a1957[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Fri Sep 6 05:08:07 2024 +0600
+
+    0.3 Rotate axis
+
+[33mcommit 0f387f8a71fd504bc5d08bdae850af6a0c8cba6e[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 5 15:05:33 2024 +0000
+
+    0.2 Clean up
+
+[33mcommit 06e8e9074b8a55a7854045fcb5cea9e5e1f6018d[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 5 14:48:51 2024 +0000
+
+    0.2 Draw axis
+
+[33mcommit a2f49afbf412dd4ee39c57438363cb0c1a8d12cd[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Thu Sep 5 11:31:50 2024 +0000
+
+    0.1 Add external dependecies
+
+[33mcommit cce685d90c3c4abaa6effe291def4d2c42bb6db2[m
+Author: PedroEdiaz <ppedroediaz@gmail.com>
+Date:   Wed Sep 4 22:35:31 2024 +0000
+
+    0.1 Graph cube