History

Merge remote-tracking branch 'upstream/master'

Philip Rosedale committed 13 years ago

Commit a4405702 parents 99a4d0f daa83507 files · +164 −139Browse files

Showing the changes to interface/src/main.cpp (1 of 7 files). Show all

Unified · Split

interface/src/main.cpp+8−12
@@ -306,7 +306,7 @@ void displayStats(void) · 305 unmodified lines
306306 char legend2[] = "* - toggle stars, & - toggle paint mode, '-' - send erase all, '%' - send add scene";
307307 drawtext(10, statsVerticalOffset + 32, 0.10f, 0, 1.0, 0, legend2);
308308
309− glm::vec3 avatarPos = myAvatar.getBodyPosition();
309+ glm::vec3 avatarPos = myAvatar.getPosition();
310310
311311 char stats[200];
312312 sprintf(stats, "FPS = %3.0f Pkts/s = %d Bytes/s = %d Head(x,y,z)= %4.2f, %4.2f, %4.2f ",
@@ -398,8 +398,8 @@ void init(void) · 85 unmodified lines
398398 if (noiseOn) {
399399 myAvatar.setNoise(noise);
400400 }
401− myAvatar.setBodyPosition(start_location);
402− myCamera.setPosition( start_location );
401+ myAvatar.setPosition(start_location);
402+ myCamera.setPosition(start_location);
403403
404404
405405 #ifdef MARKER_CAPTURE
@@ -440,7 +440,7 @@ void reset_sensors() · 34 unmodified lines
440440
441441 renderYawRate = 0;
442442 renderPitchRate = 0;
443− myAvatar.setBodyPosition(start_location);
443+ myAvatar.setPosition(start_location);
444444 headMouseX = WIDTH/2;
445445 headMouseY = HEIGHT/2;
446446
@@ -540,7 +540,7 @@ void updateAvatar(float frametime) · 93 unmodified lines
540540 // If I'm in paint mode, send a voxel out to VOXEL server agents.
541541 if (::paintOn) {
542542
543− glm::vec3 avatarPos = myAvatar.getBodyPosition();
543+ glm::vec3 avatarPos = myAvatar.getPosition();
544544
545545 // For some reason, we don't want to flip X and Z here.
546546 ::paintingVoxel.x = avatarPos.x/10.0;
@@ -822,7 +822,7 @@ void display(void) · 275 unmodified lines
822822 //----------------------------------------------------
823823 // set the camera to third-person view behind my av
824824 //----------------------------------------------------
825− myCamera.setTargetPosition ( myAvatar.getBodyPosition() );
825+ myCamera.setTargetPosition ( myAvatar.getPosition() );
826826 myCamera.setYaw ( 180.0 - myAvatar.getBodyYaw() );
827827 myCamera.setPitch ( 0.0 ); // temporarily, this must be 0.0 or else bad juju
828828 myCamera.setRoll ( 0.0 );
@@ -1264,7 +1264,7 @@ void shiftPaintingColor() · 435 unmodified lines
12641264 }
12651265
12661266 void setupPaintingVoxel() {
1267− glm::vec3 avatarPos = myAvatar.getBodyPosition();
1267+ glm::vec3 avatarPos = myAvatar.getPosition();
12681268
12691269 ::paintingVoxel.x = avatarPos.z/-10.0; // voxel space x is negative z head space
12701270 ::paintingVoxel.y = avatarPos.y/-10.0; // voxel space y is negative y head space
@@ -1493,7 +1493,7 @@ void idle(void) { · 222 unmodified lines
14931493 //
14941494 updateAvatar(deltaTime);
14951495
1496− //loop through all the other avatars and simulate them.
1496+ //loop through all the other avatars and simulate them...
14971497 AgentList * agentList = AgentList::getInstance();
14981498 for(std::vector<Agent>::iterator agent = agentList->getAgents().begin(); agent != agentList->getAgents().end(); agent++)
14991499 {
@@ -1501,9 +1501,6 @@ void idle(void) { · 1 unmodified line
15011501 {
15021502 Head *avatar = (Head *)agent->getLinkedData();
15031503 avatar->simulate(deltaTime);
1504−
1505− //not ready yet...
1506− //myAvatar.testForCollision( avatar->getBodyPosition(), avatar->getGirth(), avatar->getHeight(), avatar->getBodyUpDirection() );
15071504 }
15081505 }
15091506
@@ -1514,7 +1511,6 @@ void idle(void) { · 4 unmodified lines
15141511
15151512 glutPostRedisplay();
15161513 lastTimeIdle = check;
1517−
15181514 }
15191515
15201516 // Read serial data

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t