[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19671] branches/soc-2008-mxcurioni/source /blender/freestyle: Simplified modelview matrix copy

[Maxime Curioni]

Revision: 19671
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19671
Author:   mxcurioni
Date:     2009-04-12 09:02:03 +0200 (Sun, 12 Apr 2009)

Log Message:
-----------
Simplified modelview matrix copy

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h	2009-04-12 06:47:25 UTC (rev 19670)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h	2009-04-12 07:02:03 UTC (rev 19671)
@@ -18,7 +18,6 @@
 	
 	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];

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-04-12 06:47:25 UTC (rev 19670)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-04-12 07:02:03 UTC (rev 19671)
@@ -406,22 +406,34 @@
   // 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:
   //----------------------------------------------------------
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp	2009-04-12 06:47:25 UTC (rev 19670)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp	2009-04-12 07:02:03 UTC (rev 19671)
@@ -121,35 +121,41 @@
 		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[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[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)) {
 	}