[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56892] trunk/blender/source/blender/ editors/sculpt_paint: Stroke code:
Antony Riakiotakis
kalast at gmail.com
Sat May 18 11:44:31 CEST 2013
Revision: 56892
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56892
Author: psy-fi
Date: 2013-05-18 09:44:30 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Stroke code:
* Fix crash on 2d painting when no active object is present (NULL
pointer dereference in cursor drawing)
* Skip conditional on space_stroke function, since this is already
checked for on higher level.
* Interpolate pressure on spaced strokes.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-18 08:52:34 UTC (rev 56891)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-18 09:44:30 UTC (rev 56892)
@@ -809,7 +809,7 @@
/* TODO: as sculpt and other paint modes are unified, this
* special mode of drawing will go away */
- if (vc.obact->sculpt) {
+ if (vc.obact && vc.obact->sculpt) {
float location[3];
int pixel_radius, hit;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-05-18 08:52:34 UTC (rev 56891)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-05-18 09:44:30 UTC (rev 56892)
@@ -94,9 +94,14 @@
bool brush_init;
float initial_mouse[2];
+ /* cached_pressure stores initial pressure for size pressure influence mainly */
float cached_pressure;
+ /* last pressure will store last pressure value for use in interpolation for space strokes */
+ float last_pressure;
+
float zoom_2d;
+ int pen_flip;
StrokeGetLocation get_location;
StrokeTestStart test_start;
@@ -253,7 +258,7 @@
/* Put the location of the next stroke dot into the stroke RNA and apply it to the mesh */
-static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const wmEvent *event, const float mouse_in[2])
+static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const float mouse_in[2], float pressure)
{
Scene *scene = CTX_data_scene(C);
wmWindow *window = CTX_wm_window(C);
@@ -265,12 +270,7 @@
float mouse_out[2];
PointerRNA itemptr;
float location[3];
- float pressure;
- int pen_flip;
- /* see if tablet affects event */
- pressure = event_tablet_data(event, &pen_flip);
-
/* the following code is adapted from texture paint. It may not be needed but leaving here
* just in case for reference (code in texpaint removed as part of refactoring).
* It's strange that only texpaint had these guards. */
@@ -323,7 +323,7 @@
RNA_float_set_array(&itemptr, "location", location);
RNA_float_set_array(&itemptr, "mouse", mouse_out);
- RNA_boolean_set(&itemptr, "pen_flip", pen_flip);
+ RNA_boolean_set(&itemptr, "pen_flip", stroke->pen_flip);
RNA_float_set(&itemptr, "pressure", pressure);
stroke->update_step(C, stroke, &itemptr);
@@ -364,63 +364,64 @@
/* For brushes with stroke spacing enabled, moves mouse in steps
* towards the final mouse location. */
-static int paint_space_stroke(bContext *C, wmOperator *op, const wmEvent *event, const float final_mouse[2])
+static int paint_space_stroke(bContext *C, wmOperator *op, const float final_mouse[2], float pressure)
{
PaintStroke *stroke = op->customdata;
- PaintMode mode = BKE_paintmode_get_active_from_context(C);
int cnt = 0;
- if (paint_space_stroke_enabled(stroke->brush, mode)) {
- float mouse[2];
- float vec[2];
- float length, scale;
+ float mouse[2];
+ float vec[2];
+ float length, scale;
- copy_v2_v2(mouse, stroke->last_mouse_position);
- sub_v2_v2v2(vec, final_mouse, mouse);
+ copy_v2_v2(mouse, stroke->last_mouse_position);
+ sub_v2_v2v2(vec, final_mouse, mouse);
- length = len_v2(vec);
+ length = len_v2(vec);
- if (length > FLT_EPSILON) {
- const Scene *scene = CTX_data_scene(C);
- int steps;
- int i;
- float size_pressure = 1.0f;
- float pressure = event_tablet_data(event, NULL);
+ if (length > FLT_EPSILON) {
+ const Scene *scene = CTX_data_scene(C);
+ int steps;
+ int i;
+ float size_pressure = 1.0f;
- /* XXX mysterious :) what has 'use size' do with this here... if you don't check for it, pressure fails */
- if (BKE_brush_use_size_pressure(scene, stroke->brush))
- size_pressure = pressure;
-
- if (size_pressure > FLT_EPSILON) {
- /* brushes can have a minimum size of 1.0 but with pressure it can be smaller then a pixel
- * causing very high step sizes, hanging blender [#32381] */
- const float size_clamp = max_ff(1.0f, BKE_brush_size_get(scene, stroke->brush) * size_pressure);
- float spacing = stroke->brush->spacing;
+ /* XXX mysterious :) what has 'use size' do with this here... if you don't check for it, pressure fails */
+ if (BKE_brush_use_size_pressure(scene, stroke->brush))
+ size_pressure = pressure;
- /* stroke system is used for 2d paint too, so we need to account for
+ if (size_pressure > FLT_EPSILON) {
+ /* brushes can have a minimum size of 1.0 but with pressure it can be smaller then a pixel
+ * causing very high step sizes, hanging blender [#32381] */
+ const float size_clamp = max_ff(1.0f, BKE_brush_size_get(scene, stroke->brush) * size_pressure);
+ float spacing = stroke->brush->spacing;
+
+ /* stroke system is used for 2d paint too, so we need to account for
* the fact that brush can be scaled there. */
- if (stroke->brush->flag & BRUSH_SPACING_PRESSURE)
- spacing = max_ff(1.0f, spacing * (1.5f - pressure));
+ if (stroke->brush->flag & BRUSH_SPACING_PRESSURE)
+ spacing = max_ff(1.0f, spacing * (1.5f - pressure));
- spacing *= stroke->zoom_2d;
+ spacing *= stroke->zoom_2d;
- scale = (size_clamp * spacing / 50.0f) / length;
- if (scale > FLT_EPSILON) {
- mul_v2_fl(vec, scale);
+ scale = (size_clamp * spacing / 50.0f) / length;
+ if (scale > FLT_EPSILON) {
+ float pressure_diff = (pressure - stroke->last_pressure)*scale;
+ float final_pressure = stroke->last_pressure;
+ mul_v2_fl(vec, scale);
- steps = (int)(1.0f / scale);
+ steps = (int)(1.0f / scale);
- for (i = 0; i < steps; ++i, ++cnt) {
- add_v2_v2(mouse, vec);
- paint_brush_stroke_add_step(C, op, event, mouse);
- }
+ for (i = 0; i < steps; ++i, ++cnt) {
+ final_pressure += pressure_diff;
+ add_v2_v2(mouse, vec);
+ paint_brush_stroke_add_step(C, op, mouse, final_pressure);
}
}
}
}
+ stroke->last_pressure = pressure;
+
return cnt;
}
@@ -624,6 +625,7 @@
int first = 0;
float zoomx, zoomy;
bool redraw = false;
+ float pressure;
paint_stroke_add_sample(p, stroke, event->mval[0], event->mval[1]);
paint_stroke_sample_average(stroke, &sample_average);
@@ -631,6 +633,9 @@
get_imapaint_zoom(C, &zoomx, &zoomy);
stroke->zoom_2d = max_ff(zoomx, zoomy);
+ /* see if tablet affects event */
+ pressure = event_tablet_data(event, &stroke->pen_flip);
+
/* let NDOF motion pass through to the 3D view so we can paint and rotate simultaneously!
* this isn't perfect... even when an extra MOUSEMOVE is spoofed, the stroke discards it
* since the 2D deltas are zero -- code in this file needs to be updated to use the
@@ -642,6 +647,7 @@
copy_v2_v2(stroke->last_mouse_position, sample_average.mouse);
stroke->stroke_started = stroke->test_start(C, op, sample_average.mouse);
BLI_assert((stroke->stroke_started & ~1) == 0); /* 0/1 */
+ stroke->last_pressure = pressure;
if (stroke->stroke_started) {
stroke->smooth_stroke_cursor =
@@ -674,11 +680,11 @@
if (stroke->stroke_started) {
if (paint_smooth_stroke(stroke, mouse, &sample_average, mode)) {
if (paint_space_stroke_enabled(stroke->brush, mode)) {
- if (paint_space_stroke(C, op, event, mouse))
+ if (paint_space_stroke(C, op, mouse, pressure))
redraw = true;
}
else {
- paint_brush_stroke_add_step(C, op, event, mouse);
+ paint_brush_stroke_add_step(C, op, mouse, pressure);
redraw = true;
}
}
@@ -693,7 +699,7 @@
!(stroke->brush->flag & BRUSH_ANCHORED) &&
!(stroke->brush->flag & BRUSH_SMOOTH_STROKE))
{
- paint_brush_stroke_add_step(C, op, event, mouse);
+ paint_brush_stroke_add_step(C, op, mouse, pressure);
redraw = true;
}
More information about the Bf-blender-cvs
mailing list