Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 02:40:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin' into startupTimer

Browse source
This commit is contained in:
Philip Rosedale 2013-04-11 00:11:52 -07:00
commit a0938cddea
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/main.cpp
View file

@ -780,9 +780,7 @@ void display(void)
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
//---------------------------------------------
// draw a red sphere // draw a red sphere
//---------------------------------------------
float sphereRadius = 0.25f; float sphereRadius = 0.25f;
glColor3f(1,0,0); glColor3f(1,0,0);
glPushMatrix(); glPushMatrix();
@ -790,9 +788,7 @@ void display(void)
glutSolidSphere( sphereRadius, 15, 15 ); glutSolidSphere( sphereRadius, 15, 15 );
glPopMatrix(); glPopMatrix();
//--------------------------------------------- //draw a grid gound plane....
// draw a grid gound plane....
//---------------------------------------------
drawGroundPlaneGrid( 5.0f, 9 ); drawGroundPlaneGrid( 5.0f, 9 );
@ -833,19 +829,8 @@ void display(void)
if (::frustumOn) render_view_frustum(); if (::frustumOn) render_view_frustum();
//--------------------------------- //Render my own avatar
// Render my own avatar
//---------------------------------
myAvatar.render( true, 1 ); myAvatar.render( true, 1 );
/*
glPushMatrix();
glLoadIdentity();
glTranslatef(0.f, 0.f, -7.f);
myAvatar.render(displayHead, 1);
glPopMatrix();
*/
} }
glPopMatrix(); glPopMatrix();
@ -1232,9 +1217,7 @@ void idle(void)
if (diffclock(&lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) if (diffclock(&lastTimeIdle, &check) > IDLE_SIMULATE_MSECS)
{ {
//----------------------------------------------------------------
// If mouse is being dragged, update hand movement in the avatar // If mouse is being dragged, update hand movement in the avatar
//----------------------------------------------------------------
if ( mousePressed == 1 ) if ( mousePressed == 1 )
{ {
float xOffset = ( mouseX - mouseStartX ) / (double)WIDTH; float xOffset = ( mouseX - mouseStartX ) / (double)WIDTH;