archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added slider for the Draw brush that modifies the direction vertices are pulled in relation to the view.

Browse Source
This commit is contained in:
Nicholas Bishop
2006-12-06 02:10:27 +00:00
parent 0aeb4c99a5
commit ee0dccbf96
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/makesdna/DNA_scene_types.h
View File

@@ -369,7 +369,8 @@ typedef struct BrushData
short size; short size;
char strength, dir; /* Not used for smooth brush */ char strength, dir; /* Not used for smooth brush */
char airbrush; char airbrush;
char pad[3]; char view;
char pad[2];
} BrushData; } BrushData;
struct PropsetData; struct PropsetData;

8
source/blender/src/buttons_editing.c
View File

@@ -4171,8 +4171,9 @@ void sculptmode_draw_interface_textures(uiBlock *block, unsigned short cx, unsig
uiDefButC(block,TOG,B_NOP, "Fade", cx,cy,50,19, &sd->texfade, 0,0,0,0,"Smooth the edges of the texture"); uiDefButC(block,TOG,B_NOP, "Fade", cx,cy,50,19, &sd->texfade, 0,0,0,0,"Smooth the edges of the texture");
uiDefButS(block,NUM,B_NOP, "Space", cx+50,cy,65,19, &sd->spacing, 0,500,20,0,"Non-zero inserts N pixels between dots"); uiDefButS(block,NUM,B_NOP, "Space", cx+50,cy,65,19, &sd->spacing, 0,500,20,0,"Non-zero inserts N pixels between dots");
cy-= 20;
cy+= 40; if(sd->brush_type == DRAW_BRUSH)
uiDefButC(block,NUM,B_NOP, "View", cx+50,cy,65,19, &sculptmode_brush()->view, 0,100,20,0,"Pulls brush direction towards view");
} }
else { else {
uiDefButS(block,TOG,B_SCULPT_TEXBROWSE, "Add New" ,cx, cy, 115, 19, &G.buts->texnr,-1,32767,0,0, "Adds a new texture"); uiDefButS(block,TOG,B_SCULPT_TEXBROWSE, "Add New" ,cx, cy, 115, 19, &G.buts->texnr,-1,32767,0,0, "Adds a new texture");
@@ -4184,6 +4185,9 @@ void sculptmode_draw_interface_textures(uiBlock *block, unsigned short cx, unsig
else { else {
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
uiDefButS(block,NUM,B_NOP, "Space", cx+50,cy,65,19, &sd->spacing, 0,500,20,0,"Non-zero inserts N pixels between dots"); uiDefButS(block,NUM,B_NOP, "Space", cx+50,cy,65,19, &sd->spacing, 0,500,20,0,"Non-zero inserts N pixels between dots");
cy-= 20;
if(sd->brush_type == DRAW_BRUSH)
uiDefButC(block,NUM,B_NOP, "View", cx+50,cy,65,19, &sculptmode_brush()->view, 0,100,20,0,"Pulls brush direction towards view");
} }
uiBlockEndAlign(block); uiBlockEndAlign(block);

39
source/blender/src/sculptmode.c
View File

@@ -131,8 +131,8 @@ typedef struct EditData {
char flip; char flip;
short mouse[2]; short mouse[2];
/* Normals */ /* View normals */
vec3f up, right; vec3f up, right, out;
GrabData *grabdata; GrabData *grabdata;
float *layer_disps; float *layer_disps;
@@ -169,6 +169,7 @@ void sculptmode_init(Scene *sce)
sd->drawbrush.strength=sd->smoothbrush.strength=sd->pinchbrush.strength=sd->inflatebrush.strength=sd->grabbrush.strength=sd->layerbrush.strength= 25; sd->drawbrush.strength=sd->smoothbrush.strength=sd->pinchbrush.strength=sd->inflatebrush.strength=sd->grabbrush.strength=sd->layerbrush.strength= 25;
sd->drawbrush.dir=sd->pinchbrush.dir=sd->inflatebrush.dir=sd->layerbrush.dir= 1; sd->drawbrush.dir=sd->pinchbrush.dir=sd->inflatebrush.dir=sd->layerbrush.dir= 1;
sd->drawbrush.airbrush=sd->smoothbrush.airbrush=sd->pinchbrush.airbrush=sd->inflatebrush.airbrush=sd->layerbrush.airbrush= 0; sd->drawbrush.airbrush=sd->smoothbrush.airbrush=sd->pinchbrush.airbrush=sd->inflatebrush.airbrush=sd->layerbrush.airbrush= 0;
sd->drawbrush.view= 0;
sd->brush_type= DRAW_BRUSH; sd->brush_type= DRAW_BRUSH;
sd->texact= -1; sd->texact= -1;
sd->texfade= 1; sd->texfade= 1;
@@ -680,7 +681,7 @@ float brush_strength(EditData *e)
/* Currently only for the draw brush; finds average normal for all active /* Currently only for the draw brush; finds average normal for all active
vertices */ vertices */
vec3f calc_area_normal(const ListBase* active_verts) vec3f calc_area_normal(const vec3f *outdir, const int view, const ListBase* active_verts)
{ {
Mesh *me= get_mesh(G.scene->sculptdata.active_ob); Mesh *me= get_mesh(G.scene->sculptdata.active_ob);
vec3f area_normal= {0,0,0}; vec3f area_normal= {0,0,0};
@@ -693,12 +694,18 @@ vec3f calc_area_normal(const ListBase* active_verts)
node= node->next; node= node->next;
} }
Normalise(&area_normal.x); Normalise(&area_normal.x);
if(outdir) {
area_normal.x= outdir->x * view + area_normal.x * (100-view);
area_normal.y= outdir->y * view + area_normal.y * (100-view);
area_normal.z= outdir->z * view + area_normal.z * (100-view);
}
Normalise(&area_normal.x);
return area_normal; return area_normal;
} }
void do_draw_brush(const ListBase* active_verts) void do_draw_brush(EditData *e, const ListBase* active_verts)
{ {
Mesh *me= get_mesh(G.scene->sculptdata.active_ob); Mesh *me= get_mesh(G.scene->sculptdata.active_ob);
const vec3f area_normal= calc_area_normal(active_verts); const vec3f area_normal= calc_area_normal(&e->out, sculptmode_brush()->view, active_verts);
ActiveData *node= active_verts->first; ActiveData *node= active_verts->first;
while(node){ while(node){
@@ -800,7 +807,7 @@ void do_grab_brush(EditData *e)
void do_layer_brush(EditData *e, const ListBase *active_verts) void do_layer_brush(EditData *e, const ListBase *active_verts)
{ {
Mesh *me= get_mesh(G.scene->sculptdata.active_ob); Mesh *me= get_mesh(G.scene->sculptdata.active_ob);
vec3f area_normal= calc_area_normal(active_verts); vec3f area_normal= calc_area_normal(NULL, 0, active_verts);
ActiveData *node= active_verts->first; ActiveData *node= active_verts->first;
const float bstr= brush_strength(e); const float bstr= brush_strength(e);
@@ -1009,7 +1016,7 @@ void do_brush_action(float *vertexcosnos, EditData e,
switch(G.scene->sculptdata.brush_type){ switch(G.scene->sculptdata.brush_type){
case DRAW_BRUSH: case DRAW_BRUSH:
do_draw_brush(&active_verts); do_draw_brush(&e, &active_verts);
break; break;
case SMOOTH_BRUSH: case SMOOTH_BRUSH:
do_smooth_brush(&active_verts); do_smooth_brush(&active_verts);
@@ -1044,18 +1051,21 @@ EditData flip_editdata(EditData *e, short x, short y, short z)
fe.center.x= -fe.center.x; fe.center.x= -fe.center.x;
fe.up.x= -fe.up.x; fe.up.x= -fe.up.x;
fe.right.x= -fe.right.x; fe.right.x= -fe.right.x;
fe.out.x= -fe.out.x;
} }
if(y) { if(y) {
fe.center.y= -fe.center.y; fe.center.y= -fe.center.y;
fe.up.y= -fe.up.y; fe.up.y= -fe.up.y;
fe.right.y= -fe.right.y; fe.right.y= -fe.right.y;
fe.out.y= -fe.out.y;
} }
if(z) { if(z) {
fe.center.z= -fe.center.z; fe.center.z= -fe.center.z;
fe.up.z= -fe.up.z; fe.up.z= -fe.up.z;
fe.right.z= -fe.right.z; fe.right.z= -fe.right.z;
fe.out.z= -fe.out.z;
} }
project(&fe.center.x,fe.mouse); project(&fe.center.x,fe.mouse);
@@ -1199,14 +1209,17 @@ void init_editdata(SculptData *sd, EditData *e, short *mouse, short *pr_mouse, c
mouse_depth); mouse_depth);
e->size= VecLenf(&e->center.x,&brush_edge_loc.x); e->size= VecLenf(&e->center.x,&brush_edge_loc.x);
/* Now project the Up and Right normals from view to model coords */ /* Now project the Up, Right, and Out normals from view to model coords */
zero_loc= unproject(0,0,0); zero_loc= unproject(0, 0, 0);
e->up= unproject(0,-1,0); e->up= unproject(0, -1, 0);
e->right= unproject(1,0,0); e->right= unproject(1, 0, 0);
VecSubf(&e->up.x,&e->up.x,&zero_loc.x); e->out= unproject(0, 0, -1);
VecSubf(&e->right.x,&e->right.x,&zero_loc.x); VecSubf(&e->up.x, &e->up.x, &zero_loc.x);
VecSubf(&e->right.x, &e->right.x, &zero_loc.x);
VecSubf(&e->out.x, &e->out.x, &zero_loc.x);
Normalise(&e->up.x); Normalise(&e->up.x);
Normalise(&e->right.x); Normalise(&e->right.x);
Normalise(&e->out.x);
if(sd->brush_type == GRAB_BRUSH) { if(sd->brush_type == GRAB_BRUSH) {
vec3f gcenter; vec3f gcenter;