Showing the changes to interface/src/main.cpp (1 of 2 files). Show all
Unified · Split
| @@ -69,7 +69,6 @@ · 68 unmodified lines | |||
| 69 | 69 | ||
| 70 | #include "Camera.h" | 70 | #include "Camera.h" |
| 71 | #include "Avatar.h" | 71 | #include "Avatar.h" |
| 72 | #include "AvatarRenderer.h" | ||
| 73 | #include "Texture.h" | 72 | #include "Texture.h" |
| 74 | #include <AgentList.h> | 73 | #include <AgentList.h> |
| 75 | #include <AgentTypes.h> | 74 | #include <AgentTypes.h> |
| @@ -120,9 +119,6 @@ Avatar myAvatar(true); // The rendered avatar of oneself · 44 unmodified lines | |||
| 120 | Camera myCamera; // My view onto the world (sometimes on myself :) | 119 | Camera myCamera; // My view onto the world (sometimes on myself :) |
| 121 | Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode | 120 | Camera viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode |
| 122 | 121 | ||
| 123 | |||
| 124 | AvatarRenderer avatarRenderer; | ||
| 125 | |||
| 126 | // Starfield information | 122 | // Starfield information |
| 127 | char starFile[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; | 123 | char starFile[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; |
| 128 | char starCacheFile[] = "cachedStars.txt"; | 124 | char starCacheFile[] = "cachedStars.txt"; |
| @@ -720,7 +716,6 @@ void displaySide(Camera& whichCamera) { · 591 unmodified lines | |||
| 720 | if (agent->getLinkedData() != NULL && agent->getType() == AGENT_TYPE_AVATAR) { | 716 | if (agent->getLinkedData() != NULL && agent->getType() == AGENT_TYPE_AVATAR) { |
| 721 | Avatar *avatar = (Avatar *)agent->getLinkedData(); | 717 | Avatar *avatar = (Avatar *)agent->getLinkedData(); |
| 722 | avatar->render(0); | 718 | avatar->render(0); |
| 723 | avatarRenderer.render(avatar, 0); // this will replace the above call | ||
| 724 | } | 719 | } |
| 725 | } | 720 | } |
| 726 | agentList->unlock(); | 721 | agentList->unlock(); |
| @@ -733,7 +728,6 @@ void displaySide(Camera& whichCamera) { · 6 unmodified lines | |||
| 733 | 728 | ||
| 734 | //Render my own avatar | 729 | //Render my own avatar |
| 735 | myAvatar.render(::lookingInMirror); | 730 | myAvatar.render(::lookingInMirror); |
| 736 | avatarRenderer.render(&myAvatar, lookingInMirror); // this will replace the above call | ||
| 737 | 731 | ||
| 738 | glPopMatrix(); | 732 | glPopMatrix(); |
| 739 | } | 733 | } |