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

Borderselect and circleselect now use backbuffer method too.

Browse Source 
Maybe its time to make this a default now?
This commit is contained in:
Ton Roosendaal
2004-09-28 22:05:16 +00:00
parent de1147e99a
commit 01e6d69ff5
5 changed files with 116 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/include/BIF_editmesh.h
View File

@@ -92,9 +92,9 @@ extern void vertexnormals(int testflip);
extern void EM_select_face_fgon(struct EditFace *efa, int sel);
extern int EM_zbuffer_visible(float *co, short xs, short ys);
extern void EM_set_zbufselect_cache(short minx, short miny, short maxx, short maxy);
extern void EM_free_zbufselect_cache(void);
extern int EM_init_backbuf_border(short xmin, short ymin, short xmax, short ymax);
extern int EM_check_backbuf_border(int index);
extern void EM_free_backbuf_border(void);
extern void vertexnoise(void);
extern void vertexsmooth(void);

10
source/blender/src/drawobject.c
View File

@@ -4334,7 +4334,7 @@ void draw_object_ext(Base *base)
/* ***************** BACKBUF SEL (BBS) ********* */
static void bbs_mesh_verts(Object *ob, int offset)
static int bbs_mesh_verts(Object *ob, int offset)
{
EditVert *eve;
int a= offset;
@@ -4351,6 +4351,7 @@ static void bbs_mesh_verts(Object *ob, int offset)
bglEnd();
glPointSize(1.0);
return a;
}
/* two options, edgecolors or black */
@@ -4507,7 +4508,7 @@ static int bbs_mesh_solid(Object *ob, int facecol)
void draw_object_backbufsel(Object *ob)
{
extern int em_solidoffs, em_wireoffs; // let linker solve it... from editmesh_mods.c
extern int em_solidoffs, em_wireoffs, em_vertoffs; // let linker solve it... from editmesh_mods.c
mymultmatrix(ob->obmat);
@@ -4527,7 +4528,10 @@ void draw_object_backbufsel(Object *ob)
em_wireoffs= bbs_mesh_wire(ob, em_solidoffs);
else em_wireoffs= em_solidoffs;
if(G.scene->selectmode & SCE_SELECT_VERTEX) bbs_mesh_verts(ob, em_wireoffs);
if(G.scene->selectmode & SCE_SELECT_VERTEX)
em_vertoffs= bbs_mesh_verts(ob, em_wireoffs);
else em_vertoffs= em_wireoffs;
bglPolygonOffset(0.0);
}
else bbs_mesh_solid(ob, 1); // 1= facecol, faceselect

174
source/blender/src/editmesh_mods.c
View File

