Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-28 03:58:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop failing texture load at startup, always show nearby agent count

Browse source
This commit is contained in:
Philip Rosedale 2013-02-12 01:50:12 -08:00
parent b58bb6fe80
commit 82594c31ba
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
interface/src/main.cpp
View file

@ -258,10 +258,6 @@ void display_stats(void)
myHead.getYaw(), myHead.getRenderYaw()); myHead.getYaw(), myHead.getRenderYaw());
drawtext(10, 50, 0.10, 0, 1.0, 0, adc); drawtext(10, 50, 0.10, 0, 1.0, 0, adc);
char agents[100];
sprintf(agents, "Nearby: %d\n", nearbyAgents);
drawtext(WIDTH-200,20, 0.10, 0, 1.0, 0, agents, 1, 1, 0);
} }
void initDisplay(void) void initDisplay(void)
@ -275,7 +271,7 @@ void initDisplay(void)
glEnable(GL_LIGHT0); glEnable(GL_LIGHT0);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
load_png_as_texture(texture_filename); //load_png_as_texture(texture_filename);
if (fullscreen) glutFullScreen(); if (fullscreen) glutFullScreen();
} }
@ -664,6 +660,12 @@ void display(void)
// Display miscellaneous text stats onscreen // Display miscellaneous text stats onscreen
if (stats_on) display_stats(); if (stats_on) display_stats();
// Draw number of nearby people always
char agents[100];
sprintf(agents, "Agents nearby: %d\n", nearbyAgents);
drawtext(WIDTH-200,20, 0.10, 0, 1.0, 0, agents, 1, 1, 0);
#ifdef MARKER_CAPTURE #ifdef MARKER_CAPTURE
/* Render marker acquisition stuff */ /* Render marker acquisition stuff */
pthread_mutex_lock(&frame_lock); pthread_mutex_lock(&frame_lock);
@ -919,7 +921,7 @@ int main(int argc, char** argv)
incoming_packet = new char[MAX_PACKET_SIZE]; incoming_packet = new char[MAX_PACKET_SIZE];
// //
printf("Testing math... standard deviation.\n"); printf("Testing stats math... ");
StDev stdevtest; StDev stdevtest;
stdevtest.reset(); stdevtest.reset();
stdevtest.addValue(1345); stdevtest.addValue(1345);
@ -933,20 +935,15 @@ int main(int argc, char** argv)
stdevtest.addValue(1303); stdevtest.addValue(1303);
stdevtest.addValue(1299); stdevtest.addValue(1299);
if (stdevtest.getSamples() == 10) if (stdevtest.getSamples() != 10)
printf("Samples=PASS ");
else
printf("Samples=FAIL "); printf("Samples=FAIL ");
if (floor(stdevtest.getAverage()*100.0) == 132859.0) if (floor(stdevtest.getAverage()*100.0) != 132859.0)
printf("Average=PASS "); printf("Average=FAIL ");
else
printf("Average=FAIL, avg reported = %5.3f ", floor(stdevtest.getAverage()*100.0));
if (floor(stdevtest.getStDev()*100.0) == 2746.0) if (floor(stdevtest.getStDev()*100.0) != 2746.0)
printf("Stdev=PASS \n"); printf("Stdev=FAIL ");
else printf("\n");
printf("Stdev=FAIL \n");
// //
// Try to connect the serial port I/O // Try to connect the serial port I/O
@ -961,7 +958,6 @@ int main(int argc, char** argv)
serial_on = 1; serial_on = 1;
} }
glutInit(&argc, argv); glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH); glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
glutInitWindowSize(WIDTH, HEIGHT); glutInitWindowSize(WIDTH, HEIGHT);