diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-19 14:02:24 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-19 14:07:12 +0400 |
commit | 0673f86334f3ac8462d70e5ec1cd6c4b7c197c52 (patch) | |
tree | 1e2621f489bf2401851e391f97b8e4ca7513e35f /release/scripts/presets/camera | |
parent | a64b612ae2d6e33afa2aa095ee464a6e8f53eb55 (diff) |
Update the camera presets in various ways:
* Switch to using Canon sensor type instead of camera models.
There are a ton of camera models that reuse the same sensor
so it's just confusing and forever incomplete to try and cover
all models.
* Delete all redundant Canon camera models..
* Leave only the Canon camera models that are special, that is
have non regular sensor sizes.
* Fix a few errors in some Canon models.
* Capitalize a few unrelated sensor presets for consistency.
* Added presets for GoPro and iPhone.
Their distortion models and shutter isn't really supported ATM
but tracker is robust enough to give reasonable tracking and
solving results.
Presets are from Daniel Salazar and Sebastian Koenig, thanks!
Differential Revision: https://developer.blender.org/D264
Diffstat (limited to 'release/scripts/presets/camera')
39 files changed, 91 insertions, 56 deletions
diff --git a/release/scripts/presets/camera/1__colon__2.3_inch.py b/release/scripts/presets/camera/1__colon__2.3_inch.py new file mode 100644 index 00000000000..829a060ab35 --- /dev/null +++ b/release/scripts/presets/camera/1__colon__2.3_inch.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 6.16 +bpy.context.object.data.sensor_height = 4.62 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/1__colon__2.5_inch.py b/release/scripts/presets/camera/1__colon__2.5_inch.py new file mode 100644 index 00000000000..3ddd240ab50 --- /dev/null +++ b/release/scripts/presets/camera/1__colon__2.5_inch.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 5.76 +bpy.context.object.data.sensor_height = 4.29 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/2__colon__3_inch.py b/release/scripts/presets/camera/2__colon__3_inch.py new file mode 100644 index 00000000000..edf3bbba2c9 --- /dev/null +++ b/release/scripts/presets/camera/2__colon__3_inch.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 9.6 +bpy.context.object.data.sensor_height = 5.4 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/4__colon__3_inch.py b/release/scripts/presets/camera/4__colon__3_inch.py new file mode 100644 index 00000000000..6e38782c4d8 --- /dev/null +++ b/release/scripts/presets/camera/4__colon__3_inch.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 17.31 +bpy.context.object.data.sensor_height = 12.98 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Arri_Alexa.py b/release/scripts/presets/camera/Arri_Alexa.py new file mode 100644 index 00000000000..2bdcf12240b --- /dev/null +++ b/release/scripts/presets/camera/Arri_Alexa.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 23.760 +bpy.context.object.data.sensor_height = 13.365 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py b/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py new file mode 100644 index 00000000000..402a5b30cbb --- /dev/null +++ b/release/scripts/presets/camera/Blackmagic_Cinema_Camera.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 15.81 +bpy.context.object.data.sensor_height = 8.88 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_1D.py b/release/scripts/presets/camera/Canon_1D.py deleted file mode 100644 index 0bb0e910377..00000000000 --- a/release/scripts/presets/camera/Canon_1D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 27.9 -bpy.context.object.data.sensor_height = 18.6 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_1DS.py b/release/scripts/presets/camera/Canon_1DS.py deleted file mode 100644 index 158a6235f32..00000000000 --- a/release/scripts/presets/camera/Canon_1DS.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 36.0 -bpy.context.object.data.sensor_height = 24.0 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_500D.py b/release/scripts/presets/camera/Canon_500D.py deleted file mode 100644 index 829e03cc5cf..00000000000 --- a/release/scripts/presets/camera/Canon_500D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 22.3 -bpy.context.object.data.sensor_height = 14.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_550D.py b/release/scripts/presets/camera/Canon_550D.py deleted file mode 100644 index 829e03cc5cf..00000000000 --- a/release/scripts/presets/camera/Canon_550D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 22.3 -bpy.context.object.data.sensor_height = 14.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_5D.py b/release/scripts/presets/camera/Canon_5D.py deleted file mode 100644 index 158a6235f32..00000000000 --- a/release/scripts/presets/camera/Canon_5D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 36.0 -bpy.context.object.data.sensor_height = 24.0 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_600D.py b/release/scripts/presets/camera/Canon_600D.py deleted file mode 100644 index 829e03cc5cf..00000000000 --- a/release/scripts/presets/camera/Canon_600D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 22.3 -bpy.context.object.data.sensor_height = 14.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_60D.py b/release/scripts/presets/camera/Canon_60D.py deleted file mode 100644 index 829e03cc5cf..00000000000 --- a/release/scripts/presets/camera/Canon_60D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 22.3 -bpy.context.object.data.sensor_height = 14.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_7D.py b/release/scripts/presets/camera/Canon_7D.py deleted file mode 100644 index 829e03cc5cf..00000000000 --- a/release/scripts/presets/camera/Canon_7D.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 22.3 -bpy.context.object.data.sensor_height = 14.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/APS-C_DSLR.py b/release/scripts/presets/camera/Canon_APS-C.py index 829e03cc5cf..829e03cc5cf 100644 --- a/release/scripts/presets/camera/APS-C_DSLR.py +++ b/release/scripts/presets/camera/Canon_APS-C.py diff --git a/release/scripts/presets/camera/Canon_APS-H.py b/release/scripts/presets/camera/Canon_APS-H.py new file mode 100644 index 00000000000..d5cc02f4e4a --- /dev/null +++ b/release/scripts/presets/camera/Canon_APS-H.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 27.90 +bpy.context.object.data.sensor_height = 18.60 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Canon_C3000.py b/release/scripts/presets/camera/Canon_C3000.py new file mode 100644 index 00000000000..70c760c73b5 --- /dev/null +++ b/release/scripts/presets/camera/Canon_C3000.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 24.4 +bpy.context.object.data.sensor_height = 13.5 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/full_frame_35mm_film.py b/release/scripts/presets/camera/Full_Frame_35mm_Camera.py index d3e141ba4d9..d3e141ba4d9 100644 --- a/release/scripts/presets/camera/full_frame_35mm_film.py +++ b/release/scripts/presets/camera/Full_Frame_35mm_Camera.py diff --git a/release/scripts/presets/camera/GoPro_Hero3_Black.py b/release/scripts/presets/camera/GoPro_Hero3_Black.py new file mode 100644 index 00000000000..9cea698d8ab --- /dev/null +++ b/release/scripts/presets/camera/GoPro_Hero3_Black.py @@ -0,0 +1,6 @@ +import bpy +bpy.context.object.data.sensor_width = 6.16 +bpy.context.object.data.sensor_height = 4.62 +bpy.context.object.data.lens = 2.77 + +bpy.context.object.data.sensor_fit = 'AUTO' diff --git a/release/scripts/presets/camera/GoPro_Hero3_Silver.py b/release/scripts/presets/camera/GoPro_Hero3_Silver.py new file mode 100644 index 00000000000..1eee0750c2d --- /dev/null +++ b/release/scripts/presets/camera/GoPro_Hero3_Silver.py @@ -0,0 +1,6 @@ +import bpy +bpy.context.object.data.sensor_width = 5.371 +bpy.context.object.data.sensor_height = 4.035 +bpy.context.object.data.lens = 2.77 + +bpy.context.object.data.sensor_fit = 'AUTO' diff --git a/release/scripts/presets/camera/GoPro_Hero3_White.py b/release/scripts/presets/camera/GoPro_Hero3_White.py new file mode 100644 index 00000000000..3d1f368aab0 --- /dev/null +++ b/release/scripts/presets/camera/GoPro_Hero3_White.py @@ -0,0 +1,6 @@ +import bpy +bpy.context.object.data.sensor_width = 5.76 +bpy.context.object.data.sensor_height = 4.29 +bpy.context.object.data.lens = 2.77 + +bpy.context.object.data.sensor_fit = 'AUTO' diff --git a/release/scripts/presets/camera/Nikon_D3S.py b/release/scripts/presets/camera/Nikon_D3S.py deleted file mode 100644 index e6dc62dc100..00000000000 --- a/release/scripts/presets/camera/Nikon_D3S.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 36.0 -bpy.context.object.data.sensor_height = 23.9 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Nikon_D5000.py b/release/scripts/presets/camera/Nikon_D5000.py deleted file mode 100644 index a0505bf9b9c..00000000000 --- a/release/scripts/presets/camera/Nikon_D5000.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 23.6 -bpy.context.object.data.sensor_height = 15.8 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Nikon_D5100.py b/release/scripts/presets/camera/Nikon_D5100.py deleted file mode 100644 index 1d819cce65b..00000000000 --- a/release/scripts/presets/camera/Nikon_D5100.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 23.6 -bpy.context.object.data.sensor_height = 15.6 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Nikon_D7000.py b/release/scripts/presets/camera/Nikon_D7000.py deleted file mode 100644 index 1d819cce65b..00000000000 --- a/release/scripts/presets/camera/Nikon_D7000.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 23.6 -bpy.context.object.data.sensor_height = 15.6 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Nikon_D90.py b/release/scripts/presets/camera/Nikon_D90.py deleted file mode 100644 index a0505bf9b9c..00000000000 --- a/release/scripts/presets/camera/Nikon_D90.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 23.6 -bpy.context.object.data.sensor_height = 15.8 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Nikon_D300S.py b/release/scripts/presets/camera/Nikon_DX.py index a0505bf9b9c..a0505bf9b9c 100644 --- a/release/scripts/presets/camera/Nikon_D300S.py +++ b/release/scripts/presets/camera/Nikon_DX.py diff --git a/release/scripts/presets/camera/Panasonic_AG-HVX200.py b/release/scripts/presets/camera/Panasonic_AG-HVX200.py new file mode 100644 index 00000000000..ee82cbe9bf0 --- /dev/null +++ b/release/scripts/presets/camera/Panasonic_AG-HVX200.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 4.68 +bpy.context.object.data.sensor_height = 2.633 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Panasonic_LX2.py b/release/scripts/presets/camera/Panasonic_LX2.py new file mode 100644 index 00000000000..8e0f844e507 --- /dev/null +++ b/release/scripts/presets/camera/Panasonic_LX2.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 8.5 +bpy.context.object.data.sensor_height = 4.78 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S3.py b/release/scripts/presets/camera/Samsung_Galaxy_S3.py new file mode 100644 index 00000000000..35670042e48 --- /dev/null +++ b/release/scripts/presets/camera/Samsung_Galaxy_S3.py @@ -0,0 +1,5 @@ +import bpy +bpy.context.object.data.sensor_width = 4.8 +bpy.context.object.data.sensor_height = 3.6 +bpy.context.object.data.lens = 3.70 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Samsung_Galaxy_S4.py b/release/scripts/presets/camera/Samsung_Galaxy_S4.py new file mode 100644 index 00000000000..ae16d4172f9 --- /dev/null +++ b/release/scripts/presets/camera/Samsung_Galaxy_S4.py @@ -0,0 +1,5 @@ +import bpy +bpy.context.object.data.sensor_width = 4.8 +bpy.context.object.data.sensor_height = 3.6 +bpy.context.object.data.lens = 4.20 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Sony_EX1.py b/release/scripts/presets/camera/Sony_EX1.py new file mode 100644 index 00000000000..00708175b40 --- /dev/null +++ b/release/scripts/presets/camera/Sony_EX1.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 6.97 +bpy.context.object.data.sensor_height = 3.92 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/Sony_F65.py b/release/scripts/presets/camera/Sony_F65.py new file mode 100644 index 00000000000..e187828058b --- /dev/null +++ b/release/scripts/presets/camera/Sony_F65.py @@ -0,0 +1,4 @@ +import bpy +bpy.context.object.data.sensor_width = 24.33 +bpy.context.object.data.sensor_height = 12.83 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/super_16_film.py b/release/scripts/presets/camera/Super_16_Film.py index 1e42953bf05..1e42953bf05 100644 --- a/release/scripts/presets/camera/super_16_film.py +++ b/release/scripts/presets/camera/Super_16_Film.py diff --git a/release/scripts/presets/camera/super_35_film.py b/release/scripts/presets/camera/Super_35_Film.py index 65ccb0f216c..65ccb0f216c 100644 --- a/release/scripts/presets/camera/super_35_film.py +++ b/release/scripts/presets/camera/Super_35_Film.py diff --git a/release/scripts/presets/camera/iPhone_4.py b/release/scripts/presets/camera/iPhone_4.py new file mode 100644 index 00000000000..b87dda18097 --- /dev/null +++ b/release/scripts/presets/camera/iPhone_4.py @@ -0,0 +1,5 @@ +import bpy +bpy.context.object.data.sensor_width = 4.54 +bpy.context.object.data.sensor_height = 3.42 +bpy.context.object.data.lens = 3.85 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/iPhone_4S.py b/release/scripts/presets/camera/iPhone_4S.py new file mode 100644 index 00000000000..ea747f339d4 --- /dev/null +++ b/release/scripts/presets/camera/iPhone_4S.py @@ -0,0 +1,5 @@ +import bpy +bpy.context.object.data.sensor_width = 4.54 +bpy.context.object.data.sensor_height = 3.42 +bpy.context.object.data.lens = 4.28 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/iPhone_5.py b/release/scripts/presets/camera/iPhone_5.py new file mode 100644 index 00000000000..2764788a405 --- /dev/null +++ b/release/scripts/presets/camera/iPhone_5.py @@ -0,0 +1,5 @@ +import bpy +bpy.context.object.data.sensor_width = 4.54 +bpy.context.object.data.sensor_height = 3.42 +bpy.context.object.data.lens = 4.10 +bpy.context.object.data.sensor_fit = 'HORIZONTAL' diff --git a/release/scripts/presets/camera/micro_four_thirds.py b/release/scripts/presets/camera/micro_four_thirds.py deleted file mode 100644 index 36fb0aac391..00000000000 --- a/release/scripts/presets/camera/micro_four_thirds.py +++ /dev/null @@ -1,4 +0,0 @@ -import bpy -bpy.context.object.data.sensor_width = 17.3 -bpy.context.object.data.sensor_height = 13.0 -bpy.context.object.data.sensor_fit = 'HORIZONTAL' |