griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- remove some redundant drawing code

Browse Source 
- mousewheel zooming in drawipo used uninitialized var (MSVC run time
   error).
This commit is contained in:
Daniel Dunbar
2005-07-15 15:00:08 +00:00
parent 2501bc1ad6
commit 573f86bc3c
2 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1924,7 +1924,7 @@ int view2dzoom(unsigned short event)
}
}
}
if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
if(ELEM(event, WHEELUPMOUSE, WHEELDOWNMOUSE) || mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
if(U.viewzoom!=USER_ZOOM_CONT) {
mvalo[0]= mval[0];

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

@@ -3191,30 +3191,19 @@ static void draw_forcefield(Object *ob)
}
static void draw_bb_box(BoundBox *bb)
static void draw_box(float vec[8][3])
{
float *vec;
vec= bb->vec[0];
glBegin(GL_LINE_STRIP);
glVertex3fv(vec); glVertex3fv(vec+3);glVertex3fv(vec+6); glVertex3fv(vec+9);
glVertex3fv(vec); glVertex3fv(vec+12);glVertex3fv(vec+15); glVertex3fv(vec+18);
glVertex3fv(vec+21); glVertex3fv(vec+12);
glVertex3fv(vec[0]); glVertex3fv(vec[1]);glVertex3fv(vec[2]); glVertex3fv(vec[3]);
glVertex3fv(vec[0]); glVertex3fv(vec[4]);glVertex3fv(vec[5]); glVertex3fv(vec[6]);
glVertex3fv(vec[7]); glVertex3fv(vec[4]);
glEnd();
glBegin(GL_LINE_STRIP);
glVertex3fv(vec+3); glVertex3fv(vec+15);
glBegin(GL_LINES);
glVertex3fv(vec[1]); glVertex3fv(vec[5]);
glVertex3fv(vec[2]); glVertex3fv(vec[6]);
glVertex3fv(vec[3]); glVertex3fv(vec[7]);
glEnd();
glBegin(GL_LINE_STRIP);
glVertex3fv(vec+6); glVertex3fv(vec+18);
glEnd();
glBegin(GL_LINE_STRIP);
glVertex3fv(vec+9); glVertex3fv(vec+21);
glEnd();
}
void get_local_bounds(Object *ob, float *centre, float *size)
@@ -3315,7 +3304,7 @@ static void draw_bounding_volume(Object *ob)
if(bb==0) return;
if(ob->boundtype==OB_BOUND_BOX) draw_bb_box(bb);
if(ob->boundtype==OB_BOUND_BOX) draw_box(bb->vec);
else draw_bb_quadric(bb, ob->boundtype);
}
@@ -3350,17 +3339,7 @@ static void drawtexspace(Object *ob)
setlinestyle(2);
glBegin(GL_LINE_STRIP);
glVertex3fv(vec[0]); glVertex3fv(vec[1]);glVertex3fv(vec[2]); glVertex3fv(vec[3]);
glVertex3fv(vec[0]); glVertex3fv(vec[4]);glVertex3fv(vec[5]); glVertex3fv(vec[6]);
glVertex3fv(vec[7]); glVertex3fv(vec[4]);
glEnd();
glBegin(GL_LINES);
glVertex3fv(vec[1]); glVertex3fv(vec[5]);
glVertex3fv(vec[2]); glVertex3fv(vec[6]);
glVertex3fv(vec[3]); glVertex3fv(vec[7]);
glEnd();
draw_box(vec);
setlinestyle(0);
}