@@ -101,9 +101,9 @@ editmesh_mods.c, UI level access, no geometry changes
/* ****************************** SELECTION ROUTINES **************** */
int em_solidoffs=0, em_wireoffs=0; // set in drawobject.c ... for colorindices
int em_solidoffs=0, em_wireoffs=0, em_vertoffs; // set in drawobject.c ... for colorindices
/* copied from vpaint */
/* samples a single pixel (copied from vpaint) */
static unsigned int sample_backbuf(int x, int y)
{
unsigned int col;
@@ -124,6 +124,7 @@ static unsigned int sample_backbuf(int x, int y)
return framebuffer_to_index(col);
}
/* reads full rect, converts indices */
static unsigned int *read_backbuf(short xmin, short ymin, short xmax, short ymax)
{
unsigned int *dr, *buf;
@@ -152,7 +153,7 @@ static unsigned int *read_backbuf(short xmin, short ymin, short xmax, short ymax
a= (xmaxc-xminc+1)*(ymaxc-yminc+1);
dr= buf;
while(a--) {
*dr= framebuffer_to_index(*dr);
if(*dr) *dr= framebuffer_to_index(*dr);
dr++;
}
@@ -224,98 +225,44 @@ static unsigned int sample_backbuf_rect(unsigned int *buf, int size, int min, in
return 0;
}
/* facilities for border select and circle select */
static char *selbuf= NULL;
// caching
static unsigned int *zbuffer= NULL;
static short zminx, zminy, zmaxx, zmaxy;
void EM_set_zbufselect_cache(short minx, short miny, short maxx, short maxy)
/* reads rect, and builds selection array for quick lookup */
/* returns if all is OK */
int EM_init_backbuf_border(short xmin, short ymin, short xmax, short ymax)
{
if(G.vd->drawtype<OB_SOLID || (G.vd->flag & V3D_ZBUF_SELECT)==0) return;
if(minx<0) minx= 0;
if(miny<0) miny= 0;
if(maxx>=curarea->winx) maxx= curarea->winx;
if(maxy>=curarea->winy) maxy= curarea->winy;
if(minx<=maxx && miny<=maxy) {
zbuffer= MEM_mallocN( (maxx-minx+1)*(maxy-miny+1)*sizeof(int), "zbuffer select");
glReadPixels(curarea->winrct.xmin+minx, curarea->winrct.ymin+miny, (maxx-minx+1), (maxy-miny+1),
GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, zbuffer);
zminx= minx; zminy= miny;
zmaxx= maxx; zmaxy= maxy;
}
}
void EM_free_zbufselect_cache(void)
{
if(zbuffer) MEM_freeN(zbuffer);
zbuffer= NULL;
}
static void myglReadPixels(short xs, short ys, unsigned int *data)
{
if(zbuffer) {
if(xs<zminx || xs>zmaxx || ys<zminy || ys>zmaxy) *data= 0xFFFFFFFF;
else *data= zbuffer[ (zmaxx-zminx+1)*(ys-zminy) + (xs-zminx) ];
}
else
glReadPixels(curarea->winrct.xmin+xs, curarea->winrct.ymin+ys, 1, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, data);
}
/* return 1 if visible */
int EM_zbuffer_visible(float *co, short xs, short ys)
{
static float persmat[4][4];
float zval, vec4[4];
unsigned int *buf, *dr;
int a;
if(G.vd->drawtype<OB_SOLID || (G.vd->flag & V3D_ZBUF_SELECT)==0) return 1;
if(G.obedit==NULL || G.vd->drawtype<OB_SOLID || (G.vd->flag & V3D_ZBUF_SELECT)==0) return 0;
if(em_vertoffs==0) return 0;
if(co==NULL) { // init
float pmat[4][4], vmat[4][4];
areawinset(curarea->win);
persp(PERSP_VIEW);
mymultmatrix(G.obedit->obmat);
selbuf= MEM_callocN(em_vertoffs+1, "selbuf");
bglPolygonOffset(2.0); // sets proj matrix
glGetFloatv(GL_PROJECTION_MATRIX, (float *)pmat);
glGetFloatv(GL_MODELVIEW_MATRIX, (float *)vmat);
Mat4MulMat4(persmat, vmat, pmat);
bglPolygonOffset(0.0); // restores proj matrix
myloadmatrix(G.vd->viewmat);
return 0;
dr= buf= read_backbuf(xmin, ymin, xmax, ymax);
a= (xmax-xmin+1)*(ymax-ymin+1);
while(a--) {
if(*dr>0 && *dr<=em_vertoffs) selbuf[*dr]= 1;
dr++;
}
// clip on window edge */
if(xs<0 || ys<0 || xs>=curarea->winx || ys>= curarea->winy) return 0;
VECCOPY(vec4, co);
vec4[3]= 1.0;
Mat4MulVec4fl(persmat, vec4);
vec4[2]/= vec4[3];
vec4[2]= 0.5 + vec4[2]/2;
if(1) {
unsigned int zvali;
myglReadPixels(xs, ys, &zvali);
zval= ((float)zvali)/((float)0xFFFFFFFF);
if( vec4[2] <= zval) return 1;
}
else {
glReadPixels(curarea->winrct.xmin+xs, curarea->winrct.ymin+ys, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &zval);
// printf("my proj %f zbuf %f mydiff %f\n", vec4[2], zval, vec4[2]-zval);
}
if( vec4[2] > zval) return 0;
MEM_freeN(buf);
return 1;
}
int EM_check_backbuf_border(int index)
{
if(selbuf==NULL) return 1;
if(index>0 && index<=em_vertoffs)
return selbuf[index];
return 0;
}
void EM_free_backbuf_border(void)
{
if(selbuf) MEM_freeN(selbuf);
selbuf= NULL;
}
static EditVert *findnearestvert_f(short *dist, short sel)
{
@@ -329,7 +276,6 @@ static EditVert *findnearestvert_f(short *dist, short sel)
/* do projection */
calc_meshverts_ext(); /* drawobject.c */
EM_zbuffer_visible(NULL, 0, 0); /* NULL = init */
/* we count from acto->next to last, and from first to acto */
/* does acto exist? */
@@ -348,11 +294,9 @@ static EditVert *findnearestvert_f(short *dist, short sel)
temp= abs(mval[0]- eve->xs)+ abs(mval[1]- eve->ys);
if( (eve->f & 1)==sel ) temp+=5;
if(temp< *dist) {
if(EM_zbuffer_visible(eve->co, eve->xs, eve->ys)) {
act= eve;
*dist= temp;
if(*dist<4) break;
}
act= eve;
*dist= temp;
if(*dist<4) break;
}
}
eve= eve->next;
@@ -365,11 +309,9 @@ static EditVert *findnearestvert_f(short *dist, short sel)
temp= abs(mval[0]- eve->xs)+ abs(mval[1]- eve->ys);
if( (eve->f & 1)==sel ) temp+=5;
if(temp< *dist) {
if(EM_zbuffer_visible(eve->co, eve->xs, eve->ys)) {
act= eve;
if(temp<4) break;
*dist= temp;
}
act= eve;
if(temp<4) break;
*dist= temp;
}
if(eve== acto) break;
}
@@ -407,24 +349,6 @@ EditVert *findnearestvert(short *dist, short sel)
else return findnearestvert_f(dist, sel);
}
/* more samples */
int EM_zbuffer_edge_visible(float *v1, float *v2, short *val1, short *val2)
{
float cent[3];
/* midpoints work bad in persp mode... */
VecMidf(cent, v1, v2);
if(EM_zbuffer_visible(cent, (val1[0]+val2[0])/2, (val1[1]+val2[1])/2)) return 1;
// endpoints; should be both visible
if(EM_zbuffer_visible(v1, val1[0], val1[1]))
if(EM_zbuffer_visible(v1, val2[0], val2[1]))
return 1;
return 0;
}
/* helper for findnearest edge */
static float dist_mval_edge(short *mval, EditEdge *eed)
{
@@ -457,7 +381,6 @@ static EditEdge *findnearestedge_f(short *dist)
}
calc_meshverts_ext_f2(); /*sets (eve->f & 2) for vertices that aren't visible*/
EM_zbuffer_visible(NULL, 0, 0); /* NULL = init */
getmouseco_areawin(mval);
closest=NULL;
@@ -470,10 +393,8 @@ static EditEdge *findnearestedge_f(short *dist)
distance= dist_mval_edge(mval, eed);
if(distance < *dist) {
if(EM_zbuffer_edge_visible(eed->v1->co, eed->v2->co, &eed->v1->xs, &eed->v2->xs)) {
*dist= distance;
closest= eed;
}
*dist= distance;
closest= eed;
}
}
eed= eed->next;
@@ -528,7 +449,6 @@ static EditFace *findnearestface_f(short *dist)
/* do projection */
calc_mesh_facedots_ext();
EM_zbuffer_visible(NULL, 0, 0); /* NULL = init */
/* we count from acto->next to last, and from first to acto */
/* does acto exist? */
@@ -546,10 +466,8 @@ static EditFace *findnearestface_f(short *dist)
if(efa->h==0 && efa->fgonf!=EM_FGON) {
temp= abs(mval[0]- efa->xs)+ abs(mval[1]- efa->ys);
if(temp< *dist) {
if(EM_zbuffer_visible(efa->cent, efa->xs, efa->ys)) {
act= efa;
*dist= temp;
}
act= efa;
*dist= temp;
}
}
efa= efa->next;
@@ -561,10 +479,8 @@ static EditFace *findnearestface_f(short *dist)
if(efa->h==0 && efa->fgonf!=EM_FGON) {
temp= abs(mval[0]- efa->xs)+ abs(mval[1]- efa->ys);
if(temp< *dist) {
if(EM_zbuffer_visible(efa->cent, efa->xs, efa->ys)) {
act= efa;
*dist= temp;
}
act= efa;
*dist= temp;
}
if(efa== acto) break;
}

