nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pipecross

Browse source
This commit is contained in:
Derek Foreman 2003-05-25 03:17:29 +00:00
parent d6652d0a90
commit f9505b23b7
2 changed files with 85 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
render/gradient.c
View file

@ -543,41 +543,41 @@ void render_gl_gradient(Surface *sf, int x, int y, int w, int h)
case Background_Solid: /* already handled */ case Background_Solid: /* already handled */
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
return; return;
case Background_Horizontal: case Background_Horizontal:
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
break; break;
case Background_Vertical: case Background_Vertical:
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
break; break;
case Background_Diagonal: case Background_Diagonal:
@ -586,18 +586,18 @@ void render_gl_gradient(Surface *sf, int x, int y, int w, int h)
ab = (pb + sb) / 2.0; ab = (pb + sb) / 2.0;
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x, y, 0); glVertex2i(x, y);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
break; break;
case Background_CrossDiagonal: case Background_CrossDiagonal:
@ -606,51 +606,93 @@ void render_gl_gradient(Surface *sf, int x, int y, int w, int h)
ab = (pb + sb) / 2.0; ab = (pb + sb) / 2.0;
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(ar, ag, ab); glColor3f(ar, ag, ab);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
break; break;
case Background_Pyramid: case Background_Pyramid:
printf("pyramid\n"); printf("pyramid\n");
break; break;
case Background_PipeCross: case Background_PipeCross:
glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb);
glVertex2i(x, y);
glColor3f(sr, sg, sb);
glVertex2i(x+w/2, y+h/2);
glVertex2i(x, y+h/2);
glVertex2i(x, y+h/2);
glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb);
glVertex2i(x, y+h);
glVertex2i(x, y+h);
glColor3f(sr, sg, sb);
glVertex2i(x+w/2, y+h/2);
glVertex2i(x+w/2, y+h);
glVertex2i(x+w/2, y+h);
glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb);
glVertex2i(x+w, y+h);
glVertex2i(x+w, y+h);
glColor3f(sr, sg, sb);
glVertex2i(x+w/2, y+h/2);
glVertex2i(x+w, y+h/2);
glVertex2i(x+w, y+h/2);
glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb);
glVertex2i(x+w, y);
glVertex2i(x+w, y);
glColor3f(sr, sg, sb);
glVertex2i(x+w/2, y+h/2);
glVertex2i(x+w/2, y);
glVertex2i(x+w/2, y);
glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb);
glVertex2i(x, y);
glEnd();
break; break;
case Background_Rectangle: case Background_Rectangle:
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w/2, y+h/2, 0); glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glVertex3i(x, y+h, 0); glVertex2i(x, y+h);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w/2, y+h/2, 0); glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glVertex3i(x+w, y+h, 0); glVertex2i(x+w, y+h);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w/2, y+h/2, 0); glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glVertex3i(x+w, y, 0); glVertex2i(x+w, y);
glColor3f(sr, sg, sb); glColor3f(sr, sg, sb);
glVertex3i(x+w/2, y+h/2, 0); glVertex2i(x+w/2, y+h/2);
glColor3f(pr, pg, pb); glColor3f(pr, pg, pb);
glVertex3i(x, y, 0); glVertex2i(x, y);
glEnd(); glEnd();
break; break;

2
render/test.c
View file

@ -51,7 +51,7 @@ int main()
render_startup(); render_startup();
look = appearance_new(Surface_Planar, 0); look = appearance_new(Surface_Planar, 0);
look->surface.data.planar.grad = Background_Rectangle; look->surface.data.planar.grad = Background_PipeCross;
look->surface.data.planar.secondary = color_parse("Yellow"); look->surface.data.planar.secondary = color_parse("Yellow");
look->surface.data.planar.primary = color_parse("Blue"); look->surface.data.planar.primary = color_parse("Blue");
look->surface.data.planar.interlaced = FALSE; look->surface.data.planar.interlaced = FALSE;