[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29732] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint: Adding in sane multiplier values and having DEEPEN, PEAKS, and CONTRAST ( invert of FILL, SCRAPE, FLATTEN) with a lower multiplier.

Tom Musgrove LetterRip at gmail.com
Sun Jun 27 08:24:12 CEST 2010


Revision: 29732
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29732
Author:   letterrip
Date:     2010-06-27 08:24:12 +0200 (Sun, 27 Jun 2010)

Log Message:
-----------
Adding in sane multiplier values and having DEEPEN, PEAKS, and CONTRAST (invert of FILL, SCRAPE, FLATTEN) with  a lower multiplier.  These should give much better brush behaviour out of the box

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c	2010-06-27 06:15:36 UTC (rev 29731)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c	2010-06-27 06:24:12 UTC (rev 29732)
@@ -205,8 +205,8 @@
 	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_radial_control", FKEY, KM_PRESS, KM_CTRL, 0)->ptr,  "mode", WM_RADIALCONTROL_ANGLE);
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, 0,        0)->ptr, "mode", WM_BRUSHSTROKE_NORMAL);
-	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_BRUSHSTROKE_INVERT);
-	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_ALT,   0)->ptr, "mode", WM_BRUSHSTROKE_SMOOTH);
+	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "mode", WM_BRUSHSTROKE_INVERT);
+	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_SHIFT,   0)->ptr, "mode", WM_BRUSHSTROKE_SMOOTH);
 
 	for(i=0; i<=5; i++)
 		RNA_int_set(WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", ZEROKEY+i, KM_PRESS, KM_CTRL, 0)->ptr, "level", i);

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-27 06:15:36 UTC (rev 29731)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-06-27 06:24:12 UTC (rev 29732)
@@ -543,27 +543,34 @@
 	brush->autosmooth_overlap = overlap;
 
 	switch(brush->sculpt_tool){
+		case SCULPT_TOOL_CLAY:
 		case SCULPT_TOOL_DRAW:
 		case SCULPT_TOOL_INFLATE:
-		case SCULPT_TOOL_CLAY:
+		case SCULPT_TOOL_WAX:
+			return alpha * 3.0f * dir * invert * pen_flip * pressure * overlap;
+			
 		case SCULPT_TOOL_LAYER:
+			return alpha * 2.0f * dir * invert * pen_flip * pressure * overlap;
+		
 		case SCULPT_TOOL_FILL:
 		case SCULPT_TOOL_SCRAPE:
 		case SCULPT_TOOL_FLATTEN:
-		case SCULPT_TOOL_WAX:
-			return alpha * dir * invert * pen_flip * pressure * overlap;
+			if (dir*invert*pen_flip)
+				return alpha * 10.0f * dir * invert * pen_flip * pressure * overlap;	
+			else
+				return alpha * 3.0f * dir * invert * pen_flip * pressure * overlap; /* reduce strength for DEEPEN, PEAKS, and CONTRAST */
 
 		case SCULPT_TOOL_SMOOTH:
-			return alpha * 4.0f * pressure * overlap;
+			return alpha * 40.0f * pressure * overlap;
 
 		case SCULPT_TOOL_PINCH:
-			return alpha / 2.0f * dir * invert * pen_flip * pressure * overlap;
+			return alpha * 3.5f * dir * invert * pen_flip * pressure * overlap;
 
 		case SCULPT_TOOL_GRAB:
 			return dir*invert*pen_flip > 0 ? 1.0f : -1.0f;
 
 		case SCULPT_TOOL_NUDGE:
-			return alpha * pressure * overlap;
+			return alpha * 3.0f * pressure * overlap;
 
 		case SCULPT_TOOL_THUMB:
 			return pressure / 4.0f;





More information about the Bf-blender-cvs mailing list