Merge branch 'Nezteb-master'

Author: boydm

c_src/matrix.c

@@ -22,7 +22,6 @@ static const float matrix_identity[16] = {
 
 #define   MATRIX_SIZE     (sizeof(float) * 16)
 
-
 //=============================================================================
 // utilities
 
@@ -205,8 +204,6 @@ void matrix_project_vector3(float mx[], float* x, float* y, float* z) {
   *z = mx_out[11];
 }
 
-
-
 //=============================================================================
 // Erlang NIF stuff from here down.
 
@@ -241,7 +238,6 @@ nif_close(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   }
 }
 
-
 //-----------------------------------------------------------------------------
 // add two matrices together. result is stored in a new matrix
 
@@ -304,7 +300,6 @@ nif_subtract(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   return result;
 }
 
-
 //-----------------------------------------------------------------------------
 // multiply two matrices together. result is stored in a new matrix
 
@@ -336,7 +331,6 @@ nif_multiply(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   return result;
 }
 
-
 //-----------------------------------------------------------------------------
 // multiply two matrices together. result is stored in a new matrix
 
@@ -449,8 +443,6 @@ nif_divide_scalar(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   return result;
 }
 
-
-
 //-----------------------------------------------------------------------------
 // calculate the scalar determinant
 
@@ -522,7 +514,6 @@ nif_adjugate(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   return result;
 }
 
-
 //-----------------------------------------------------------------------------
 // project a 2d vector by a matrix
 static ERL_NIF_TERM
@@ -592,79 +583,6 @@ nif_project_vector2s(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
   return result;
 }
 
-//-----------------------------------------------------------------------------
-// project a 2d vector by a matrix
-// static ERL_NIF_TERM
-// nif_project_vector3(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
-//   ErlNifBinary      mx_term;
-//   float *           mx;
-//   float             x, y, z;
-
-//   // get the a matrix
-//   if ( !enif_inspect_binary(env, argv[0], &mx_term) )    {return enif_make_badarg(env);}
-//   if ( mx_term.size != MATRIX_SIZE )                     {return enif_make_badarg(env);}
-//   mx = (float*) mx_term.data;
-
-//   // get the x, y, z of the vector
-//   if ( !get_float_num(env, argv[1], &x) )            {return enif_make_badarg(env);}
-//   if ( !get_float_num(env, argv[2], &y) )            {return enif_make_badarg(env);}
-//   if ( !get_float_num(env, argv[3], &z) )            {return enif_make_badarg(env);}
-
-//   // project the vector
-//   matrix_project_vector3( mx, &x, &y, &z );
-
-//   // return the result
-//   return enif_make_tuple3(
-//     env,
-//     enif_make_double(env, x),
-//     enif_make_double(env, y),
-//     enif_make_double(env, z)
-//   );
-// }
-
-//-----------------------------------------------------------------------------
-// project a packed 2d vector binary by a matrix
-// typedef struct { float x; float y; float z; } vector3_f;
-// static ERL_NIF_TERM
-// nif_project_vector3s(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
-//   ERL_NIF_TERM      result;
-//   ErlNifBinary      mx_term;
-//   ErlNifBinary      v_in_term;
-//   float *           mx;
-//   int               vector_count;
-//   vector3_f*        v_in;
-//   vector3_f*        v_out;
-//   float             x, y, z;
-
-//   // get the matrix
-//   if ( !enif_inspect_binary(env, argv[0], &mx_term) )    {return enif_make_badarg(env);}
-//   if ( mx_term.size != MATRIX_SIZE )                     {return enif_make_badarg(env);}
-//   mx = (float*) mx_term.data;
-
-//   // get the vectors
-//   if ( !enif_inspect_binary(env, argv[1], &v_in_term) )  {return enif_make_badarg(env);}
-//   if ( (v_in_term.size % (sizeof(float)*3)) != 0 )       {return enif_make_badarg(env);}
-//   vector_count = v_in_term.size / (sizeof(float)*3);
-//   v_in = (vector3_f*)v_in_term.data;
-
-//   // allocate the outgoing vector binary
-//   v_out = (vector3_f*)enif_make_new_binary(env, v_in_term.size, &result);
-
-//   // fill in the answers
-//   for ( int i = 0; i < vector_count; i++ ) {
-//     x = v_in[i].x;
-//     y = v_in[i].y;
-//     z = v_in[i].z;
-//     matrix_project_vector3( mx, &x, &y, &z );
-//     v_out[i].x = x;
-//     v_out[i].y = y;
-//     v_out[i].z = z;
-//   }
-
-//   // return the resulting binary
-//   return result;
-// }
-
 //=============================================================================
 // erl housekeeping. This is the list of functions available to the erl side