final edits, expanded the matrix class slightly and removed extrenuous operations from gl_spider.

Pavel Govyadinov
1 parent 8e56a0a7
Showing 2 changed files with 13 additions and 20 deletions Show diff stats
stim/gl/gl_spider.h
stim/math/matrix.h
@@ -435,7 +435,7 @@ class gl_spider
  
 			float curTrans[16];
 			glGetFloatv(GL_TEXTURE_MATRIX, curTrans);
-			fillTransform(curTrans);
+			cT.set(curTrans);
 			printTransform();
  
 			CHECK_OPENGL_ERROR
@@ -669,19 +669,6 @@ class gl_spider
 			}
 			return out;
 		}
-		///Function that fills the transform data from GL output to a matrix format.
-		///@param mat, a 16 value matrix representing the transformation in row order.
-		void
-		fillTransform(float mat[16])
-		{
-			for(int r = 0; r < 4; r++){
-				for(int c = 0; c < 4; c++){
-					cT(r,c) = mat[c*4+r];
-				}
-			}
-		//	cT.setMatrix(mat);
-
-		}
  
 		///Function to get back the framebuffer Object attached to the spider.
 		///For external access.
@@ -25,11 +25,17 @@ struct matrix
 					(*this)(r, c) = 0;
 	}
  
-	CUDA_CALLABLE matrix<T,N> setMatrix(T rhs[])
+	CUDA_CALLABLE matrix(T rhs[N*N])
 	{
-		M = rhs;
+		memcpy(M,rhs, sizeof(T)*N*N);
+	}
+
+	CUDA_CALLABLE matrix<T,N> set(T rhs[N*N])
+	{
+		memcpy(M, rhs, sizeof(T)*N*N);
 		return *this;
 	}
+
 	CUDA_CALLABLE T& operator()(int row, int col)
 	{
 		return M[col * N + row];
@@ -57,18 +63,18 @@ struct matrix
 		return result;
 	}
  
-	CUDA_CALLABLE std::string toStr()
+	std::string toStr()
 	{
 		std::stringstream ss;
  
 		for(int r = 0; r < N; r++)
 		{
-			ss<<"| ";
+			ss << "| ";
 			for(int c=0; c<N; c++)
 			{
-				ss<<(*this)(r, c)<<" ";
+				ss << (*this)(r, c) << " ";
 			}
-			ss<<"|"<<std::endl;
+			ss << "|" << std::endl;
 		}
  
 		return ss.str();