[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41397] branches/soc-2011-tomato/source/ blender/collada: Camera tracking integration

Sergey Sharybin g.ulairi at gmail.com
Mon Oct 31 00:58:21 CET 2011


Revision: 41397
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41397
Author:   nazgul
Date:     2011-10-30 23:58:21 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fix for collada importer/exporter.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp

Modified: branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp	2011-10-30 23:47:57 UTC (rev 41396)
+++ branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp	2011-10-30 23:58:21 UTC (rev 41397)
@@ -71,7 +71,7 @@
 	
 	if (cam->type == CAM_PERSP) {
 		COLLADASW::PerspectiveOptic persp(mSW);
-		persp.setXFov(RAD2DEGF(focallength_to_hfov(cam->lens, cam->sensor_x)), "xfov");
+		persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
 		persp.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch),false,"aspect_ratio");
 		persp.setZFar(cam->clipend, false , "zfar");
 		persp.setZNear(cam->clipsta,false , "znear");

Modified: branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp	2011-10-30 23:47:57 UTC (rev 41396)
+++ branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp	2011-10-30 23:58:21 UTC (rev 41397)
@@ -814,7 +814,7 @@
 						double aspect = camera->getAspectRatio().getValue();
 						double xfov = aspect*yfov;
 						// xfov is in degrees, cam->lens is in millimiters
-						cam->lens = hfov_to_focallength(DEG2RADF(xfov), cam->sensor_x);
+						cam->lens = fov_to_focallength(DEG2RADF(xfov), cam->sensor_x);
 					}
 					break;
 			}
@@ -835,7 +835,7 @@
 					{
 						double x = camera->getXFov().getValue();
 						// x is in degrees, cam->lens is in millimiters
-						cam->lens = hfov_to_focallength(DEG2RADF(x), cam->sensor_x);
+						cam->lens = fov_to_focallength(DEG2RADF(x), cam->sensor_x);
 					}
 					break;
 			}
@@ -852,7 +852,7 @@
 					{
 					double yfov = camera->getYFov().getValue();
 					// yfov is in degrees, cam->lens is in millimiters
-					cam->lens = hfov_to_focallength(DEG2RADF(yfov), cam->sensor_x);
+					cam->lens = fov_to_focallength(DEG2RADF(yfov), cam->sensor_x);
 					}
 					break;
 			}




More information about the Bf-blender-cvs mailing list