Revision: 38707
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38707
Author: nazgul
Date: 2011-07-25 18:15:05 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
Merging r38639 through r38706 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38639
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38706
Modified Paths:
--------------
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.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/space_clip.c
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_tracking_types.h
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/intern/audaspace/OpenAL/
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:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38638
/trunk/blender:36834-38704
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38706
/trunk/blender:36834-38704
Property changes on: branches/soc-2011-salad/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins/intern/audaspace/OpenAL:28499-37009
/branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot/intern/audaspace/OpenAL:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber/intern/audaspace/OpenAL:36829-36994
/branches/soc-2011-onion/intern/audaspace/OpenAL:36833-38309
/branches/soc-2011-pepper/intern/audaspace/OpenAL:36830-38208,38630
/branches/soc-2011-tomato/intern/audaspace/OpenAL:36831-38638
/trunk/blender/intern/audaspace/OpenAL:36834-38704
+ /branches/soc-2010-jwilkins/intern/audaspace/OpenAL:28499-37009
/branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot/intern/audaspace/OpenAL:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber/intern/audaspace/OpenAL:36829-36994
/branches/soc-2011-onion/intern/audaspace/OpenAL:36833-38309
/branches/soc-2011-pepper/intern/audaspace/OpenAL:36830-38208,38630
/branches/soc-2011-tomato/intern/audaspace/OpenAL:36831-38706
/trunk/blender/intern/audaspace/OpenAL:36834-38704
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
---
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-07-25 18:11:22 UTC (rev 38706)
+++
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-07-25 18:15:05 UTC (rev 38707)
@@ -95,6 +95,9 @@
('Script', 'SCRIPTS_WINDOW', 'WINDOW', []),
('Text', 'TEXT_EDITOR', 'WINDOW', []),
('Console', 'CONSOLE', 'WINDOW', []),
+ ('Console', 'CONSOLE', 'WINDOW', []),
+ ('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
+ ('Clip Globals', 'CLIP_EDITOR', 'WINDOW', []),
('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
('Gesture Border', 'EMPTY', 'WINDOW', []),
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
2011-07-25 18:11:22 UTC (rev 38706)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
2011-07-25 18:15:05 UTC (rev 38707)
@@ -4010,9 +4010,14 @@
len= len_v3(disp);
if(len>FLT_EPSILON) {
- float rmat[4][4];
+ float pos[2], rmat[4][4];
int is_ortho= 0;
+ user.framenr= scene->r.cfra;
+ marker= BKE_tracking_get_marker(track,
user.framenr);
+
+ add_v2_v2v2(pos, marker->pos, track->offset);
+
/* calculate lens and sensor size depends on
object type */
if(camob->type==OB_CAMERA) {
Camera *camera= (Camera *)camob->data;
@@ -4035,12 +4040,9 @@
ortho_scale= 0.f;
}
- user.framenr= scene->r.cfra;
- marker= BKE_tracking_get_marker(track,
user.framenr);
-
if(is_ortho) {
- vec[0]= ortho_scale *
(marker->pos[0]-0.5f);
- vec[1]= ortho_scale *
(marker->pos[1]-0.5f);
+ vec[0]= ortho_scale * (pos[0]-0.5f);
+ vec[1]= ortho_scale * (pos[1]-0.5f);
vec[2]= -len;
if(aspect>1.f) vec[1]/= aspect;
@@ -4057,8 +4059,8 @@
else {
d= (len*sensor_x) / (2.f*lens);
- vec[0]= d*(2.f*marker->pos[0]-1.f);
- vec[1]= d*(2.f*marker->pos[1]-1.f);
+ vec[0]= d*(2.f*pos[0]-1.f);
+ vec[1]= d*(2.f*pos[1]-1.f);
vec[2]= -len;
if(aspect>1.f) vec[1]/= aspect;
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
2011-07-25 18:11:22 UTC (rev 38706)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
2011-07-25 18:15:05 UTC (rev 38707)
@@ -120,20 +120,14 @@
}
}
- /* marker's center should be inside pattern */
+ /* marker's center should be in center of pattern */
if(event==CLAMP_PAT_DIM || event==CLAMP_PAT_POS) {
float dim[2];
sub_v2_v2v2(dim, track->pat_max, track->pat_min);
for(a= 0; a<2; a++) {
- if(track->pat_min[a] > 0.0f) {
- track->pat_min[a]= 0.0f;
- track->pat_max[a]= dim[a];
- }
- if(track->pat_max[a] < 0.0f) {
- track->pat_max[a]= 0.0f;
- track->pat_min[a]= -dim[a];
- }
+ track->pat_min[a]= -dim[a]/2.f;
+ track->pat_max[a]= dim[a]/2.f;
}
}
}
Modified:
branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.c
2011-07-25 18:11:22 UTC (rev 38706)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/clip_buttons.c
2011-07-25 18:15:05 UTC (rev 38707)
@@ -62,7 +62,7 @@
#include "clip_intern.h" // own include
#define B_MARKER_POS 3
-#define B_MARKER_PAT_POS 4
+#define B_MARKER_OFFSET 4
#define B_MARKER_PAT_DIM 5
#define B_MARKER_SEARCH_POS 6
#define B_MARKER_SEARCH_DIM 7
@@ -105,9 +105,9 @@
to_pixel_space(sc->marker_pos, marker->pos, width, height);
to_pixel_space(sc->track_pat, pat_dim, width, height);
- to_pixel_space(sc->track_pat_pos, pat_pos, width, height);
to_pixel_space(sc->track_search, search_dim, width, height);
to_pixel_space(sc->track_search_pos, search_pos, width, height);
+ to_pixel_space(sc->track_offset, track->offset, width, height);
sc->marker_flag= marker->flag;
@@ -122,17 +122,19 @@
block= uiLayoutAbsoluteBlock(col);
uiBlockBeginAlign(block);
- uiDefBut(block, LABEL, 0, "Position:", 0, 171, 300, 19, NULL, 0, 0, 0,
0, "");
- uiDefButF(block, NUM, B_MARKER_POS, "X:", 10, 152, 145, 19,
&sc->marker_pos[0],
+ uiDefBut(block, LABEL, 0, "Position:", 0, 190, 300, 19, NULL, 0, 0, 0,
0, "");
+ uiDefButF(block, NUM, B_MARKER_POS, "X:", 10, 171, 145, 19,
&sc->marker_pos[0],
-10*width, 10.0*width, step, digits, "X-position of marker at
frame in screen coordinates.");
- uiDefButF(block, NUM, B_MARKER_POS, "Y:", 165, 152, 145, 19,
&sc->marker_pos[1],
+ uiDefButF(block, NUM, B_MARKER_POS, "Y:", 165, 171, 145, 19,
&sc->marker_pos[1],
-10*height, 10.0*height, step, digits, "Y-position of marker at
frame in screen coordinates.");
- uiDefBut(block, LABEL, 0, "Pattern Area:", 0, 133, 300, 19, NULL, 0, 0,
0, 0, "");
- uiDefButF(block, NUM, B_MARKER_PAT_POS, "X:", 10, 114, 145, 19,
&sc->track_pat_pos[0],
- -width, width, step, digits, "X-position of pattern at frame in
screen coordinates relative to marker's position.");
- uiDefButF(block, NUM, B_MARKER_PAT_POS, "Y:", 165, 114, 145, 19,
&sc->track_pat_pos[1],
- -height, height, step, digits, "Y-position of pattern at frame
in screen coordinates relative to marker's position.");
+ uiDefBut(block, LABEL, 0, "Offset:", 0, 152, 300, 19, NULL, 0, 0, 0, 0,
"");
+ uiDefButF(block, NUM, B_MARKER_OFFSET, "X:", 10, 133, 145, 19,
&sc->track_offset[0],
+ -10*width, 10.0*width, step, digits, "X-offset to parenting
point.");
+ uiDefButF(block, NUM, B_MARKER_OFFSET, "Y:", 165, 133, 145, 19,
&sc->track_offset[1],
+ -10*height, 10.0*height, step, digits, "Y-offset to parenting
point.");
+
+ uiDefBut(block, LABEL, 0, "Pattern Area:", 0, 114, 300, 19, NULL, 0, 0,
0, 0, "");
uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Width:", 10, 95, 300, 19,
&sc->track_pat[0], 3.0f,
10.0*width, step, digits, "Width of marker's pattern in screen
soordinates.");
uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Height:", 10, 76, 300, 19,
&sc->track_pat[1], 3.0f,
@@ -171,31 +173,23 @@
ok= 1;
}
- else if(event==B_MARKER_PAT_POS) {
- float delta[2], side[2];
+ else if(event==B_MARKER_PAT_DIM) {
+ float dim[2], pat_dim[2];
- sub_v2_v2v2(side, track->pat_max, track->pat_min);
- mul_v2_fl(side, 0.5f);
+ sub_v2_v2v2(pat_dim, track->pat_max, track->pat_min);
- delta[0]= sc->track_pat_pos[0]/width;
- delta[1]= sc->track_pat_pos[1]/height;
+ dim[0]= sc->track_pat[0]/width;
+ dim[1]= sc->track_pat[1]/height;
- sub_v2_v2v2(track->pat_min, delta, side);
- add_v2_v2v2(track->pat_max, delta, side);
+ sub_v2_v2(dim, pat_dim);
+ mul_v2_fl(dim, 0.5f);
- BKE_tracking_clamp_track(track, CLAMP_PAT_POS);
+ track->pat_min[0]-= dim[0];
+ track->pat_min[1]-= dim[1];
- ok= 1;
- }
- else if(event==B_MARKER_PAT_DIM) {
- float dim[2];
+ track->pat_max[0]+= dim[0];
+ track->pat_max[1]+= dim[1];
- dim[0]= sc->track_pat[0]/width;
- dim[1]= sc->track_pat[1]/height;
-
- mul_v2_v2fl(track->pat_min, dim, -0.5);
- mul_v2_v2fl(track->pat_max, dim, 0.5);
-
BKE_tracking_clamp_track(track, CLAMP_PAT_DIM);
ok= 1;
@@ -217,14 +211,22 @@
ok= 1;
}
else if(event==B_MARKER_SEARCH_DIM) {
- float dim[2];
+ float dim[2], search_dim[2];
+ sub_v2_v2v2(search_dim, track->search_max, track->search_min);
+
dim[0]= sc->track_search[0]/width;
dim[1]= sc->track_search[1]/height;
- mul_v2_v2fl(track->search_min, dim, -0.5);
- mul_v2_v2fl(track->search_max, dim, 0.5);
+ sub_v2_v2(dim, search_dim);
+ mul_v2_fl(dim, 0.5f);
+ track->search_min[0]-= dim[0];
+ track->search_min[1]-= dim[1];
+
+ track->search_max[0]+= dim[0];
+ track->search_max[1]+= dim[1];
+
BKE_tracking_clamp_track(track, CLAMP_SEARCH_DIM);
ok= 1;
@@ -232,6 +234,11 @@
marker->flag= sc->marker_flag;
ok= 1;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
