[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41610] trunk/blender: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Mon Nov 7 13:55:18 CET 2011
Revision: 41610
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41610
Author: nazgul
Date: 2011-11-07 12:55:18 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Camera tracking integration
===========================
Commiting camera tracking integration gsoc project into trunk.
This commit includes:
- Bundled version of libmv library (with some changes against official repo,
re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
clips (both of movie files and image sequences) and doing camera/motion
tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
stuff only, but which can be easily extended to work with masks too.
This editor supports:
* Loading movie files/image sequences
* Build proxies with different size for loaded movie clip, also supports
building undistorted proxies to increase speed of playback in
undistorted mode.
* Manual lens distortion mode calibration using grid and grease pencil
* Supervised 2D tracking using two different algorithms KLT and SAD.
* Basic algorithm for feature detection
* Camera motion solving. scene orientation
- New constraints to "link" scene objects with solved motions from clip:
* Follow Track (make object follow 2D motion of track with given name
or parent object to reconstructed 3D position of track)
* Camera Solver to make camera moving in the same way as reconstructed camera
This commit NOT includes changes from tomato branch:
- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
(need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
readability and understanadability of code. Better to make this chaneg when
Keir will finish his current patch.
More details about this project can be found on this page:
http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011
Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/extern/CMakeLists.txt
trunk/blender/extern/SConscript
trunk/blender/release/datafiles/blender_icons.png
trunk/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
trunk/blender/release/scripts/startup/bl_operators/__init__.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/space_time.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_context.h
trunk/blender/source/blender/blenkernel/BKE_library.h
trunk/blender/source/blender/blenkernel/BKE_main.h
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/idcode.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenlib/BLI_threads.h
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/readfile.h
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/CMakeLists.txt
trunk/blender/source/blender/editors/SConscript
trunk/blender/source/blender/editors/datafiles/blender_icons.png.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/include/ED_space_api.h
trunk/blender/source/blender/editors/include/ED_transform.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_api/spacetypes.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.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_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Added Paths:
-----------
trunk/blender/extern/libmv/
trunk/blender/extern/libmv/CMakeLists.txt
trunk/blender/extern/libmv/ChangeLog
trunk/blender/extern/libmv/SConscript
trunk/blender/extern/libmv/bundle.sh
trunk/blender/extern/libmv/files.txt
trunk/blender/extern/libmv/libmv/
trunk/blender/extern/libmv/libmv/base/
trunk/blender/extern/libmv/libmv/base/id_generator.h
trunk/blender/extern/libmv/libmv/base/scoped_ptr.h
trunk/blender/extern/libmv/libmv/base/vector.h
trunk/blender/extern/libmv/libmv/base/vector_utils.h
trunk/blender/extern/libmv/libmv/image/
trunk/blender/extern/libmv/libmv/image/array_nd.cc
trunk/blender/extern/libmv/libmv/image/array_nd.h
trunk/blender/extern/libmv/libmv/image/convolve.cc
trunk/blender/extern/libmv/libmv/image/convolve.h
trunk/blender/extern/libmv/libmv/image/image.h
trunk/blender/extern/libmv/libmv/image/sample.h
trunk/blender/extern/libmv/libmv/image/tuple.h
trunk/blender/extern/libmv/libmv/logging/
trunk/blender/extern/libmv/libmv/logging/logging.h
trunk/blender/extern/libmv/libmv/multiview/
trunk/blender/extern/libmv/libmv/multiview/conditioning.cc
trunk/blender/extern/libmv/libmv/multiview/conditioning.h
trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h
trunk/blender/extern/libmv/libmv/multiview/fundamental.cc
trunk/blender/extern/libmv/libmv/multiview/fundamental.h
trunk/blender/extern/libmv/libmv/multiview/nviewtriangulation.h
trunk/blender/extern/libmv/libmv/multiview/projection.cc
trunk/blender/extern/libmv/libmv/multiview/projection.h
trunk/blender/extern/libmv/libmv/multiview/resection.h
trunk/blender/extern/libmv/libmv/multiview/triangulation.cc
trunk/blender/extern/libmv/libmv/multiview/triangulation.h
trunk/blender/extern/libmv/libmv/numeric/
trunk/blender/extern/libmv/libmv/numeric/dogleg.h
trunk/blender/extern/libmv/libmv/numeric/function_derivative.h
trunk/blender/extern/libmv/libmv/numeric/levenberg_marquardt.h
trunk/blender/extern/libmv/libmv/numeric/numeric.cc
trunk/blender/extern/libmv/libmv/numeric/numeric.h
trunk/blender/extern/libmv/libmv/numeric/poly.cc
trunk/blender/extern/libmv/libmv/numeric/poly.h
trunk/blender/extern/libmv/libmv/simple_pipeline/
trunk/blender/extern/libmv/libmv/simple_pipeline/bundle.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/bundle.h
trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
trunk/blender/extern/libmv/libmv/simple_pipeline/detect.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/detect.h
trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/intersect.h
trunk/blender/extern/libmv/libmv/simple_pipeline/pipeline.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/pipeline.h
trunk/blender/extern/libmv/libmv/simple_pipeline/reconstruction.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/reconstruction.h
trunk/blender/extern/libmv/libmv/simple_pipeline/resect.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/resect.h
trunk/blender/extern/libmv/libmv/simple_pipeline/tracks.cc
trunk/blender/extern/libmv/libmv/simple_pipeline/tracks.h
trunk/blender/extern/libmv/libmv/tracking/
trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
trunk/blender/extern/libmv/libmv/tracking/klt_region_tracker.h
trunk/blender/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
trunk/blender/extern/libmv/libmv/tracking/pyramid_region_tracker.h
trunk/blender/extern/libmv/libmv/tracking/region_tracker.h
trunk/blender/extern/libmv/libmv/tracking/retrack_region_tracker.cc
trunk/blender/extern/libmv/libmv/tracking/retrack_region_tracker.h
trunk/blender/extern/libmv/libmv/tracking/sad.cc
trunk/blender/extern/libmv/libmv/tracking/sad.h
trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
trunk/blender/extern/libmv/libmv/tracking/trklt_region_tracker.h
trunk/blender/extern/libmv/libmv-capi.cpp
trunk/blender/extern/libmv/libmv-capi.h
trunk/blender/extern/libmv/mkfiles.sh
trunk/blender/extern/libmv/patches/
trunk/blender/extern/libmv/patches/bundle_tweaks.patch
trunk/blender/extern/libmv/patches/config_mac.patch
trunk/blender/extern/libmv/patches/detect.patch
trunk/blender/extern/libmv/patches/fast.patch
trunk/blender/extern/libmv/patches/function_derivative.patch
trunk/blender/extern/libmv/patches/high_distortion_crash_fix.patch
trunk/blender/extern/libmv/patches/levenberg_marquardt.patch
trunk/blender/extern/libmv/patches/mingw.patch
trunk/blender/extern/libmv/patches/msvc2010.patch
trunk/blender/extern/libmv/patches/overscan.patch
trunk/blender/extern/libmv/patches/scaled_distortion.patch
trunk/blender/extern/libmv/patches/series
trunk/blender/extern/libmv/patches/snrptinf_fix.patch
trunk/blender/extern/libmv/patches/v3d_verbosity.patch
trunk/blender/extern/libmv/third_party/
trunk/blender/extern/libmv/third_party/fast/
trunk/blender/extern/libmv/third_party/fast/LICENSE
trunk/blender/extern/libmv/third_party/fast/README
trunk/blender/extern/libmv/third_party/fast/README.libmv
trunk/blender/extern/libmv/third_party/fast/fast.c
trunk/blender/extern/libmv/third_party/fast/fast.h
trunk/blender/extern/libmv/third_party/fast/fast_10.c
trunk/blender/extern/libmv/third_party/fast/fast_11.c
trunk/blender/extern/libmv/third_party/fast/fast_12.c
trunk/blender/extern/libmv/third_party/fast/fast_9.c
trunk/blender/extern/libmv/third_party/fast/nonmax.c
trunk/blender/extern/libmv/third_party/gflags/
trunk/blender/extern/libmv/third_party/gflags/README.libmv
trunk/blender/extern/libmv/third_party/gflags/config.h
trunk/blender/extern/libmv/third_party/gflags/gflags.cc
trunk/blender/extern/libmv/third_party/gflags/gflags.h
trunk/blender/extern/libmv/third_party/gflags/gflags_completions.cc
trunk/blender/extern/libmv/third_party/gflags/gflags_completions.h
trunk/blender/extern/libmv/third_party/gflags/gflags_reporting.cc
trunk/blender/extern/libmv/third_party/gflags/mutex.h
trunk/blender/extern/libmv/third_party/glog/
trunk/blender/extern/libmv/third_party/glog/AUTHORS
trunk/blender/extern/libmv/third_party/glog/COPYING
trunk/blender/extern/libmv/third_party/glog/ChangeLog
trunk/blender/extern/libmv/third_party/glog/NEWS
trunk/blender/extern/libmv/third_party/glog/README
trunk/blender/extern/libmv/third_party/glog/README.libmv
trunk/blender/extern/libmv/third_party/glog/src/
trunk/blender/extern/libmv/third_party/glog/src/base/
trunk/blender/extern/libmv/third_party/glog/src/base/commandlineflags.h
trunk/blender/extern/libmv/third_party/glog/src/base/googleinit.h
trunk/blender/extern/libmv/third_party/glog/src/base/mutex.h
trunk/blender/extern/libmv/third_party/glog/src/config.h
trunk/blender/extern/libmv/third_party/glog/src/config_linux.h
trunk/blender/extern/libmv/third_party/glog/src/config_mac.h
trunk/blender/extern/libmv/third_party/glog/src/demangle.cc
trunk/blender/extern/libmv/third_party/glog/src/demangle.h
trunk/blender/extern/libmv/third_party/glog/src/glog/
trunk/blender/extern/libmv/third_party/glog/src/glog/log_severity.h
trunk/blender/extern/libmv/third_party/glog/src/glog/logging.h
trunk/blender/extern/libmv/third_party/glog/src/glog/raw_logging.h
trunk/blender/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
trunk/blender/extern/libmv/third_party/glog/src/logging.cc
trunk/blender/extern/libmv/third_party/glog/src/raw_logging.cc
trunk/blender/extern/libmv/third_party/glog/src/signalhandler.cc
trunk/blender/extern/libmv/third_party/glog/src/stacktrace.h
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
trunk/blender/extern/libmv/third_party/glog/src/symbolize.cc
trunk/blender/extern/libmv/third_party/glog/src/symbolize.h
trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
trunk/blender/extern/libmv/third_party/glog/src/utilities.h
trunk/blender/extern/libmv/third_party/glog/src/vlog_is_on.cc
trunk/blender/extern/libmv/third_party/glog/src/windows/
trunk/blender/extern/libmv/third_party/glog/src/windows/config.h
trunk/blender/extern/libmv/third_party/glog/src/windows/glog/
trunk/blender/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
trunk/blender/extern/libmv/third_party/glog/src/windows/glog/logging.h
trunk/blender/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
trunk/blender/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
trunk/blender/extern/libmv/third_party/glog/src/windows/port.cc
trunk/blender/extern/libmv/third_party/glog/src/windows/port.h
trunk/blender/extern/libmv/third_party/glog/src/windows/preprocess.sh
trunk/blender/extern/libmv/third_party/ldl/
trunk/blender/extern/libmv/third_party/ldl/CMakeLists.txt
trunk/blender/extern/libmv/third_party/ldl/Doc/
trunk/blender/extern/libmv/third_party/ldl/Doc/ChangeLog
trunk/blender/extern/libmv/third_party/ldl/Doc/lesser.txt
trunk/blender/extern/libmv/third_party/ldl/Include/
trunk/blender/extern/libmv/third_party/ldl/Include/ldl.h
trunk/blender/extern/libmv/third_party/ldl/README.libmv
trunk/blender/extern/libmv/third_party/ldl/README.txt
trunk/blender/extern/libmv/third_party/ldl/Source/
trunk/blender/extern/libmv/third_party/ldl/Source/ldl.c
trunk/blender/extern/libmv/third_party/msinttypes/
trunk/blender/extern/libmv/third_party/msinttypes/README.libmv
trunk/blender/extern/libmv/third_party/msinttypes/inttypes.h
trunk/blender/extern/libmv/third_party/msinttypes/stdint.h
trunk/blender/extern/libmv/third_party/ssba/
trunk/blender/extern/libmv/third_party/ssba/COPYING.TXT
trunk/blender/extern/libmv/third_party/ssba/Geometry/
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
trunk/blender/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
trunk/blender/extern/libmv/third_party/ssba/Math/
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_linear.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
trunk/blender/extern/libmv/third_party/ssba/Math/v3d_optimization.h
trunk/blender/extern/libmv/third_party/ssba/README.TXT
trunk/blender/extern/libmv/third_party/ssba/README.libmv
trunk/blender/release/scripts/presets/tracking_camera/
trunk/blender/release/scripts/presets/tracking_camera/Blender.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_1100D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_1D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_1DS.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_500D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_550D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_5D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_600D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_60D.py
trunk/blender/release/scripts/presets/tracking_camera/Canon_7D.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D300S.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D3100.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D35.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D5000.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D5100.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D7000.py
trunk/blender/release/scripts/presets/tracking_camera/Nikon_D90.py
trunk/blender/release/scripts/presets/tracking_camera/Red_Epic.py
trunk/blender/release/scripts/presets/tracking_camera/Red_One_2K.py
trunk/blender/release/scripts/presets/tracking_camera/Red_One_3K.py
trunk/blender/release/scripts/presets/tracking_camera/Red_One_4K.py
trunk/blender/release/scripts/presets/tracking_track_color/
trunk/blender/release/scripts/presets/tracking_track_color/default.py
trunk/blender/release/scripts/presets/tracking_track_color/far_plane.py
trunk/blender/release/scripts/presets/tracking_track_color/near_plane.py
trunk/blender/release/scripts/startup/bl_operators/clip.py
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/source/blender/blenkernel/BKE_movieclip.h
trunk/blender/source/blender/blenkernel/BKE_tracking.h
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/space_clip/
trunk/blender/source/blender/editors/space_clip/CMakeLists.txt
trunk/blender/source/blender/editors/space_clip/SConscript
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_intern.h
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
trunk/blender/source/blender/makesdna/DNA_tracking_types.h
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-11-07 12:50:26 UTC (rev 41609)
+++ trunk/blender/CMakeLists.txt 2011-11-07 12:55:18 UTC (rev 41610)
@@ -202,6 +202,9 @@
option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
+# Camera/motion tracking
+option(WITH_LIBMV "Enable libmv structure from motion library" ON)
+
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2011-11-07 12:50:26 UTC (rev 41609)
+++ trunk/blender/build_files/scons/tools/Blender.py 2011-11-07 12:55:18 UTC (rev 41610)
@@ -329,6 +329,10 @@
if env['WITH_BF_SDL']:
defs.append('WITH_SDL')
+ if env['WITH_BF_LIBMV']:
+ incs.append('#/extern/libmv')
+ defs.append('WITH_LIBMV')
+
if env['WITH_BF_PYTHON']:
incs.append('#/source/blender/python')
defs.append('WITH_PYTHON')
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2011-11-07 12:50:26 UTC (rev 41609)
+++ trunk/blender/build_files/scons/tools/btools.py 2011-11-07 12:55:18 UTC (rev 41610)
@@ -515,6 +515,8 @@
(BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
(BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
+ (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
+
('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
# (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt 2011-11-07 12:50:26 UTC (rev 41609)
+++ trunk/blender/extern/CMakeLists.txt 2011-11-07 12:55:18 UTC (rev 41610)
@@ -63,3 +63,7 @@
if(WITH_LZMA)
add_subdirectory(lzma)
endif()
+
+if(WITH_LIBMV)
+ add_subdirectory(libmv)
+endif()
Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript 2011-11-07 12:50:26 UTC (rev 41609)
+++ trunk/blender/extern/SConscript 2011-11-07 12:55:18 UTC (rev 41610)
@@ -28,3 +28,6 @@
if env['WITH_BF_LZMA']:
SConscript(['lzma/SConscript'])
+
+if env['WITH_BF_LIBMV']:
+ SConscript(['libmv/SConscript'])
Added: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt (rev 0)
+++ trunk/blender/extern/libmv/CMakeLists.txt 2011-11-07 12:55:18 UTC (rev 41610)
@@ -0,0 +1,210 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Blender Foundation,
+# Sergey Sharybin
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+ .
+ ../Eigen3
+ ./third_party/ssba
+ ./third_party/ldl/Include
+ ../colamd/Include
+)
+
+set(INC_SYS
+ ${PNG_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
+)
+
+set(SRC
+ libmv-capi.cpp
+ libmv/numeric/numeric.cc
+ libmv/numeric/poly.cc
+ libmv/simple_pipeline/reconstruction.cc
+ libmv/simple_pipeline/resect.cc
+ libmv/simple_pipeline/intersect.cc
+ libmv/simple_pipeline/initialize_reconstruction.cc
+ libmv/simple_pipeline/camera_intrinsics.cc
+ libmv/simple_pipeline/pipeline.cc
+ libmv/simple_pipeline/detect.cc
+ libmv/simple_pipeline/tracks.cc
+ libmv/simple_pipeline/bundle.cc
+ libmv/image/convolve.cc
+ libmv/image/array_nd.cc
+ libmv/tracking/pyramid_region_tracker.cc
+ libmv/tracking/sad.cc
+ libmv/tracking/trklt_region_tracker.cc
+ libmv/tracking/klt_region_tracker.cc
+ libmv/tracking/retrack_region_tracker.cc
+ libmv/multiview/projection.cc
+ libmv/multiview/conditioning.cc
+ libmv/multiview/fundamental.cc
+ libmv/multiview/euclidean_resection.cc
+ libmv/multiview/triangulation.cc
+
+ third_party/ssba/Geometry/v3d_metricbundle.cpp
+ third_party/ssba/Math/v3d_optimization.cpp
+ third_party/gflags/gflags.cc
+ third_party/gflags/gflags_reporting.cc
+ third_party/gflags/gflags_completions.cc
+ third_party/fast/fast_9.c
+ third_party/fast/fast_10.c
+ third_party/fast/fast_11.c
+ third_party/fast/fast_12.c
+ third_party/fast/fast.c
+ third_party/fast/nonmax.c
+ third_party/ldl/Source/ldl.c
+
+ libmv-capi.h
+ libmv/logging/logging.h
+ libmv/numeric/dogleg.h
+ libmv/numeric/levenberg_marquardt.h
+ libmv/numeric/poly.h
+ libmv/numeric/function_derivative.h
+ libmv/numeric/numeric.h
+ libmv/simple_pipeline/resect.h
+ libmv/simple_pipeline/reconstruction.h
+ libmv/simple_pipeline/camera_intrinsics.h
+ libmv/simple_pipeline/tracks.h
+ libmv/simple_pipeline/detect.h
+ libmv/simple_pipeline/pipeline.h
+ libmv/simple_pipeline/intersect.h
+ libmv/simple_pipeline/bundle.h
+ libmv/simple_pipeline/initialize_reconstruction.h
+ libmv/image/convolve.h
+ libmv/image/tuple.h
+ libmv/image/array_nd.h
+ libmv/image/sample.h
+ libmv/image/image.h
+ libmv/tracking/region_tracker.h
+ libmv/tracking/retrack_region_tracker.h
+ libmv/tracking/sad.h
+ libmv/tracking/pyramid_region_tracker.h
+ libmv/tracking/trklt_region_tracker.h
+ libmv/tracking/klt_region_tracker.h
+ libmv/base/id_generator.h
+ libmv/base/vector.h
+ libmv/base/scoped_ptr.h
+ libmv/base/vector_utils.h
+ libmv/multiview/nviewtriangulation.h
+ libmv/multiview/resection.h
+ libmv/multiview/euclidean_resection.h
+ libmv/multiview/triangulation.h
+ libmv/multiview/projection.h
+ libmv/multiview/fundamental.h
+ libmv/multiview/conditioning.h
+
+ third_party/ssba/Geometry/v3d_metricbundle.h
+ third_party/ssba/Geometry/v3d_cameramatrix.h
+ third_party/ssba/Geometry/v3d_distortion.h
+ third_party/ssba/Math/v3d_linear_utils.h
+ third_party/ssba/Math/v3d_optimization.h
+ third_party/ssba/Math/v3d_mathutilities.h
+ third_party/ssba/Math/v3d_linear.h
+ third_party/gflags/gflags_completions.h
+ third_party/gflags/mutex.h
+ third_party/gflags/config.h
+ third_party/gflags/gflags.h
+ third_party/fast/fast.h
+ third_party/ldl/Include/ldl.h
+ third_party/msinttypes/stdint.h
+ third_party/msinttypes/inttypes.h
+)
+
+IF(WIN32)
+ list(APPEND SRC
+ third_party/glog/src/logging.cc
+ third_party/glog/src/raw_logging.cc
+ third_party/glog/src/utilities.cc
+ third_party/glog/src/vlog_is_on.cc
+ third_party/glog/src/windows/port.cc
+
+ third_party/glog/src/utilities.h
+ third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_x86_64-inl.h
+ third_party/glog/src/base/googleinit.h
+ third_party/glog/src/base/mutex.h
+ third_party/glog/src/base/commandlineflags.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
+ third_party/glog/src/config.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/windows/glog/raw_logging.h
+ third_party/glog/src/windows/glog/vlog_is_on.h
+ third_party/glog/src/windows/glog/logging.h
+ third_party/glog/src/windows/glog/log_severity.h
+ third_party/glog/src/windows/port.h
+ third_party/glog/src/windows/config.h
+ )
+
+ list(APPEND INC
+ ./third_party/glog/src/windows
+ ./third_party/msinttypes
+ )
+
+ IF(MSVC)
+ set(MSVC_OFLAGS O1 O2 Ox)
+ foreach(FLAG )
+ string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
+ string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
+ endforeach()
+ ENDIF(MSVC)
+ELSE(WIN32)
+ list(APPEND SRC
+ third_party/glog/src/utilities.cc
+ third_party/glog/src/symbolize.cc
+ third_party/glog/src/vlog_is_on.cc
+ third_party/glog/src/signalhandler.cc
+ third_party/glog/src/logging.cc
+ third_party/glog/src/demangle.cc
+ third_party/glog/src/raw_logging.cc
+
+ third_party/glog/src/utilities.h
+ third_party/glog/src/stacktrace_generic-inl.h
+ third_party/glog/src/config_mac.h
+ third_party/glog/src/stacktrace.h
+ third_party/glog/src/stacktrace_x86_64-inl.h
+ third_party/glog/src/symbolize.h
+ third_party/glog/src/base/googleinit.h
+ third_party/glog/src/base/mutex.h
+ third_party/glog/src/base/commandlineflags.h
+ third_party/glog/src/stacktrace_powerpc-inl.h
+ third_party/glog/src/stacktrace_x86-inl.h
+ third_party/glog/src/config.h
+ third_party/glog/src/demangle.h
+ third_party/glog/src/stacktrace_libunwind-inl.h
+ third_party/glog/src/glog/raw_logging.h
+ third_party/glog/src/glog/vlog_is_on.h
+ third_party/glog/src/glog/logging.h
+ third_party/glog/src/glog/log_severity.h
+ third_party/glog/src/config_linux.h
+ )
+
+ list(APPEND INC
+ ./third_party/glog/src
+ )
+ENDIF(WIN32)
+
+add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
+
+blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
Added: trunk/blender/extern/libmv/ChangeLog
===================================================================
--- trunk/blender/extern/libmv/ChangeLog (rev 0)
+++ trunk/blender/extern/libmv/ChangeLog 2011-11-07 12:55:18 UTC (rev 41610)
@@ -0,0 +1,312 @@
+commit 531c79bf95fddaaa70707d1abcd4fdafda16bbf0
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date: Sat Aug 20 00:00:42 2011 +0200
+
+ Display warped pattern in marker preview.
+
+commit bb5c27e671b6f8eb56ddf490f0795d59bede591b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list