[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41524] trunk/blender: Configurable sensor size:
Sergey Sharybin
g.ulairi at gmail.com
Fri Nov 4 15:36:07 CET 2011
Revision: 41524
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41524
Author: nazgul
Date: 2011-11-04 14:36:06 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Configurable sensor size:
- Added support of variable size sensor width and height.
- Added presets for most common cameras, also new presets can be defined by user.
- Added option to control which dimension (vertical or horizontal) of sensor
size defines FOV. Old behavior of automatic FOV calculation is also kept.
- Renderer, viewport, game engine and collada importer/exporter should
deal fine with this changes. Other exporters would be updated soon.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenlib/BLI_math_rotation.h
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/uvproject.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/CameraExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesdna/DNA_camera_types.h
trunk/blender/source/blender/makesrna/intern/rna_camera.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_CameraData.h
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
Added Paths:
-----------
trunk/blender/release/scripts/presets/camera/
trunk/blender/release/scripts/presets/camera/APS-C_DSLR.py
trunk/blender/release/scripts/presets/camera/Blender.py
trunk/blender/release/scripts/presets/camera/Canon_1100D.py
trunk/blender/release/scripts/presets/camera/Canon_1D.py
trunk/blender/release/scripts/presets/camera/Canon_1DS.py
trunk/blender/release/scripts/presets/camera/Canon_500D.py
trunk/blender/release/scripts/presets/camera/Canon_550D.py
trunk/blender/release/scripts/presets/camera/Canon_5D.py
trunk/blender/release/scripts/presets/camera/Canon_600D.py
trunk/blender/release/scripts/presets/camera/Canon_60D.py
trunk/blender/release/scripts/presets/camera/Canon_7D.py
trunk/blender/release/scripts/presets/camera/Nikon_D300S.py
trunk/blender/release/scripts/presets/camera/Nikon_D3100.py
trunk/blender/release/scripts/presets/camera/Nikon_D35.py
trunk/blender/release/scripts/presets/camera/Nikon_D5000.py
trunk/blender/release/scripts/presets/camera/Nikon_D5100.py
trunk/blender/release/scripts/presets/camera/Nikon_D7000.py
trunk/blender/release/scripts/presets/camera/Nikon_D90.py
trunk/blender/release/scripts/presets/camera/Red_Epic.py
trunk/blender/release/scripts/presets/camera/Red_One_2K.py
trunk/blender/release/scripts/presets/camera/Red_One_3K.py
trunk/blender/release/scripts/presets/camera/Red_One_4K.py
trunk/blender/release/scripts/presets/camera/full_frame_35mm_film.py
trunk/blender/release/scripts/presets/camera/micro_four_thirds.py
trunk/blender/release/scripts/presets/camera/super_16_film.py
trunk/blender/release/scripts/presets/camera/super_35_film.py
Added: trunk/blender/release/scripts/presets/camera/APS-C_DSLR.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/APS-C_DSLR.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/APS-C_DSLR.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Blender.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Blender.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Blender.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 32
+bpy.context.object.data.sensor_height = 18
+bpy.context.object.data.sensor_fit = 'AUTO'
Added: trunk/blender/release/scripts/presets/camera/Canon_1100D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_1100D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_1100D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 22.2
+bpy.context.object.data.sensor_height = 14.7
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Added: trunk/blender/release/scripts/presets/camera/Canon_1D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_1D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_1D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_1DS.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_1DS.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_1DS.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_500D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_500D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_500D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_550D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_550D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_550D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_5D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_5D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_5D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_600D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_600D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_600D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_60D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_60D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_60D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Canon_7D.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Canon_7D.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Canon_7D.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D300S.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D300S.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D300S.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D3100.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D3100.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D3100.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 23.1
+bpy.context.object.data.sensor_height = 15.4
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D35.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D35.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D35.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D5000.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D5000.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D5000.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D5100.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D5100.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D5100.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D7000.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D7000.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D7000.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Nikon_D90.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D90.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D90.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+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'
Added: trunk/blender/release/scripts/presets/camera/Red_Epic.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Red_Epic.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Red_Epic.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 30.0
+bpy.context.object.data.sensor_height = 15.0
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Added: trunk/blender/release/scripts/presets/camera/Red_One_2K.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Red_One_2K.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Red_One_2K.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 11.1
+bpy.context.object.data.sensor_height = 6.24
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
Added: trunk/blender/release/scripts/presets/camera/Red_One_3K.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Red_One_3K.py (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Red_One_3K.py 2011-11-04 14:36:06 UTC (rev 41524)
@@ -0,0 +1,4 @@
+import bpy
+bpy.context.object.data.sensor_width = 16.65
+bpy.context.object.data.sensor_height = 9.36
+bpy.context.object.data.sensor_fit = 'HORIZONTAL'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list