summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/rodeo/math/vec3.h2
-rw-r--r--src/math/rodeo_vec2.c2
-rw-r--r--src/math/rodeo_vec3.c10
3 files changed, 8 insertions, 6 deletions
diff --git a/include/rodeo/math/vec3.h b/include/rodeo/math/vec3.h
index 1b9cd31..990a251 100644
--- a/include/rodeo/math/vec3.h
+++ b/include/rodeo/math/vec3.h
@@ -13,7 +13,7 @@ rodeo_math_vec3_one(void);
float
rodeo_math_vec3_dot(rodeo_math_vec3_t a, rodeo_math_vec3_t b);
-float
+rodeo_math_vec3_t
rodeo_math_vec3_cross(rodeo_math_vec3_t a, rodeo_math_vec3_t b);
rodeo_math_vec3_t
diff --git a/src/math/rodeo_vec2.c b/src/math/rodeo_vec2.c
index be9d7ff..415f785 100644
--- a/src/math/rodeo_vec2.c
+++ b/src/math/rodeo_vec2.c
@@ -50,7 +50,7 @@ rodeo_math_vec2_dot(rodeo_math_vec2_t a, rodeo_math_vec2_t b)
float
rodeo_math_vec2_cross(rodeo_math_vec2_t a, rodeo_math_vec2_t b)
{
- return glms_vec2_dot(
+ return glms_vec2_cross(
irodeo_math_rodeoVec2_to_cglmVec2(a),
irodeo_math_rodeoVec2_to_cglmVec2(b)
);
diff --git a/src/math/rodeo_vec3.c b/src/math/rodeo_vec3.c
index c94ecd3..f51cc95 100644
--- a/src/math/rodeo_vec3.c
+++ b/src/math/rodeo_vec3.c
@@ -48,12 +48,14 @@ rodeo_math_vec3_dot(rodeo_math_vec3_t a, rodeo_math_vec3_t b)
);
}
-float
+rodeo_math_vec3_t
rodeo_math_vec3_cross(rodeo_math_vec3_t a, rodeo_math_vec3_t b)
{
- return glms_vec3_dot(
- irodeo_math_rodeoVec3_to_cglmVec3(a),
- irodeo_math_rodeoVec3_to_cglmVec3(b)
+ return irodeo_math_cglmVec3_to_rodeoVec3(
+ glms_vec3_cross(
+ irodeo_math_rodeoVec3_to_cglmVec3(a),
+ irodeo_math_rodeoVec3_to_cglmVec3(b)
+ )
);
}