[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38400] branches/soc-2011-tomato: Camera trackign integration

[Sergey Sharybin]

Revision: 38400
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38400
Author:   nazgul
Date:     2011-07-14 15:52:00 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Camera trackign integration
===========================

- Fixed compilation error with OpenCOLLADA
- Added sample preset for tracking camera.
- Fixed bug with wrong order of preset properties loading/saving.

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp

Added Paths:
-----------
    branches/soc-2011-tomato/release/scripts/presets/tracking_camera/
    branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Blender.py

Added: branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Blender.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Blender.py	                        (rev 0)
+++ branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Blender.py	2011-07-14 15:52:00 UTC (rev 38400)
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 32.0
+camera.sensor_height = 18.0
+camera.units = 'MILLIMETERS'
+camera.focal_length = 35.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py	2011-07-14 15:21:59 UTC (rev 38399)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py	2011-07-14 15:52:00 UTC (rev 38400)
@@ -306,10 +306,10 @@
     ]
 
     preset_values = [
-        "camera.focal_length",
         "camera.sensor_width",
         "camera.sensor_height",
         "camera.units",
+        "camera.focal_length",
         "camera.k1",
         "camera.k2",
         "camera.k3"

Modified: branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp	2011-07-14 15:21:59 UTC (rev 38399)
+++ branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp	2011-07-14 15:52:00 UTC (rev 38400)
@@ -834,7 +834,7 @@
 					{
 					double yfov = camera->getYFov().getValue();
 					// yfov is in degrees, cam->lens is in millimiters
-					cam->lens = hfov_to_focallength((float)x*(M_PI/180.0f), cam->sensor_x);
+					cam->lens = hfov_to_focallength((float)yfov*(M_PI/180.0f), cam->sensor_x);
 					}
 					break;
 			}