projects
/
gltest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
141fa68
)
rename rectVertices -> rectQuad
author
Ralf Jung
<post@ralfj.de>
Sun, 31 Mar 2013 14:40:48 +0000
(16:40 +0200)
committer
Ralf Jung
<post@ralfj.de>
Sun, 31 Mar 2013 14:40:48 +0000
(16:40 +0200)
gltest.cpp
patch
|
blob
|
history
diff --git
a/gltest.cpp
b/gltest.cpp
index b9824a85395e3d5076cc9a531706a28c4006ee45..c66ab32c40efd5db2460da248ad8772e41672d75 100644
(file)
--- a/
gltest.cpp
+++ b/
gltest.cpp
@@
-63,7
+63,7
@@
static double getTime()
return tp.tv_sec + 1e-9 * tp.tv_nsec;
}
return tp.tv_sec + 1e-9 * tp.tv_nsec;
}
-static void rect
Vertices
(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
+static void rect
Quad
(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
{
glVertex2f(x1, y1);
glVertex2f(x2, y1);
{
glVertex2f(x1, y1);
glVertex2f(x2, y1);
@@
-159,7
+159,7
@@
protected:
// clear manually
glBegin(GL_QUADS);
glColor3f(0.0f, 0.0f, 0.0f);
// clear manually
glBegin(GL_QUADS);
glColor3f(0.0f, 0.0f, 0.0f);
- rect
Vertices
(0, 0, 1, 1);
+ rect
Quad
(0, 0, 1, 1);
glEnd();
}
else {
glEnd();
}
else {
@@
-169,7
+169,7
@@
protected:
profilerTick(stateDraw);
glBegin(GL_QUADS);
glColor3f(0.8f, 1.0f, 0.75f);
profilerTick(stateDraw);
glBegin(GL_QUADS);
glColor3f(0.8f, 1.0f, 0.75f);
- rect
Vertices
(boxPos, 0, boxPos+boxWidth, 1);
+ rect
Quad
(boxPos, 0, boxPos+boxWidth, 1);
glEnd();
usleep(sleep_time*1000);
//////////////////////////////////////////////
glEnd();
usleep(sleep_time*1000);
//////////////////////////////////////////////