Simplified modelview matrix copy

3 files changed, 45 insertions, 28 deletions

diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index 7151471a561..d3ab042f84b 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -18,7 +18,6 @@ extern "C" {
 	
 	extern short freestyle_is_initialized;
 	
-	extern float freestyle_fovyradian;
 	extern float freestyle_viewpoint[3];
 	extern float freestyle_mv[4][4];
 	extern float freestyle_proj[4][4];
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 3c338680076..c54e68de381 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -406,21 +406,33 @@ void Controller::ComputeViewMap()
   // 3D context is on.
   Vec3r vp( freestyle_viewpoint[0], freestyle_viewpoint[1], freestyle_viewpoint[2]);
 
+	cout << "mv" << endl;
  	real mv[4][4];
-	for( int i= 0; i < 4; i++)
-		for( int j= 0; j < 4; j++)
+	for( int i= 0; i < 4; i++) {
+		for( int j= 0; j < 4; j++) {
 			mv[i][j] = freestyle_mv[i][j];
-
-
+			cout << mv[i][j] << " ";
+		}
+		cout << endl;
+	}
+	
+	cout << "\nproj" << endl;
 	real proj[4][4];
-	for( int i= 0; i < 4; i++)
-		for( int j= 0; j < 4; j++)
+	for( int i= 0; i < 4; i++) {
+		for( int j= 0; j < 4; j++) {
 			proj[i][j] = freestyle_proj[i][j];
-
+			cout << proj[i][j] << " ";
+		}
+		cout << endl;
+	}
 
 	int viewport[4];
 	for( int i= 0; i < 4; i++)
 		viewport[i] = freestyle_viewport[i];
+	
+	cout << "\nfocal:" << _pView->GetFocalLength() << endl << endl;
+
+
 
   // Flag the WXEdge structure for silhouette edge detection:
   //----------------------------------------------------------
diff --git a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
index d780191ce94..86478e6ea11 100644
--- a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
@@ -121,35 +121,41 @@ extern "C" {
 		Object* maincam_obj = re->scene->camera;
 		Camera *cam = (Camera*) maincam_obj->data;
 
-		view->setHorizontalFov( cam->angle );
+		//view->setHorizontalFov( cam->angle );
 		
 		freestyle_viewpoint[0] = maincam_obj->obmat[3][0];
 		freestyle_viewpoint[1] = maincam_obj->obmat[3][1];
 		freestyle_viewpoint[2] = maincam_obj->obmat[3][2];
 		
-		freestyle_mv[0][0] = maincam_obj->obmat[0][0];
-		freestyle_mv[0][1] = maincam_obj->obmat[1][0];
-		freestyle_mv[0][2] = maincam_obj->obmat[2][0];
-		freestyle_mv[0][3] = 0.0;
-
-		freestyle_mv[1][0] = maincam_obj->obmat[0][1];
-		freestyle_mv[1][1] = maincam_obj->obmat[1][1];
-		freestyle_mv[1][2] = maincam_obj->obmat[2][1];
-		freestyle_mv[1][3] = 0.0;
-
-		freestyle_mv[2][0] = re->viewmat[2][0];
-		freestyle_mv[2][1] = re->viewmat[2][1];
-		freestyle_mv[2][2] = re->viewmat[2][2];
-		freestyle_mv[2][3] = 0.0;
-
-		freestyle_mv[3][0] = re->viewmat[3][0];
-		freestyle_mv[3][1] = re->viewmat[3][1];
-		freestyle_mv[3][2] = re->viewmat[3][2];
-		freestyle_mv[3][3] = 1.0;
+		// freestyle_mv[0][0] = maincam_obj->obmat[0][0];
+		// freestyle_mv[0][1] = maincam_obj->obmat[1][0];
+		// freestyle_mv[0][2] = maincam_obj->obmat[2][0];
+		// freestyle_mv[0][3] = 0.0;
+		// 
+		// freestyle_mv[1][0] = maincam_obj->obmat[0][1];
+		// freestyle_mv[1][1] = maincam_obj->obmat[1][1];
+		// freestyle_mv[1][2] = maincam_obj->obmat[2][1];
+		// freestyle_mv[1][3] = 0.0;
+		// 
+		// freestyle_mv[2][0] = re->viewmat[2][0];
+		// freestyle_mv[2][1] = re->viewmat[2][1];
+		// freestyle_mv[2][2] = re->viewmat[2][2];
+		// freestyle_mv[2][3] = 0.0;
+		// 
+		// freestyle_mv[3][0] = re->viewmat[3][0];
+		// freestyle_mv[3][1] = re->viewmat[3][1];
+		// freestyle_mv[3][2] = re->viewmat[3][2];
+		// freestyle_mv[3][3] = 1.0;
 
 		for( int i = 0; i < 4; i++ )
 		   for( int j = 0; j < 4; j++ )
+			freestyle_mv[i][j] = re->viewmat[i][j];
+		
+		for( int i = 0; i < 4; i++ )
+		   for( int j = 0; j < 4; j++ )
 			freestyle_proj[i][j] = re->winmat[i][j];
+			
+		//f(cam && (re->r.mode & R_ORTHO)) {
 	}