114
source/blender/src/editview.c
View File

@@ -788,20 +788,22 @@ void borderselect(void)
else if(G.obedit) {
/* used to be a bigger test, also included sector and life */
if(G.obedit->type==OB_MESH) {
extern int em_solidoffs, em_wireoffs; // let linker solve it... from editmesh_mods.c
EditMesh *em = G.editMesh;
EditVert *eve;
EditEdge *eed;
EditFace *efa;
int index, bbsel=0; // bbsel: no clip needed with screencoords
EM_zbuffer_visible(NULL, 0, 0); // init
EM_set_zbufselect_cache(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
bbsel= EM_init_backbuf_border(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
if(G.scene->selectmode & SCE_SELECT_VERTEX) {
calc_meshverts_ext(); /* clips, drawobject.c */
for(eve= em->verts.first; eve; eve= eve->next) {
if(eve->h==0 && eve->xs>rect.xmin && eve->xs<rect.xmax) {
if(eve->ys>rect.ymin && eve->ys<rect.ymax) {
if(EM_zbuffer_visible(eve->co, eve->xs, eve->ys)) {
if(bbsel==0) calc_meshverts_ext(); /* clips, drawobject.c */
index= em_wireoffs;
for(eve= em->verts.first; eve; eve= eve->next, index++) {
if(eve->h==0) {
if(bbsel || (eve->xs>rect.xmin && eve->xs<rect.xmax && eve->ys>rect.ymin && eve->ys<rect.ymax)) {
if(EM_check_backbuf_border(index)) {
if(val==LEFTMOUSE) eve->f|= 1;
else eve->f&= 254;
}
@@ -810,17 +812,15 @@ void borderselect(void)
}
}
if(G.scene->selectmode & SCE_SELECT_EDGE) {
float cent[3];
short done= 0;
calc_meshverts_ext_f2(); /* doesnt clip, drawobject.c */
if(bbsel==0) calc_meshverts_ext_f2(); /* doesnt clip, drawobject.c */
index= em_solidoffs;
/* two stages, for nice edge select first do 'both points in rect' */
for(eed= em->edges.first; eed; eed= eed->next) {
for(eed= em->edges.first; eed; eed= eed->next, index++) {
if(eed->h==0) {
if( edge_fully_inside_rect(rect, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
VecMidf(cent, eed->v1->co, eed->v2->co);
if(EM_zbuffer_visible(cent, (eed->v1->xs+eed->v2->xs)/2, (eed->v1->ys+eed->v2->ys)/2)) {
if(bbsel || edge_fully_inside_rect(rect, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
if(EM_check_backbuf_border(index)) {
EM_select_edge(eed, val==LEFTMOUSE);
done = 1;
}
@@ -829,11 +829,11 @@ void borderselect(void)
}
if(done==0) {
for(eed= em->edges.first; eed; eed= eed->next) {
index= em_solidoffs;
for(eed= em->edges.first; eed; eed= eed->next, index++) {
if(eed->h==0) {
if( edge_inside_rect(rect, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
VecMidf(cent, eed->v1->co, eed->v2->co);
if(EM_zbuffer_visible(cent, (eed->v1->xs+eed->v2->xs)/2, (eed->v1->ys+eed->v2->ys)/2)) {
if(bbsel || edge_inside_rect(rect, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
if(EM_check_backbuf_border(index)) {
EM_select_edge(eed, val==LEFTMOUSE);
done = 1;
}
@@ -844,11 +844,12 @@ void borderselect(void)
}
if(G.scene->selectmode & SCE_SELECT_FACE) {
calc_mesh_facedots_ext();
for(efa= em->faces.first; efa; efa= efa->next) {
if(efa->h==0 && efa->xs>rect.xmin && efa->xs<rect.xmax) {
if(efa->ys>rect.ymin && efa->ys<rect.ymax) {
if(EM_zbuffer_visible(efa->cent, efa->xs, efa->ys)) {
if(bbsel==0) calc_mesh_facedots_ext();
index= 1;
for(efa= em->faces.first; efa; efa= efa->next, index++) {
if(efa->h==0) {
if(bbsel || (efa->xs>rect.xmin && efa->xs<rect.xmax && efa->ys>rect.ymin && efa->ys<rect.ymax)) {
if(EM_check_backbuf_border(index)) {
EM_select_face_fgon(efa, val==LEFTMOUSE);
}
}
@@ -856,7 +857,7 @@ void borderselect(void)
}
}
EM_free_zbufselect_cache();
EM_free_backbuf_border();
EM_selectmode_flush();
allqueue(REDRAWVIEW3D, 0);
@@ -1053,45 +1054,47 @@ void borderselect(void)
void mesh_selectionCB(int selecting, Object *editobj, short *mval, float rad)
{
extern int em_solidoffs, em_wireoffs; // let linker solve it... from editmesh_mods.c
EditMesh *em = G.editMesh;
EditVert *eve;
EditEdge *eed;
EditFace *efa;
float x, y, r;
int index, bbsel=0; // if bbsel we dont clip with screencoords
short rads= (short)(rad+1.0);
EM_zbuffer_visible(NULL, 0, 0); // init
EM_set_zbufselect_cache(mval[0]-rads, mval[1]-rads, mval[0]+rads, mval[1]+rads);
bbsel= EM_init_backbuf_border(mval[0]-rads, mval[1]-rads, mval[0]+rads, mval[1]+rads);
if(G.scene->selectmode & SCE_SELECT_VERTEX) {
calc_meshverts_ext(); /* drawobject.c */
eve= em->verts.first;
while(eve) {
if(bbsel==0) calc_meshverts_ext(); /* drawobject.c */
index= em_wireoffs;
for(eve= em->verts.first; eve; eve= eve->next, index++) {
if(eve->h==0) {
x= eve->xs-mval[0];
y= eve->ys-mval[1];
r= sqrt(x*x+y*y);
if(r<=rad) {
if(EM_zbuffer_visible(eve->co, eve->xs, eve->ys)) {
if(bbsel && EM_check_backbuf_border(index)) {
if(selecting==LEFTMOUSE) eve->f|= 1;
else eve->f&= 254;
}
else {
x= eve->xs-mval[0];
y= eve->ys-mval[1];
r= sqrt(x*x+y*y);
if(r<=rad) {
if(selecting==LEFTMOUSE) eve->f|= 1;
else eve->f&= 254;
}
}
}
eve= eve->next;
}
}
if(G.scene->selectmode & SCE_SELECT_EDGE) {
calc_meshverts_ext_f2(); /* doesnt clip, drawobject.c */
for(eed= em->edges.first; eed; eed= eed->next) {
if(bbsel==0) calc_meshverts_ext_f2(); /* doesnt clip, drawobject.c */
index= em_solidoffs;
for(eed= em->edges.first; eed; eed= eed->next, index++) {
if(eed->h==0) {
if( edge_inside_circle(mval[0], mval[1], (short)rad, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
if(EM_zbuffer_visible(eed->v1->co, eed->v1->xs, eed->v1->ys)) {
if(EM_zbuffer_visible(eed->v2->co, eed->v2->xs, eed->v2->ys)) {
EM_select_edge(eed, selecting==LEFTMOUSE);
}
if(bbsel || edge_inside_circle(mval[0], mval[1], (short)rad, eed->v1->xs, eed->v1->ys, eed->v2->xs, eed->v2->ys)) {
if(EM_check_backbuf_border(index)) {
EM_select_edge(eed, selecting==LEFTMOUSE);
}
}
}
@@ -1099,22 +1102,25 @@ void mesh_selectionCB(int selecting, Object *editobj, short *mval, float rad)
}
if(G.scene->selectmode & SCE_SELECT_FACE) {
calc_mesh_facedots_ext();
for(efa= em->faces.first; efa; efa= efa->next) {
if(bbsel==0) calc_mesh_facedots_ext();
index= 1;
for(efa= em->faces.first; efa; efa= efa->next, index++) {
if(efa->h==0) {
x= efa->xs-mval[0];
y= efa->ys-mval[1];
r= sqrt(x*x+y*y);
if(r<=rad) {
if(EM_zbuffer_visible(efa->cent, efa->xs, efa->ys)) {
if(bbsel && EM_check_backbuf_border(index)) {
EM_select_face_fgon(efa, selecting==LEFTMOUSE);
}
else {
x= efa->xs-mval[0];
y= efa->ys-mval[1];
r= sqrt(x*x+y*y);
if(r<=rad) {
EM_select_face_fgon(efa, selecting==LEFTMOUSE);
}
}
}
}
}
EM_free_zbufselect_cache();
EM_free_backbuf_border();
EM_selectmode_flush();
draw_sel_circle(0, 0, 0, 0, 0); /* signal */

2
source/blender/src/header_view3d.c
View File

@@ -3928,7 +3928,7 @@ void view3d_buttons(void)
xco+= XIC;
uiBlockEndAlign(block);
if(G.vd->drawtype > OB_WIRE) {
uiDefIconButS(block, TOG|BIT|12, B_REDR, ICON_ORTHO, xco,0,XIC,YIC, &G.vd->flag, 1.0, 0.0, 0, 0, "Clip selection with Z buffer");
uiDefIconButS(block, TOG|BIT|12, B_REDR, ICON_ORTHO, xco,0,XIC,YIC, &G.vd->flag, 1.0, 0.0, 0, 0, "Limit selection to visible (clipped with depth buffer)");
xco+= XIC;
}
xco+= 20;