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

- fixed drawmode 'wire extra'.

Browse Source 
it was using some unsupported linewidth trick... I've been trying to
  get the official glPolygonOffset to working, but my silly Mac doesnt
  support it, it seems.
  So! I thought of another trick, and that's just moving the window
  matrix a little to the front. :)

- for those interested; the code for glPolygonOffset is still there,
  commented out. (drawobject.c)

- btw: the drawobject.c routines are a TOTAL mess!
This commit is contained in:
Ton Roosendaal
2003-10-20 23:20:37 +00:00
parent 7893cc25d1
commit ff89daceb0
2 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1696,34 +1696,60 @@ static void drawDispListshaded(ListBase *lb, Object *ob)
/* wrappers for shaded+wire and solid+wire */
static void drawMeshWireExtra(Object *ob) {
GLfloat origwidth;
GLint origcolor[4];
glGetFloatv(GL_LINE_WIDTH, &origwidth);
glGetIntegerv(GL_CURRENT_COLOR, origcolor);
glLineWidth(1.2);
//glEnable(GL_POLYGON_OFFSET_LINE);
//glPolygonOffset(1.0, 1.0);
if(ob->flag & SELECT) {
if(ob==OBACT) BIF_ThemeColor(TH_ACTIVE);
else BIF_ThemeColor(TH_SELECT);
}
else BIF_ThemeColor(TH_WIRE);
glMatrixMode(GL_PROJECTION);
glTranslatef(0, 0, 0.01);
glMatrixMode(GL_MODELVIEW);
cpack(0x4F4F4F);
drawmeshwire(ob);
glMatrixMode(GL_PROJECTION);
glTranslatef(0, 0, -0.01);
glMatrixMode(GL_MODELVIEW);
//glDisable(GL_POLYGON_OFFSET_LINE);
glColor4iv(origcolor);
glLineWidth(origwidth);
}
static void drawDispListWireExtra(ListBase *lb) {
GLfloat origwidth;
static void drawDispListWireExtra(Object *ob, ListBase *lb) {
GLint origcolor[4];
glGetFloatv(GL_LINE_WIDTH, &origwidth);
glGetIntegerv(GL_CURRENT_COLOR, origcolor);
glLineWidth(1.2);
//glEnable(GL_POLYGON_OFFSET_LINE);
//glPolygonOffset(1.0, 1.0);
if(ob->flag & SELECT) {
if(ob==OBACT) BIF_ThemeColor(TH_ACTIVE);
else BIF_ThemeColor(TH_SELECT);
}
else BIF_ThemeColor(TH_WIRE);
glMatrixMode(GL_PROJECTION);
glTranslatef(0, 0, 0.01);
glMatrixMode(GL_MODELVIEW);
cpack(0x4F4F4F);
drawDispListwire(lb);
glLineWidth(origwidth);
glMatrixMode(GL_PROJECTION);
glTranslatef(0, 0, -0.01);
glMatrixMode(GL_MODELVIEW);
//glDisable(GL_POLYGON_OFFSET_LINE);
glColor4iv(origcolor);
}
@@ -2117,7 +2143,7 @@ static void drawDispList(Object *ob, int dt)
init_gl_materials(ob);
two_sided(me->flag & ME_TWOSIDED);
drawDispListsolid(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
}
else {
@@ -2193,7 +2219,7 @@ static void drawDispList(Object *ob, int dt)
if(dl) {
if(mesh_uses_displist(me)) {
drawDispListshaded(&me->disp, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(&me->disp);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, &me->disp);
} else {
drawmeshshaded(ob, dl->col1, dl->col2);
if(ob->dtx & OB_DRAWWIRE) drawMeshWireExtra(ob);
@@ -2230,13 +2256,13 @@ static void drawDispList(Object *ob, int dt)
if(dt==OB_SHADED) {
if(ob->disp.first==0) shadeDispList(ob);
drawDispListshaded(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
else {
init_gl_materials(ob);
two_sided(0);
drawDispListsolid(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
index3_nors_incr= 1;
@@ -2261,14 +2287,14 @@ static void drawDispList(Object *ob, int dt)
if(dt==OB_SHADED) {
if(ob->disp.first==0) shadeDispList(ob);
drawDispListshaded(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
else {
init_gl_materials(ob);
two_sided(0);
drawDispListsolid(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
}
else {
@@ -2286,14 +2312,14 @@ static void drawDispList(Object *ob, int dt)
dl= lb->first;
if(dl && dl->col1==0) shadeDispList(ob);
drawDispListshaded(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
else {
init_gl_materials(ob);
two_sided(0);
drawDispListsolid(lb, ob);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(lb);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, lb);
}
}
else drawDispListwire(lb);
@@ -3588,12 +3614,12 @@ void draw_object(Base *base)
drawDispListsolid(&me->disp, ob);
/* this seems to be the place where the wire for subsurfs
* gets drawn.. so we draw an extra wire in grey here (editmode) */
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(&me->disp);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, &me->disp);
drawmeshwire(ob);
}
else {
drawmeshsolid(ob, 0);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(&me->disp);
if(ob->dtx & OB_DRAWWIRE) drawDispListWireExtra(ob, &me->disp);
}
}
if(ob==G.obedit && (G.f & G_PROPORTIONAL)) draw_prop_circle();