Commit Graph

5668 Commits

Author SHA1 Message Date
Sergey Sharybin
22e08353e2 Merging r38562 through r38614 from trunkinto soc-2011-tomato 2011-07-22 16:58:22 +00:00
Sergey Sharybin
478e42970c Camera tracking integration
===========================

- Operator "Join Selected Tracks".
  This operator joins all selected tracks to active track.
  Hotkey is Ctrl-J.
- Operator "Select Grouped".
  Now it's easy to select all locked/keyframes/etc markers.
  Hotkey is Shit-G.
- Operator to jump to beginning/end of active path.
  Hotkeys are Shift+Ctrl+Arrow Left/Right.
- Operator to copy color from active track to all tracks.
2011-07-22 16:18:51 +00:00
Campbell Barton
6040a28f03 missed this file when adding option to disable frameserver 2011-07-22 00:34:03 +00:00
Campbell Barton
e6604288c8 cmake - option to disable the frame server 2011-07-21 23:06:51 +00:00
Sergey Sharybin
a3a3185ef1 Camera tracking integration
===========================

Second attempt to fix log2f issue. Should work now.
2011-07-21 17:02:04 +00:00
Sergey Sharybin
48405704e8 Camera tracking integration
===========================

Attempt to fix undefined log2f function.
2011-07-21 16:56:44 +00:00
Sergey Sharybin
0de7e49a10 Merging r38516 through r38561 from trunk into soc-2011-tomato 2011-07-21 15:04:41 +00:00
Sergey Sharybin
a48039507f Camera tracking integration
===========================

Forgot to initialize aspect ratio for opening clip.
2011-07-21 14:59:56 +00:00
Sergey Sharybin
1c971862bd Camera tracking integration
===========================

- Fixed discovered bug with selecting hidden marker areas with mouse.
- Refactor of context structure used for 2D tracking:
  * Tracker object is now per-track. This allows to use
    different pyramid levels for different tracks and
    now search area resizing shouldn't make tracking less
    accurate.
  * This is also be used for new optimized libmv API.
  * This allowed to use OpenMP to track different markers in
    separated threads.
    This allowed to reach quite cool speedup for multi-core CPU.
