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

resolve conflicts after merge with upstream master

Browse source
This commit is contained in:
Stephen Birarda 2013-04-25 15:30:57 -07:00
parent 5ddd9a9f4f
commit dac660efda
2 changed files with 239 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

477
interface/src/Avatar.cpp
View file

File diff suppressed because it is too large Load diff

4
interface/src/main.cpp
View file

@ -914,7 +914,7 @@ void display(void)
agent != agentList->end(); agent != agentList->end();
agent++) { agent++) {
if ((*agent).getLinkedData() != NULL && (*agent).getType() == AGENT_TYPE_AVATAR) { if ((*agent).getLinkedData() != NULL && (*agent).getType() == AGENT_TYPE_AVATAR) {
Head *avatar = (Head *)(*agent).getLinkedData(); Avatar *avatar = (Avatar *)(*agent).getLinkedData();
avatar->render(0); avatar->render(0);
} }
} }
@ -1500,7 +1500,7 @@ void idle(void) {
AgentList * agentList = AgentList::getInstance(); AgentList * agentList = AgentList::getInstance();
for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
if ((*agent).getLinkedData() != NULL) { if ((*agent).getLinkedData() != NULL) {
Head *avatar = (Head *)(*agent).getLinkedData(); Avatar *avatar = (Avatar *)(*agent).getLinkedData();
avatar->simulate(deltaTime); avatar->simulate(deltaTime);
} }
} }