first render

[nexus3d] / src / cgmath2 / cgmvec3.inl

diff --git a/src/cgmath2/cgmvec3.inl b/src/cgmath2/cgmvec3.inl
index d6a50f2..c6b6675 100644 (file)
--- a/src/cgmath2/cgmvec3.inl
+++ b/src/cgmath2/cgmvec3.inl
@@ -24,7 +24,7 @@ static CGM_INLINE cgm_vec3 cgm_vmul(cgm_vec3 a, cgm_vec3 b)
 
 static CGM_INLINE cgm_vec3 cgm_vscale(cgm_vec3 v, float s)
 {
-       return cgm_vcons(a.x * s, a.y * s, a.z * s);
+       return cgm_vcons(v.x * s, v.y * s, v.z * s);
 }
 
 
@@ -106,7 +106,7 @@ static CGM_INLINE float cgm_vdist_sq(cgm_vec3 a, cgm_vec3 b)
 }
 
 
-static CGM_INLINE cgm_vec3 cgm_normalize(cgm_vec3 v)
+static CGM_INLINE cgm_vec3 cgm_vnormalize(cgm_vec3 v)
 {
        cgm_vec3 res;
        float len = cgm_vlength(v);
@@ -149,7 +149,7 @@ static CGM_INLINE cgm_vec3 cgm_vrotate_quat(cgm_vec3 v, cgm_quat q)
 {
        cgm_quat vq, inv_q, tmp_q;
 
-       vq = cgm_qcons(v->x, v->y, v->z, 0.0f);
+       vq = cgm_qcons(v.x, v.y, v.z, 0.0f);
        inv_q = cgm_qinvert(q);
        tmp_q = cgm_qmul(q, vq);
        tmp_q = cgm_qmul(tmp_q, inv_q);
@@ -160,21 +160,21 @@ static CGM_INLINE cgm_vec3 cgm_vrotate_axis(cgm_vec3 v, int axis, float angle)
 {
        float m[16];
        cgm_mrotation_axis(m, axis, angle);
-       cgm_vmul_m3v3(v, m);
+       return cgm_vmul_m3v3(m, v);
 }
 
 static CGM_INLINE cgm_vec3 cgm_vrotate(cgm_vec3 v, float angle, float x, float y, float z)
 {
        float m[16];
        cgm_mrotation(m, angle, x, y, z);
-       cgm_vmul_m3v3(v, m);
+       return cgm_vmul_m3v3(m, v);
 }
 
 static CGM_INLINE cgm_vec3 cgm_vrotate_euler(cgm_vec3 v, float a, float b, float c, enum cgm_euler_mode mode)
 {
        float m[16];
        cgm_mrotation_euler(m, a, b, c, mode);
-       cgm_vmul_m3v3(v, m);
+       return cgm_vmul_m3v3(m, v);
 }