Camera tracking integration
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:06:24 +0000 (16:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:06:24 +0000 (16:06 +0000)
===========================

- Request from Sebastian/Francois: default lens
  for clip set to 24.0
- Added some additional camera presets from Francois request.
  Not sure all things from GENERIC section of that request
  would be actually useful.

  Probably the whole sensor size workflow would be changed...

41 files changed:
release/scripts/presets/camera/Canon_1100D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_1D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_1DS.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_500D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_550D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_5D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_600D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_60D.py [new file with mode: 0644]
release/scripts/presets/camera/Canon_7D.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D300S.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D3100.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D35.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D5000.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D5100.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D7000.py [new file with mode: 0644]
release/scripts/presets/camera/Nikon_D90.py [new file with mode: 0644]
release/scripts/presets/camera/Red_Epic.py [new file with mode: 0644]
release/scripts/presets/camera/Red_One_2K.py [new file with mode: 0644]
release/scripts/presets/camera/Red_One_3K.py [new file with mode: 0644]
release/scripts/presets/camera/Red_One_4K.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_1100D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_1D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_1DS.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_500D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_550D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_5D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_600D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_60D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Canon_7D.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D300S.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D3100.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D35.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D5000.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D5100.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D7000.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Nikon_D90.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Red_Epic.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Red_One_2K.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Red_One_3K.py [new file with mode: 0644]
release/scripts/presets/tracking_camera/Red_One_4K.py [new file with mode: 0644]
source/blender/blenkernel/intern/movieclip.c

diff --git a/release/scripts/presets/camera/Canon_1100D.py b/release/scripts/presets/camera/Canon_1100D.py
new file mode 100644 (file)
index 0000000..3db842e
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.2
+bpy.context.object.data.sensor_y = 14.7
diff --git a/release/scripts/presets/camera/Canon_1D.py b/release/scripts/presets/camera/Canon_1D.py
new file mode 100644 (file)
index 0000000..7345787
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 27.9
+bpy.context.object.data.sensor_y = 18.6
diff --git a/release/scripts/presets/camera/Canon_1DS.py b/release/scripts/presets/camera/Canon_1DS.py
new file mode 100644 (file)
index 0000000..28b5cc8
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 24.0
diff --git a/release/scripts/presets/camera/Canon_500D.py b/release/scripts/presets/camera/Canon_500D.py
new file mode 100644 (file)
index 0000000..ce49a20
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
diff --git a/release/scripts/presets/camera/Canon_550D.py b/release/scripts/presets/camera/Canon_550D.py
new file mode 100644 (file)
index 0000000..ce49a20
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
diff --git a/release/scripts/presets/camera/Canon_5D.py b/release/scripts/presets/camera/Canon_5D.py
new file mode 100644 (file)
index 0000000..28b5cc8
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 24.0
diff --git a/release/scripts/presets/camera/Canon_600D.py b/release/scripts/presets/camera/Canon_600D.py
new file mode 100644 (file)
index 0000000..ce49a20
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
diff --git a/release/scripts/presets/camera/Canon_60D.py b/release/scripts/presets/camera/Canon_60D.py
new file mode 100644 (file)
index 0000000..ce49a20
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
diff --git a/release/scripts/presets/camera/Canon_7D.py b/release/scripts/presets/camera/Canon_7D.py
new file mode 100644 (file)
index 0000000..ce49a20
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.3
+bpy.context.object.data.sensor_y = 14.9
diff --git a/release/scripts/presets/camera/Nikon_D300S.py b/release/scripts/presets/camera/Nikon_D300S.py
new file mode 100644 (file)
index 0000000..820252f
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
diff --git a/release/scripts/presets/camera/Nikon_D3100.py b/release/scripts/presets/camera/Nikon_D3100.py
new file mode 100644 (file)
index 0000000..6645f09
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.1
+bpy.context.object.data.sensor_y = 15.4
diff --git a/release/scripts/presets/camera/Nikon_D35.py b/release/scripts/presets/camera/Nikon_D35.py
new file mode 100644 (file)
index 0000000..7bfd488
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 36.0
+bpy.context.object.data.sensor_y = 23.9
diff --git a/release/scripts/presets/camera/Nikon_D5000.py b/release/scripts/presets/camera/Nikon_D5000.py
new file mode 100644 (file)
index 0000000..820252f
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
diff --git a/release/scripts/presets/camera/Nikon_D5100.py b/release/scripts/presets/camera/Nikon_D5100.py
new file mode 100644 (file)
index 0000000..ac62d86
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.6
diff --git a/release/scripts/presets/camera/Nikon_D7000.py b/release/scripts/presets/camera/Nikon_D7000.py
new file mode 100644 (file)
index 0000000..ac62d86
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.6
diff --git a/release/scripts/presets/camera/Nikon_D90.py b/release/scripts/presets/camera/Nikon_D90.py
new file mode 100644 (file)
index 0000000..820252f
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 23.6
+bpy.context.object.data.sensor_y = 15.8
diff --git a/release/scripts/presets/camera/Red_Epic.py b/release/scripts/presets/camera/Red_Epic.py
new file mode 100644 (file)
index 0000000..0939fd3
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 30.0
+bpy.context.object.data.sensor_y = 15.0
diff --git a/release/scripts/presets/camera/Red_One_2K.py b/release/scripts/presets/camera/Red_One_2K.py
new file mode 100644 (file)
index 0000000..53a4d34
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 11.1
+bpy.context.object.data.sensor_y = 6.24
diff --git a/release/scripts/presets/camera/Red_One_3K.py b/release/scripts/presets/camera/Red_One_3K.py
new file mode 100644 (file)
index 0000000..8234c99
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 16.65
+bpy.context.object.data.sensor_y = 9.36
diff --git a/release/scripts/presets/camera/Red_One_4K.py b/release/scripts/presets/camera/Red_One_4K.py
new file mode 100644 (file)
index 0000000..7f462a4
--- /dev/null
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.object.data.sensor_x = 22.2
+bpy.context.object.data.sensor_y = 12.6
diff --git a/release/scripts/presets/tracking_camera/Canon_1100D.py b/release/scripts/presets/tracking_camera/Canon_1100D.py
new file mode 100644 (file)
index 0000000..0d62503
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.2
+camera.sensor_height = 14.7
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_1D.py b/release/scripts/presets/tracking_camera/Canon_1D.py
new file mode 100644 (file)
index 0000000..c6ceee2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 27.9
+camera.sensor_height = 18.6
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_1DS.py b/release/scripts/presets/tracking_camera/Canon_1DS.py
new file mode 100644 (file)
index 0000000..37feb5f
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 36.0
+camera.sensor_height = 24.0
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_500D.py b/release/scripts/presets/tracking_camera/Canon_500D.py
new file mode 100644 (file)
index 0000000..0d057d2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.3
+camera.sensor_height = 14.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_550D.py b/release/scripts/presets/tracking_camera/Canon_550D.py
new file mode 100644 (file)
index 0000000..0d057d2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.3
+camera.sensor_height = 14.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_5D.py b/release/scripts/presets/tracking_camera/Canon_5D.py
new file mode 100644 (file)
index 0000000..37feb5f
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 36.0
+camera.sensor_height = 24.0
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_600D.py b/release/scripts/presets/tracking_camera/Canon_600D.py
new file mode 100644 (file)
index 0000000..0d057d2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.3
+camera.sensor_height = 14.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_60D.py b/release/scripts/presets/tracking_camera/Canon_60D.py
new file mode 100644 (file)
index 0000000..0d057d2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.3
+camera.sensor_height = 14.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Canon_7D.py b/release/scripts/presets/tracking_camera/Canon_7D.py
new file mode 100644 (file)
index 0000000..0d057d2
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.3
+camera.sensor_height = 14.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D300S.py b/release/scripts/presets/tracking_camera/Nikon_D300S.py
new file mode 100644 (file)
index 0000000..b51a3c1
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.sensor_height = 15.8
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D3100.py b/release/scripts/presets/tracking_camera/Nikon_D3100.py
new file mode 100644 (file)
index 0000000..854a8c0
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.1
+camera.sensor_height = 15.4
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D35.py b/release/scripts/presets/tracking_camera/Nikon_D35.py
new file mode 100644 (file)
index 0000000..f2b87f3
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 36.0
+camera.sensor_height = 23.9
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D5000.py b/release/scripts/presets/tracking_camera/Nikon_D5000.py
new file mode 100644 (file)
index 0000000..b51a3c1
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.sensor_height = 15.8
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D5100.py b/release/scripts/presets/tracking_camera/Nikon_D5100.py
new file mode 100644 (file)
index 0000000..0c68b01
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.sensor_height = 15.6
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D7000.py b/release/scripts/presets/tracking_camera/Nikon_D7000.py
new file mode 100644 (file)
index 0000000..0c68b01
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.sensor_height = 15.6
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Nikon_D90.py b/release/scripts/presets/tracking_camera/Nikon_D90.py
new file mode 100644 (file)
index 0000000..b51a3c1
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 23.6
+camera.sensor_height = 15.8
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_Epic.py b/release/scripts/presets/tracking_camera/Red_Epic.py
new file mode 100644 (file)
index 0000000..a5c4a2b
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 30.0
+camera.sensor_height = 15.0
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_2K.py b/release/scripts/presets/tracking_camera/Red_One_2K.py
new file mode 100644 (file)
index 0000000..f8b6f37
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 11.1
+camera.sensor_height = 6.24
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_3K.py b/release/scripts/presets/tracking_camera/Red_One_3K.py
new file mode 100644 (file)
index 0000000..d0926cc
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 16.65
+camera.sensor_height = 9.36
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
diff --git a/release/scripts/presets/tracking_camera/Red_One_4K.py b/release/scripts/presets/tracking_camera/Red_One_4K.py
new file mode 100644 (file)
index 0000000..2eeadb1
--- /dev/null
@@ -0,0 +1,10 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 22.2
+camera.sensor_height = 12.6
+camera.units = 'MILLIMETERS'
+camera.focal_length = 24.0
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0
index f5b1315727364afc20f08d8b3be2c7aa2ed637d3..d58a1f3357b087b96b5fa974e956153f3cee5639 100644 (file)
@@ -230,6 +230,7 @@ static MovieClip *movieclip_alloc(const char *name)
 
        clip->aspx= clip->aspy= 1.0f;
 
+       clip->tracking.camera.focal= 24.f;
        clip->tracking.camera.sensor_width= 35.0f;
        clip->tracking.camera.sensor_height= 18.0f;
        clip->tracking.camera.units= CAMERA_UNITS_MM;