2011-07-21 14:56:13 +00:00
Campbell Barton
28780342ed fix/workaround [#28040] float images reduced to 256 levels per channel upon save
Generated images would not be re-generated with a float buffer on load, even when selected on creation.
Now save the float buffer setting as a generated image flag.

This means you can enable before baking to enable baking to a float buffer.
2011-07-21 00:41:00 +00:00
Sergey Sharybin
ac57527895 Camera tracking integration
===========================

- Fixed crash when holding down S and R keys.
- Fixed deleting of first marker.
- Tracking should now work fine with float buffers.
- Added option to show distortion grid. It's most probably
  temporary solution until [auto]calibration tools aren't
  merged.
  This grid defines straight lines on the image.
2011-07-20 20:31:25 +00:00
Sergey Sharybin
0fec30a35f Camera tracking integration
===========================

- Internal change: do not use maroses for checking the only
  one bit of track/marker flags.
- Do not display track name for disabled markers when
  "Show Disabled" is turned off.
- Option to lock tracks. Locked tracks can't be be moved,
  scaled, re-tracked and so.
2011-07-20 10:51:47 +00:00
Sergey Sharybin
a53fc2d306 Camera tracking integration
===========================

- Selected bundles are now highlighted with outline.
  It looks more Blender-way of highlighting selected items.
- Added option to show bundles names in 3D viewport.
- Bundles now coudl be selected from 3D viewport.
2011-07-19 20:22:03 +00:00
Sergey Sharybin
b9c6a20354 Merging r38454 through r38515 from trunk into soc-2011-tomato 2011-07-19 19:58:01 +00:00
Sergey Sharybin
53f5ca931e Camera tracking integration
===========================

- Fixed smal lbug with mouse selection.
- Added option to show tracks names and their states
  (disabled, keyframed, estimated, tracked).
2011-07-19 12:42:01 +00:00
Sergey Sharybin
146a184d2a Camera tracking integration
===========================

- Remove set but not used variable in clip buttons.
- Set keyframe when sliding marker with mouse.
- Also set keyframe when sliding from preview widget.
2011-07-19 10:40:22 +00:00
Campbell Barton
ce0ad0b40b fix [#28018] Sequence Swap Data Operator does not work 2011-07-19 01:36:59 +00:00
Sergey Sharybin
426ca2ef89 Camera tracking integration
===========================

- Enable disabled markers when sliding from preview.
- Refresh space clip when marker is moving from preview.
2011-07-18 19:06:18 +00:00
Sergey Sharybin
23bffd1742 Camera tracking integration
===========================

Changed behavior of "Follow Track" constraint for tracks.

Now tracking coordinates are mapped to plane which is
parallel to camera view plane.
2011-07-18 18:45:05 +00:00
Sergey Sharybin
3a6ea7b5e1 Camera tracking integration
===========================

- Track preview widget is now resizeable.
- Marker position could now be adjusted from track
  preview widget.
2011-07-18 14:54:32 +00:00
Janne Karhu
9469f0d0af Bug fix: particle cache should only be cleared on the exact first integer frame, not in the case of a subframe between the first and second frame. 2011-07-18 02:40:54 +00:00
Sergey Sharybin
e0d5fd02ac Camera tracking integration
===========================

Added compositor node "Movie Clip"

There could be some problems due to bug #27997, but
heneral workflow works fine here.
2011-07-17 17:26:32 +00:00
Sergey Sharybin
b18dd20aea Merging r38433 through r38453 from trunk into soc-2011-tomato 2011-07-17 17:25:11 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Campbell Barton
410c5e3cd2 cmake source definitions:
remove missing includes and use more strict formatting.
2011-07-16 23:01:14 +00:00
Sergey Sharybin
a56a5e0e6f Camera tracking integration
===========================

- Silent compilator's warning about possible uninitialized
  variable usage in set floor operator.
- Check tracks cound on both of keyframes before reconstruction.
- Refresh 3d viewport when deleting track with bundle.
2011-07-16 10:30:51 +00:00
Sergey Sharybin
864071a512 Camera tracking integration
===========================

- Bundle re-newed libmv library.
- Update API in libmv-capi to match new library.
- Initial implementaition of feature detection.
- Fixed bug with incorrect user sync when tracking
  for first frame.
2011-07-15 20:44:19 +00:00
Sergey Sharybin
6be184e45e Camera tracking integration
===========================

Changes to tracking camers settings, so they could
be copied to Blender camera on reconstruction.

Sensor height doesn't make any sense yet for tracking camera.
2011-07-14 15:21:55 +00:00
Sergey Sharybin
db5b89a320 Camera tracking integration
===========================

Commiting patch #24427: Editable camera sensor size (meaningful focal length units)

Thanks to:
  Matt Ebb (author of original patch)
  Ejner Fergo (porting patch through versions)
  Brecht Van Lommel, Dalai Felinto, Campbell Barton (patch review)

Cant't commit changes to addons (they aren't branched, so some of them
could be broken now)
2011-07-14 15:21:45 +00:00
Sergey Sharybin
a889ffad1c Camera tracking integration
===========================

Initial implementation of Scale operator.

There's no access from operator panel to operators defined for
Clip Editor space, so distance can't be controlled as operator
property.
Added new property to MovieTrackingSettings for this.
2011-07-14 12:52:50 +00:00
Sergey Sharybin
be73c3bd4c Camera tracking integration
===========================

Small fixes and features:
- Fixed broken toolshelf for empty space clip.
- Added option to hide disabled tracks.
- Do not send disabled markers to tracking job.
- Fixed bug with disabling marker when tracking backwards.
- Fixed bug with unset principal point by default.
- Hide bundle projection for disabled markers.
- Flip orientation when hitting "Set Axis" when bundle is
  already defines axis.
2011-07-14 12:05:40 +00:00
Sergey Sharybin
ab57128825 Merging r38364 through r38389 from trunk into soc-2011-tomato 2011-07-14 12:04:21 +00:00
Campbell Barton
1fd33b6e77 cmake option to build without smoke sim: WITH_MOD_SMOKE 2011-07-13 18:40:21 +00:00
Campbell Barton
5e841e4b4a fix for animation playback and build error when compiling without WITH_AUDASPACE 2011-07-13 17:24:33 +00:00
Sergey Sharybin
dd0d761f48 Camera tracking integration
===========================

Previous solution to make bundles work for parented camera
wasn't very nice. It could totally confuse depsgraph and it's
quite slow.

Now i've implemented function where_is_object_mat which makes
almost the same as where_is_object_time, but it:
- Does not applies constraints.
- Assumes matrices for all dependencies are valie already
  (handles by depsgraph).
- Doesn't make any changes to object itself or it's
  dependencies.
2011-07-13 10:30:42 +00:00
Sergey Sharybin
fa34bcf6ee Camera tracking integration
===========================

Attempt to fix bundles position for case scene camera has got
other constraints than CameraSolver (mostly to support camera
parenting to other object for scene orientation).

Use a bit silly logic to calculate camera matrix to orient
bundles in 3d space: temporary disable all CameraSolver
constraints for camera, re-calculate object matrix, use it
to orient bundles and clear temporary flag.

This allows to parent both of camera and mesh created from
bundles to the same Empty object and both of bundles and
mesh vertices would have the same coords in camera space.

Also removed copying of location/rotation from camera to
bundles object in "Bundles to Mesh" operator.
2011-07-13 08:26:33 +00:00
Sergey Sharybin
d89d162e28 Camera tracking integration
===========================

- Fixed buf with under reference for Follow Track constraint.
- Get rid of BKE_movieclip_approx_size. Rather than accessing
  to cache with previously set frame number it'll be easier to
  store size of last accessed in "runtime" DNA.
2011-07-12 13:35:25 +00:00
Sergey Sharybin
222a198cd4 Camera tracking integration
===========================

This should been never gone outside of my local working tree.
2011-07-12 08:43:21 +00:00
Sergey Sharybin
94779fd9b5 Merging r38296 through r38315 from trunk into soc-2011-tomato 2011-07-11 18:18:42 +00:00
Sergey Sharybin
2543e01052 Camera tracking integration
===========================

- Fixed incorrect usage of RNA structure for
  CameraSolverConstraint.
- Fixed some typos in object_constraint which were
  casting CameraSolver data to FollowTrack data.
- Tracking-related constraints now have got option
  "Use Defult Clip" which makes them use clip set as
  active for scene. Enabled by default.
- Set active blender camera focal length after reconstruction.
- Corrected offset of sequence images. Now first image from sequence
  should be at scene frame 1.
2011-07-11 17:13:27 +00:00
Sergey Sharybin
ef5b107b3b Camera tracking integration
===========================

- Minor spelling fixes.
- Do not draw bundles for hidden tracks in SpaceClip.
- Pressing SHift when sliding marker with mouse makes movenment more accurate.
- New default values for maerker pattern/search areas.
  This makes tracking more stable.
- Pyramid level increased to 4. This would make tracking
  of blured imaged more accurate.
2011-07-11 12:38:44 +00:00
Brecht Van Lommel
7dfe34864e Fix #27912: crash after mesh.materials.pop(). 2011-07-11 09:08:08 +00:00
Brecht Van Lommel
8ca556a32a Fix #27921: optimal display with 2 subsurf modifiers fails. 2011-07-11 09:05:10 +00:00
Sergey Sharybin
08bd300f0e Camera tracking integration
===========================

- Changed libmv api to use doubles instead of floats.
  No real benefit rather than keeping API uniform.
- Optimized reconstructed camera search. It's optimized for
  playback, not random access.
- Added option to show projection of bundles into footage.
  To see bundles "Show Bundles" from Display panel should
  be enabled. Used very rough limit of 3 px to consider projection
  is fine. Colors are still hard-coded. Not sure it could be useful
  to make them configurable.
- Added option to mute footage. It could be useful to check
  if markers/bundles are moving smoothly.
- Added selector for focal length units.
2011-07-11 09:04:00 +00:00
Sergey Sharybin
1135dbcc36 Merging r38265 through r38295 from trunk into soc-2011-tomato 2011-07-11 08:43:34 +00:00
Janne Karhu
897cbe4b42 Fix for [#27398] Particle systems with animated groups render incorrectly in viewport
* Hmph.. depsgraph and group duplication == illogical.
2011-07-10 23:49:59 +00:00
Janne Karhu
2fb4a37baa Fix for [#27289] Hair: Render Option - Object does not point objects to end of "hair path"
* Objects are now always rotated in the directions of the hair paths
* Secondary fix: particle size wasn't updated for hair particles, so dupliobject size couldn't be change after the hair was edited
2011-07-10 17:30:31 +00:00
Janne Karhu
de7592b489 Fix for [#26873] Animated displacement modifier on an object doesn't work with hair particle objects
* Noise is now considered an animated texture as it changes with every frame
* Converted a few places in particles code to use the particle system's own random table instead of BLI_frand.
2011-07-10 17:04:56 +00:00
Sergey Sharybin
b16a448e8d Camera tracking integration
===========================

Clean-up: animation data is not necessery in MovieClip. Removing.

It'll be easy to add it back just reverting this commit.
2011-07-09 19:57:29 +00:00
Sergey Sharybin
964c3cb0fa Camera tracking integration
===========================

- Implemented hide/show track functionality.
- Small re-exposing Marker menu into UI.
  Now it's called "Track". Added new operators there.
- Set reconstructed clip as active to scene.
2011-07-09 19:51:23 +00:00