i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made FPS counter of GLTeapot more scalable. Also made the file style guide compliant.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21782 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2007-08-01 18:00:46 +00:00
parent 463be7ab63
commit 62db84dc99
1 changed files with 78 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/glteapot/FPS.cpp
+77 -82
View File
@@ -2,37 +2,36 @@
Copyright 1999, Be Incorporated. All Rights Reserved. Copyright 1999, Be Incorporated. All Rights Reserved.
This file may be used under the terms of the Be Sample Code License. This file may be used under the terms of the Be Sample Code License.
*/ */
#include "FPS.h" #include "FPS.h"
FPS::FPS() FPS::FPS()
{ {
} }
FPS::~FPS() FPS::~FPS()
{ {
} }
void FPS::drawChar( GLfloat x, GLfloat y, GLint number )
void
FPS::drawChar(GLfloat x, GLfloat y, GLint number)
{ {
static bool numbers[13][7] = { static bool numbers[13][7] = {
{true,true,true,true,true,true,false}, /* 0 */ { true, true, true, true, true, true, false }, /* 0 */
{false,true,true,false,false,false,false}, /* 1 */ { false, true, true, false, false, false, false }, /* 1 */
{true,true,false,true,true,false,true}, /* 2 */ { true, true, false, true, true, false, true }, /* 2 */
{true,true,true,true,false,false,true}, /* 3 */ { true, true, true, true, false, false, true }, /* 3 */
{false,true,true,false,false,true,true}, /* 4 */ { false, true, true, false, false, true, true }, /* 4 */
{true,false,true,true,false,true,true}, /* 5 */ { true, false, true, true, false, true, true }, /* 5 */
{true,false,true,true,true,true,true}, /* 6 */ { true, false, true, true, true, true, true }, /* 6 */
{true,true,true,false,false,false,false}, /* 7 */ { true, true, true, false, false, false, false }, /* 7 */
{true,true,true,true,true,true,true}, /* 8 */ { true, true, true, true, true, true, true }, /* 8 */
{true,true,true,false,false,true,true}, /* 9 */ { true, true, true, false, false, true, true }, /* 9 */
{true,false,false,false,true,true,true}, /* F */
{true,true,false,false,true,true,true}, /* P */
{true,false,true,true,false,true,true}, /* S */
{ true, false, false, false, true, true, true }, /* F */
{ true, true, false, false, true, true, true }, /* P */
{ true, false, true, true, false, true, true }, /* S */
}; };
static GLfloat gap = 0.03; static GLfloat gap = 0.03;
@@ -51,85 +50,81 @@ void FPS::drawChar( GLfloat x, GLfloat y, GLint number )
static GLfloat y5 = -y1; static GLfloat y5 = -y1;
static GLfloat y6 = -y0; static GLfloat y6 = -y0;
glBegin( GL_LINES ); glBegin(GL_LINES);
if( numbers[number][0] ) if (numbers[number][0]) {
{ glVertex2f(x1 + x, y0 + y);
glVertex2f( x1 + x, y0 + y ); glVertex2f(x2 + x, y0 + y);
glVertex2f( x2 + x, y0 + y );
} }
if( numbers[number][1] )
{
glVertex2f( x3 + x, y1 + y );
glVertex2f( x3 + x, y2 + y );
}
if( numbers[number][2] )
{
glVertex2f( x3 + x, y4 + y );
glVertex2f( x3 + x, y5 + y );
}
if( numbers[number][3] )
{
glVertex2f( x1 + x, y6 + y );
glVertex2f( x2 + x, y6 + y );
}
if( numbers[number][4] )
{
glVertex2f( x0 + x, y5 + y );
glVertex2f( x0 + x, y4 + y );
}
if( numbers[number][5] )
{
glVertex2f( x0 + x, y2 + y );
glVertex2f( x0 + x, y1 + y );
}
if( numbers[number][6] )
{
glVertex2f( x1 + x, y3 + y );
glVertex2f( x2 + x, y3 + y );
}
glEnd();
if (numbers[number][1]) {
glVertex2f(x3 + x, y1 + y);
glVertex2f(x3 + x, y2 + y);
}
if (numbers[number][2]) {
glVertex2f(x3 + x, y4 + y);
glVertex2f(x3 + x, y5 + y);
}
if (numbers[number][3]) {
glVertex2f(x1 + x, y6 + y);
glVertex2f(x2 + x, y6 + y);
}
if (numbers[number][4]) {
glVertex2f(x0 + x, y5 + y);
glVertex2f(x0 + x, y4 + y);
}
if (numbers[number][5]) {
glVertex2f(x0 + x, y2 + y);
glVertex2f(x0 + x, y1 + y);
}
if (numbers[number][6]) {
glVertex2f(x1 + x, y3 + y);
glVertex2f(x2 + x, y3 + y);
}
glEnd();
} }
void FPS::drawCounter( GLfloat frameRate )
void
FPS::drawCounter(GLfloat frameRate)
{ {
GLfloat pos = 0; GLfloat pos = 0;
int ifps = (int) (frameRate * 10 +0.5); int ifps = (int)(frameRate * 10 + 0.5);
int c100,c10,c1,c_1;
c100 = ifps / 1000; int count = 0;
c10 = (ifps / 100) % 10; int number = 10;
c1 = (ifps / 10) % 10; while (ifps > number) {
c_1 = ifps % 10; number *= 10;
count++;
if( c100 )
{
drawChar( pos, 0, c100 );
pos += 1;
} }
if( c100 || c10 )
{
drawChar( pos, 0, c10 );
pos += 1;
}
drawChar( pos, 0, c1 );
pos += 0.5;
glBegin( GL_POINTS ); number /= 10;
glVertex2f( pos, -0.5 ); for (int i = 0; i < count; i++) {
drawChar(pos, 0, (ifps / number) % 10);
pos += 1.0;
if (number == 1)
break;
number /= 10;
}
pos -= 0.5;
glBegin(GL_POINTS);
glVertex2f(pos, -0.5);
glEnd(); glEnd();
pos += 0.5; pos += 0.5;
drawChar( pos, 0, c_1 ); drawChar(pos, 0, (ifps / number) % 10);
pos += 1.5; pos += 1.5;
drawChar(pos, 0, 10);
drawChar( pos, 0, 10 );
pos += 1; pos += 1;
drawChar( pos, 0, 11 ); drawChar(pos, 0, 11);
pos += 1; pos += 1;
drawChar( pos, 0, 12 ); drawChar(pos, 0, 12);
pos += 1; pos += 1;
} }