[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37910] branches/soc-2011-tomato/source/ blender: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Tue Jun 28 17:46:38 CEST 2011
Revision: 37910
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37910
Author: nazgul
Date: 2011-06-28 15:46:38 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Fixed bug with drawing cache line for marker states.
It worked correct for cases, when start frame was 1.
- Added color codes for path parts before current frame and
after current frame.
- Added color code for disabled marker. Color is specifying for
unselected disabled marker. Color for selected marker is
calculating automatically. Color for active disabled marker
is equal to the enabled active marker.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
Modified: branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h 2011-06-28 15:43:03 UTC (rev 37909)
+++ branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h 2011-06-28 15:46:38 UTC (rev 37910)
@@ -248,7 +248,10 @@
TH_MARKER,
TH_ACT_MARKER,
TH_SEL_MARKER,
- TH_BUNDLE_SOLID
+ TH_BUNDLE_SOLID,
+ TH_DIS_MARKER,
+ TH_PATH_BEFORE,
+ TH_PATH_AFTER
};
/* XXX WARNING: previous is saved in file, so do not change order! */
Modified: branches/soc-2011-tomato/source/blender/editors/interface/resources.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/resources.c 2011-06-28 15:43:03 UTC (rev 37909)
+++ branches/soc-2011-tomato/source/blender/editors/interface/resources.c 2011-06-28 15:46:38 UTC (rev 37910)
@@ -422,6 +422,12 @@
cp= ts->sel_marker; break;
case TH_BUNDLE_SOLID:
cp= ts->bundle_solid; break;
+ case TH_DIS_MARKER:
+ cp= ts->dis_marker; break;
+ case TH_PATH_BEFORE:
+ cp= ts->path_before; break;
+ case TH_PATH_AFTER:
+ cp= ts->path_after; break;
}
}
}
@@ -815,6 +821,9 @@
SETCOL(btheme->tclip.marker, 0x7f, 0x7f, 0x00, 255);
SETCOL(btheme->tclip.act_marker, 0xff, 0xff, 0xff, 255);
SETCOL(btheme->tclip.sel_marker, 0xff, 0xff, 0x00, 255);
+ SETCOL(btheme->tclip.dis_marker, 0x7f, 0x00, 0x00, 255);
+ SETCOL(btheme->tclip.path_before, 0xff, 0x00, 0x00, 255);
+ SETCOL(btheme->tclip.path_after, 0x00, 0x00, 0xff, 255);
}
@@ -1590,6 +1599,9 @@
SETCOL(btheme->tclip.marker, 0x7f, 0x7f, 0x00, 255);
SETCOL(btheme->tclip.act_marker, 0xff, 0xff, 0xff, 255);
SETCOL(btheme->tclip.sel_marker, 0xff, 0xff, 0x00, 255);
+ SETCOL(btheme->tclip.dis_marker, 0x7f, 0x00, 0x00, 255);
+ SETCOL(btheme->tclip.path_before, 0xff, 0x00, 0x00, 255);
+ SETCOL(btheme->tclip.path_after, 0x00, 0x00, 0xff, 255);
}
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c 2011-06-28 15:43:03 UTC (rev 37909)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c 2011-06-28 15:46:38 UTC (rev 37910)
@@ -127,7 +127,7 @@
if(framenr!=i) glColor4ub(128, 128, 0, 96);
else glColor4ub(255, 255, 0, 96);
- glRecti((i-1)*framelen, 0, i*framelen, 4);
+ glRecti((i-sfra-1)*framelen, 0, (i-sfra)*framelen, 4);
}
}
}
@@ -242,25 +242,30 @@
glLineWidth(1.0f);
}
- if(sel_type==MCLIP_SEL_TRACK && sel==track) UI_ThemeColor(TH_ACT_MARKER);
- else {
- if (TRACK_SELECTED(track)) UI_ThemeColor(TH_SEL_MARKER);
- else UI_ThemeColor(TH_MARKER);
- }
+ UI_ThemeColor(TH_PATH_BEFORE);
if(TRACK_SELECTED(track)) {
glPointSize(3.0f);
glBegin(GL_POINTS);
for(i= a; i<b; i++) {
+ if(i==count+1)
+ UI_ThemeColor(TH_PATH_AFTER);
+
if(i!=curindex)
glVertex2f(path[i][0], path[i][1]);
}
glEnd();
}
+ UI_ThemeColor(TH_PATH_BEFORE);
+
glBegin(GL_LINE_STRIP);
- for(i= a; i<b; i++)
+ for(i= a; i<b; i++) {
+ if(i==count+1)
+ UI_ThemeColor(TH_PATH_AFTER);
+
glVertex2f(path[i][0], path[i][1]);
+ }
glEnd();
glPointSize(1.0f);
}
@@ -350,8 +355,13 @@
/* search */
if((track->search_flag&SELECT)==sel) {
- if(track->search_flag&SELECT) UI_ThemeColor(color);
- else UI_ThemeColor(TH_MARKER);
+ if(marker->flag&MARKER_DISABLED) {
+ if(act) UI_ThemeColor(TH_ACT_MARKER);
+ else if(track->search_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
+ else UI_ThemeColor(TH_DIS_MARKER);
+ } else {if(track->search_flag&SELECT) UI_ThemeColor(color);
+ else UI_ThemeColor(TH_MARKER);
+ }
if(sc->flag&SC_SHOW_MARKER_SEARCH) {
glBegin(GL_LINE_LOOP);
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h 2011-06-28 15:43:03 UTC (rev 37909)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h 2011-06-28 15:46:38 UTC (rev 37910)
@@ -234,9 +234,10 @@
char handle_vertex_size;
- char marker_outline[4], marker[4], act_marker[4], sel_marker[4];
+ char marker_outline[4], marker[4], act_marker[4], sel_marker[4], dis_marker[4];
char bundle_solid[4];
- char hpad[3];
+ char path_before[4], path_after[4];
+ char hpad[7];
char preview_back[4];
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c 2011-06-28 15:43:03 UTC (rev 37909)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c 2011-06-28 15:46:38 UTC (rev 37910)
@@ -1760,26 +1760,44 @@
prop= RNA_def_property(srna, "marker_outline", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "marker_outline");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Marker Outline Color", "");
+ RNA_def_property_ui_text(prop, "Marker Outline Color", "Color of marker's outile");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "marker", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "marker");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Marker Color", "");
+ RNA_def_property_ui_text(prop, "Marker Color", "Color of marker");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "active_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "act_marker");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Active Marker Color", "");
+ RNA_def_property_ui_text(prop, "Active Marker", "Color of active marker");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "selected_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "sel_marker");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Selected Marker Color", "");
+ RNA_def_property_ui_text(prop, "Selected Marker", "Color of sleected marker");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+ prop= RNA_def_property(srna, "disabled_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, NULL, "dis_marker");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Disabled Marker", "Color of disabled marker");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+ prop= RNA_def_property(srna, "path_before", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, NULL, "path_before");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Path Before", "Color of path before current frame");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+ prop= RNA_def_property(srna, "path_after", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, NULL, "path_after");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Path After", "Color of path after current frame");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
}
static void rna_def_userdef_themes(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list