From 98841291173614410fca3b9db1cd0ee320d9eb84 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 5 Nov 2011 13:00:39 +0000 Subject: Code refactoring: split camera functions from object.c into new camera.c. --- source/blender/blenkernel/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenkernel/CMakeLists.txt') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 1b98dd914aa..ba6776e1864 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -76,6 +76,7 @@ set(SRC intern/brush.c intern/bullet.c intern/bvhutils.c + intern/camera.c intern/cdderivedmesh.c intern/cloth.c intern/collision.c @@ -160,6 +161,7 @@ set(SRC BKE_brush.h BKE_bullet.h BKE_bvhutils.h + BKE_camera.h BKE_cdderivedmesh.h BKE_cloth.h BKE_collision.h -- cgit v1.2.3 From 647447db58ed7d3abd0ddeb627110069042e28fe Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 5 Nov 2011 13:11:49 +0000 Subject: Code refactoring: split lamp functions from object.c into new lamp.c. --- source/blender/blenkernel/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenkernel/CMakeLists.txt') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index ba6776e1864..78b1b52e52c 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -104,6 +104,7 @@ set(SRC intern/implicit.c intern/ipo.c intern/key.c + intern/lamp.c intern/lattice.c intern/library.c intern/material.c @@ -187,6 +188,7 @@ set(SRC BKE_image.h BKE_ipo.h BKE_key.h + BKE_lamp.h BKE_lattice.h BKE_library.h BKE_main.h -- cgit v1.2.3 From 27d42c63d9b507b1771ed5a7923c389c719b877b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 7 Nov 2011 12:55:18 +0000 Subject: 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. --- source/blender/blenkernel/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source/blender/blenkernel/CMakeLists.txt') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 78b1b52e52c..df4e247bc93 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -112,6 +112,7 @@ set(SRC intern/mesh.c intern/mesh_validate.c intern/modifier.c + intern/movieclip.c intern/multires.c intern/nla.c intern/node.c @@ -140,6 +141,7 @@ set(SRC intern/suggestions.c intern/text.c intern/texture.c + intern/tracking.c intern/unit.c intern/world.c intern/writeavi.c @@ -196,6 +198,7 @@ set(SRC BKE_mball.h BKE_mesh.h BKE_modifier.h + BKE_movieclip.h BKE_multires.h BKE_nla.h BKE_node.h @@ -222,6 +225,7 @@ set(SRC BKE_suggestions.h BKE_text.h BKE_texture.h + BKE_tracking.h BKE_unit.h BKE_utildefines.h BKE_world.h @@ -365,6 +369,11 @@ if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() +if(WITH_LIBMV) + list(APPEND INC ../../../extern/libmv) + add_definitions(-DWITH_LIBMV) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -- cgit v1.2.3