Showing the changes to interface/src/main.cpp (1 of 5 files). Show all
Unified · Split
| @@ -102,7 +102,7 @@ Oscilloscope audioScope(256,200,true); · 101 unmodified lines | |||
| 102 | 102 | ||
| 103 | ViewFrustum viewFrustum; // current state of view frustum, perspective, orientation, etc. | 103 | ViewFrustum viewFrustum; // current state of view frustum, perspective, orientation, etc. |
| 104 | 104 | ||
| 105 | Head myAvatar; // The rendered avatar of oneself | 105 | Head myAvatar(true); // The rendered avatar of oneself |
| 106 | Camera myCamera; // My view onto the world (sometimes on myself :) | 106 | Camera myCamera; // My view onto the world (sometimes on myself :) |
| 107 | Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode | 107 | Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode |
| 108 | 108 | ||
| @@ -826,7 +826,7 @@ void display(void) · 717 unmodified lines | |||
| 826 | glPushMatrix(); | 826 | glPushMatrix(); |
| 827 | glm::vec3 pos = agentHead->getBodyPosition(); | 827 | glm::vec3 pos = agentHead->getBodyPosition(); |
| 828 | glTranslatef(-pos.x, -pos.y, -pos.z); | 828 | glTranslatef(-pos.x, -pos.y, -pos.z); |
| 829 | agentHead->render(0, 0); | 829 | agentHead->render(0); |
| 830 | glPopMatrix(); | 830 | glPopMatrix(); |
| 831 | } | 831 | } |
| 832 | } | 832 | } |
| @@ -841,7 +841,7 @@ void display(void) · 8 unmodified lines | |||
| 841 | 841 | ||
| 842 | 842 | ||
| 843 | //Render my own avatar | 843 | //Render my own avatar |
| 844 | myAvatar.render( true, 1 ); | 844 | myAvatar.render(true); |
| 845 | } | 845 | } |
| 846 | 846 | ||
| 847 | glPopMatrix(); | 847 | glPopMatrix(); |
| @@ -1494,7 +1494,7 @@ void mouseoverFunc( int x, int y) · 646 unmodified lines | |||
| 1494 | 1494 | ||
| 1495 | void attachNewHeadToAgent(Agent *newAgent) { | 1495 | void attachNewHeadToAgent(Agent *newAgent) { |
| 1496 | if (newAgent->getLinkedData() == NULL) { | 1496 | if (newAgent->getLinkedData() == NULL) { |
| 1497 | newAgent->setLinkedData(new Head()); | 1497 | newAgent->setLinkedData(new Head(false)); |
| 1498 | } | 1498 | } |
| 1499 | } | 1499 | } |
| 1500 | 1500 | ||