[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39482] branches/soc-2011-salad: Merging r39395 through r39481 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Wed Aug 17 09:40:40 CEST 2011
Revision: 39482
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39482
Author: nazgul
Date: 2011-08-17 07:40:40 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Merging r39395 through r39481 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39395
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39481
Modified Paths:
--------------
branches/soc-2011-salad/extern/libmv/CMakeLists.txt
branches/soc-2011-salad/extern/libmv/ChangeLog
branches/soc-2011-salad/extern/libmv/files.txt
branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
branches/soc-2011-salad/extern/libmv/libmv-capi.h
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/editors/include/UI_interface.h
branches/soc-2011-salad/source/blender/editors/interface/interface_regions.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-salad/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-salad/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-salad/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-salad/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39479
/branches/soc-2011-tomato:36831-39394
/trunk/blender:36834-39447
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39479
/branches/soc-2011-tomato:36831-39481
/trunk/blender:36834-39477
Modified: branches/soc-2011-salad/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/extern/libmv/CMakeLists.txt 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/CMakeLists.txt 2011-08-17 07:40:40 UTC (rev 39482)
@@ -52,6 +52,7 @@
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
@@ -97,6 +98,7 @@
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
Modified: branches/soc-2011-salad/extern/libmv/ChangeLog
===================================================================
--- branches/soc-2011-salad/extern/libmv/ChangeLog 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/ChangeLog 2011-08-17 07:40:40 UTC (rev 39482)
@@ -1,3 +1,22 @@
+commit a1d9a8fa8b01ef7cf2a79b3b891633fc333fc9cf
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date: Tue Aug 16 21:24:51 2011 +0200
+
+ Fix SAD tracker. Pattern was transposed by affine pattern sampler.
+
+commit c3b794da2e7fd23f2fbdf90dbd71de0e6b3bc811
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date: Tue Aug 16 21:19:02 2011 +0200
+
+ Fix SAD tracker. Pattern was transposed by affine pattern sampler.
+
+commit a9b61bf3356f27174cdd983f562f99c3a6a2cc35
+Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
+Date: Sun Aug 14 09:56:51 2011 +0200
+
+ Clarify CameraIntrinsics documentation.
+ Edit CameraInstrinsics test to fail.
+
commit 10bdad9ad2cea2603896263cde5a5339169a9af0
Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
Date: Fri Aug 12 21:05:32 2011 +0200
@@ -342,79 +361,3 @@
Date: Sun Jul 17 16:35:48 2011 +0200
Use deprecated FFmpeg API.
-
-commit 09b090a20134a8ccef273d802752bbf475ff5280
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Sat Jul 16 21:19:14 2011 +0200
-
- Fix loading cache directly after creation.
-
-commit 1190584f6ca60fb74188cac36c61333951244026
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Sat Jul 16 20:02:36 2011 +0200
-
- Add custom FileDialog to handle multiple files and folders selection in the same dialog
-
-commit 50504af3d0fc11665483aed524d52d076f38ffa8
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Jul 15 23:34:41 2011 +0200
-
- Fix mistake.
-
-commit a8e322a2c37cc87acd864d94a354334d611b9750
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Jul 15 22:25:51 2011 +0200
-
- Use cache even on first run (i.e don't load all images on the heap).
-
-commit 66ac3b5833a1fd4fbd97b082db6ddf859b33811c
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Jul 15 21:15:45 2011 +0200
-
- Improve Zoom View.
-
-commit dec996966d5466717a813da2d8b9962115dfc8ac
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Jul 15 20:04:06 2011 +0200
-
- Detect API documentation.
-
-commit bfc07bd0940bba0d5439ccd0297368607db514be
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Jul 15 16:22:52 2011 +0200
-
- Refactor Qt Tracker.
- Create Detect API.
- Improve CameraIntrinsics API.
- Put Calibration settings UI in a QDockWidget.
- Support anamorphic.
-
- TODO: Finish new Zoom widget.
-
-commit e59595806c045916ab4ef15ef7047c1a728b2da9
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Thu Jul 14 22:29:06 2011 +0200
-
- Use FAST detector.
-
- FAST is much faster and works much better than the "Good Features to Track algorithm".
-
-commit 17c036e9f8c6529c2f771fdd9dc73f3022e36c77
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Wed Jul 13 22:23:40 2011 +0200
-
- Add visualization of image filtering operations.
-
-commit c4f71e17b6b72acc0f863906c01c87d53e8bbb2c
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Wed Jul 13 10:37:26 2011 +0200
-
- Simplify feature detection.
-
-commit d8109b7a4fede1660e0dbd73735f1a9e3fd79eec
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Wed Jul 13 10:21:52 2011 +0200
-
- Add feature detection.
-
- Remove unused keyframe selection code.
Modified: branches/soc-2011-salad/extern/libmv/files.txt
===================================================================
--- branches/soc-2011-salad/extern/libmv/files.txt 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/files.txt 2011-08-17 07:40:40 UTC (rev 39482)
@@ -34,9 +34,11 @@
libmv/image/image.h
libmv/tracking/pyramid_region_tracker.cc
libmv/tracking/region_tracker.h
+libmv/tracking/sad.cc
libmv/tracking/trklt_region_tracker.cc
libmv/tracking/klt_region_tracker.cc
libmv/tracking/retrack_region_tracker.h
+libmv/tracking/sad.h
libmv/tracking/pyramid_region_tracker.h
libmv/tracking/trklt_region_tracker.h
libmv/tracking/retrack_region_tracker.cc
Modified: branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
===================================================================
--- branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h 2011-08-17 07:40:40 UTC (rev 39482)
@@ -65,7 +65,7 @@
/*!
Apply camera intrinsics to the normalized point to get image coordinates.
- This applies the camera intrinsics to a point which is in normalized
+ This applies the lens distortion to a point which is in normalized
camera coordinates (i.e. the principal point is at (0, 0)) to get image
coordinates in pixels.
*/
@@ -75,7 +75,7 @@
/*!
Invert camera intrinsics on the image point to get normalized coordinates.
- This reverses the effect of camera intrinsics on a point which is in image
+ This reverses the effect of lens distortion on a point which is in image
coordinates to get normalized camera coordinates.
*/
void InvertIntrinsics(double image_x, double image_y,
Modified: branches/soc-2011-salad/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/soc-2011-salad/extern/libmv/libmv-capi.cpp 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/libmv-capi.cpp 2011-08-17 07:40:40 UTC (rev 39482)
@@ -40,6 +40,8 @@
#include "libmv/tracking/pyramid_region_tracker.h"
#include "libmv/tracking/retrack_region_tracker.h"
+#include "libmv/tracking/sad.h"
+
#include "libmv/simple_pipeline/tracks.h"
#include "libmv/simple_pipeline/initialize_reconstruction.h"
#include "libmv/simple_pipeline/bundle.h"
@@ -307,6 +309,31 @@
/* ************ Tracks ************ */
+void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+ float warp[3][3], unsigned char *pattern)
+{
+ float mat3[9];
+
+ memcpy(mat3, warp, sizeof(float)*9);
+
+ libmv::SamplePattern(image, stride, mat3, pattern);
+}
+
+int libmv_SADTrackerTrack(unsigned char *pattern, unsigned char *image, int stride,
+ int width, int height, double *x, double *y)
+{
+ float x2, y2;
+
+ int result = libmv::Track(pattern, image, stride, width, height, &x2, &y2);
+
+ *x= x2;
+ *y= y2;
+
+ return result;
+}
+
+/* ************ Tracks ************ */
+
libmv_Tracks *libmv_tracksNew(void)
{
libmv::Tracks *libmv_tracks = new libmv::Tracks();
Modified: branches/soc-2011-salad/extern/libmv/libmv-capi.h
===================================================================
--- branches/soc-2011-salad/extern/libmv/libmv-capi.h 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/extern/libmv/libmv-capi.h 2011-08-17 07:40:40 UTC (rev 39482)
@@ -50,6 +50,12 @@
double x1, double y1, double *x2, double *y2);
void libmv_regionTrackerDestroy(struct libmv_RegionTracker *libmv_tracker);
+/* SAD Tracker */
+void libmv_SADSamplePatternByte(unsigned char *image, int stride,
+ float warp[3][3], unsigned char *pattern);
+int libmv_SADTrackerTrack(unsigned char *pattern, unsigned char *image, int stride,
+ int width, int height, double *x, double *y);
+
/* Tracks */
struct libmv_Tracks *libmv_tracksNew(void);
void libmv_tracksInsert(struct libmv_Tracks *libmv_tracks, int image, int track, double x, double y);
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-08-17 07:28:42 UTC (rev 39481)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_clip.py 2011-08-17 07:40:40 UTC (rev 39482)
@@ -21,9 +21,9 @@
from bpy.types import Operator, Panel, Header, Menu
-class CLIP_OT_apply_follow_track(Operator):
- bl_idname = "clip.apply_follow_track"
- bl_label = "Apply Follow Track"
+class CLIP_OT_track_to_empty(Operator):
+ bl_idname = "clip.track_to_empty"
+ bl_label = "2D Track to Emppty"
bl_options = {'UNDO', 'REGISTER'}
@classmethod
@@ -34,15 +34,25 @@
sc = context.space_data
clip = sc.clip
- return clip and clip.tracking.active_track and context.active_object
+ return clip and clip.tracking.active_track
def execute(self, context):
- ob = context.active_object
sc = context.space_data
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list