Merge plane track feature from tomato branch
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Aug 2013 09:46:30 +0000 (09:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Aug 2013 09:46:30 +0000 (09:46 +0000)
commit24ce60cfe4511534e57a2dea3f24579c74bbdd29
tree57df16e6d5f41545e1379f8a51e0e10fe6b2eef1
parentcab2aef71ab44bc7d85cf4e2c1de607d02e0df7d
Merge plane track feature from tomato branch

This commit includes all the changes made for plane tracker
in tomato branch.

Movie clip editor changes:

- Artist might create a plane track out of multiple point
  tracks which belongs to the same track (minimum amount of
  point tracks is 4, maximum is not actually limited).

  When new plane track is added, it's getting "tracked"
  across all point tracks, which makes it stick to the same
  plane point tracks belong to.

- After plane track was added, it need to be manually adjusted
  in a way it covers feature one might to mask/replace.

  General transform tools (G, R, S) or sliding corners with
  a mouse could be sued for this. Plane corner which
  corresponds to left bottom image corner has got X/Y axis
  on it (red is for X axis, green for Y).

- Re-adjusting plane corners makes plane to be "re-tracked"
  for the frames sequence between current frame and next
  and previous keyframes.

- Kayframes might be removed from the plane, using Shit-X
  (Marker Delete) operator. However, currently manual
  re-adjustment or "re-track" trigger is needed.

Compositor changes:

- Added new node called Plane Track Deform.

- User selects which plane track to use (for this he need
  to select movie clip datablock, object and track names).

- Node gets an image input, which need to be warped into
  the plane.

- Node outputs:
  * Input image warped into the plane.
  * Plane, rasterized to a mask.

Masking changes:

- Mask points might be parented to a plane track, which
  makes this point deforming in a way as if it belongs
  to the tracked plane.

Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578

This is mine and Keir's holiday code project :)
48 files changed:
extern/libmv/libmv-capi.cc
extern/libmv/libmv-capi.h
extern/libmv/libmv-capi_stub.cc
release/scripts/startup/bl_ui/properties_mask_common.py
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_tracking.h
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/compositor/CMakeLists.txt
source/blender/compositor/intern/COM_Converter.cpp
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h [new file with mode: 0644]
source/blender/editors/mask/mask_relationships.c
source/blender/editors/mask/mask_shapekey.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_clip/clip_intern.h
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_clip/tracking_select.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_mask_types.h
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_tracking_types.h
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_composite.h
source/blender/nodes/NOD_static_types.h
source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c [new file with mode: 0644]