Bug fixes in vec3_is_null

ravi688 · Jan 28, 2022 · 9016081 · 9016081
1 parent 7b6a4d3
commit 9016081
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/include/hpml/vec3/template_definitions.h b/include/hpml/vec3/template_definitions.h
@@ -399,7 +399,7 @@ vec3_t(T) vec3_null(T)()\
 #define instantiate_implementation_vec3_is_null(T)\
 bool vec3_is_null(T)(vec3_t(T) v)\
 {\
-	return (v.x == 0) || (v.y == 0) || (v.z == 0);\
+	return (v.x == 0) && (v.y == 0) && (v.z == 0);\
 }
 
 /* vec3_add: Adds two vector3 vectors component wise, i.e. v1 + v2

diff --git a/include/hpml/vec4/template_definitions.h b/include/hpml/vec4/template_definitions.h
@@ -15,6 +15,7 @@
 #include <hpml/defines.h>
 
 #include <stdarg.h>
+#include <stdbool.h>
 
 /*DATA*/
 /*vec4_t(T) struct*/
@@ -354,6 +355,14 @@ EXCEPTION_BLOCK\
 	return v;\
 }
 
+/*MISC*/
+#define vec4_is_null(T) template(vec4_is_null, T)
+#define instantiate_declaration_vec4_is_null(T) bool vec4_is_null(T)(vec4_t(T) v)
+#define instantiate_implementation_vec4_is_null(T) bool vec4_is_null(T)(vec4_t(T) v)\
+{\
+	return (v.x == 0) && (v.y == 0) && (v.z == 0) && (v.w == 0);\
+}
+
 /*DEBUGGING*/
 
 /*vec4_print*/

diff --git a/include/hpml/vec4/template_instantiations.h b/include/hpml/vec4/template_instantiations.h
@@ -25,6 +25,7 @@ instantiate_declaration_vec4_left(int);
 instantiate_declaration_vec4_right(int);
 instantiate_declaration_vec4_forward(int);
 instantiate_declaration_vec4_back(int);
+instantiate_declaration_vec4_is_null(int);
 
 instantiate_declaration_vec4_print(int);
 instantiate_declaration_vec4_normalize(int);
@@ -40,7 +41,7 @@ instantiate_declaration_vec4_axis_rotate(int);
 instantiate_declaration_vec4_box(int);
 instantiate_declaration_vec4_project(int);
 instantiate_declaration_vec4_unit_project(int);
-
+instantiate_declaration_vec4_is_null(int);
 
 instantiate_vec4_struct(float);
 instantiate_declaration_vec4(float);
@@ -59,6 +60,7 @@ instantiate_declaration_vec4_left(float);
 instantiate_declaration_vec4_right(float);
 instantiate_declaration_vec4_forward(float);
 instantiate_declaration_vec4_back(float);
+instantiate_declaration_vec4_is_null(float);
 
 instantiate_declaration_vec4_print(float);
 instantiate_declaration_vec4_normalize(float);
@@ -92,6 +94,7 @@ instantiate_implementation_vec4_left(int);
 instantiate_implementation_vec4_right(int);
 instantiate_implementation_vec4_forward(int);
 instantiate_implementation_vec4_back(int);
+instantiate_implementation_vec4_is_null(int);
 
 void vec4_print(int)(vec4_t(int) v) { printf("vec4_t(int): { %d, %d, %d, %d }\n", v.x, v.y, v.z, v.w); }
 instantiate_implementation_vec4_normalize(int);
@@ -108,7 +111,6 @@ instantiate_implementation_vec4_box(int);
 instantiate_implementation_vec4_project(int);
 instantiate_implementation_vec4_unit_project(int);
 
-
 instantiate_implementation_vec4(float);
 instantiate_implementation_vec4_zero(float);
 instantiate_implementation_vec4_add(float);
@@ -125,6 +127,7 @@ instantiate_implementation_vec4_left(float);
 instantiate_implementation_vec4_right(float);
 instantiate_implementation_vec4_forward(float);
 instantiate_implementation_vec4_back(float);
+instantiate_implementation_vec4_is_null(float);
 
 void vec4_print(float)(vec4_t(float) v) { printf("vec4_t(float): { %f, %f, %f, %f }\n", v.x, v.y, v.z, v.w); }
 instantiate_implementation_vec4_normalize(float);