Showing the changes to interface/src/main.cpp (1 of 6 files). Show all
Unified · Split
| @@ -304,7 +304,7 @@ void displayStats(void) · 303 unmodified lines | |||
| 304 | char legend2[] = "* - toggle stars, & - toggle paint mode, '-' - send erase all, '%' - send add scene"; | 304 | char legend2[] = "* - toggle stars, & - toggle paint mode, '-' - send erase all, '%' - send add scene"; |
| 305 | drawtext(10, statsVerticalOffset + 32, 0.10f, 0, 1.0, 0, legend2); | 305 | drawtext(10, statsVerticalOffset + 32, 0.10f, 0, 1.0, 0, legend2); |
| 306 | 306 | ||
| 307 | glm::vec3 avatarPos = myAvatar.getBodyPosition(); | 307 | glm::vec3 avatarPos = myAvatar.getPosition(); |
| 308 | 308 | ||
| 309 | char stats[200]; | 309 | char stats[200]; |
| 310 | sprintf(stats, "FPS = %3.0f Pkts/s = %d Bytes/s = %d Head(x,y,z)= %4.2f, %4.2f, %4.2f ", | 310 | sprintf(stats, "FPS = %3.0f Pkts/s = %d Bytes/s = %d Head(x,y,z)= %4.2f, %4.2f, %4.2f ", |
| @@ -396,8 +396,8 @@ void init(void) · 85 unmodified lines | |||
| 396 | if (noiseOn) { | 396 | if (noiseOn) { |
| 397 | myAvatar.setNoise(noise); | 397 | myAvatar.setNoise(noise); |
| 398 | } | 398 | } |
| 399 | myAvatar.setBodyPosition(start_location); | 399 | myAvatar.setPosition(start_location); |
| 400 | myCamera.setPosition( start_location ); | 400 | myCamera.setPosition(start_location); |
| 401 | 401 | ||
| 402 | 402 | ||
| 403 | #ifdef MARKER_CAPTURE | 403 | #ifdef MARKER_CAPTURE |
| @@ -438,7 +438,7 @@ void reset_sensors() · 34 unmodified lines | |||
| 438 | 438 | ||
| 439 | renderYawRate = 0; | 439 | renderYawRate = 0; |
| 440 | renderPitchRate = 0; | 440 | renderPitchRate = 0; |
| 441 | myAvatar.setBodyPosition(start_location); | 441 | myAvatar.setPosition(start_location); |
| 442 | headMouseX = WIDTH/2; | 442 | headMouseX = WIDTH/2; |
| 443 | headMouseY = HEIGHT/2; | 443 | headMouseY = HEIGHT/2; |
| 444 | 444 | ||
| @@ -551,7 +551,7 @@ void updateAvatar(float frametime) · 106 unmodified lines | |||
| 551 | // If I'm in paint mode, send a voxel out to VOXEL server agents. | 551 | // If I'm in paint mode, send a voxel out to VOXEL server agents. |
| 552 | if (::paintOn) { | 552 | if (::paintOn) { |
| 553 | 553 | ||
| 554 | glm::vec3 avatarPos = myAvatar.getBodyPosition(); | 554 | glm::vec3 avatarPos = myAvatar.getPosition(); |
| 555 | 555 | ||
| 556 | // For some reason, we don't want to flip X and Z here. | 556 | // For some reason, we don't want to flip X and Z here. |
| 557 | ::paintingVoxel.x = avatarPos.x/10.0; | 557 | ::paintingVoxel.x = avatarPos.x/10.0; |
| @@ -833,7 +833,7 @@ void display(void) · 275 unmodified lines | |||
| 833 | //---------------------------------------------------- | 833 | //---------------------------------------------------- |
| 834 | // set the camera to third-person view behind my av | 834 | // set the camera to third-person view behind my av |
| 835 | //---------------------------------------------------- | 835 | //---------------------------------------------------- |
| 836 | myCamera.setTargetPosition ( myAvatar.getBodyPosition() ); | 836 | myCamera.setTargetPosition ( myAvatar.getPosition() ); |
| 837 | myCamera.setYaw ( 180.0 - myAvatar.getBodyYaw() ); | 837 | myCamera.setYaw ( 180.0 - myAvatar.getBodyYaw() ); |
| 838 | myCamera.setPitch ( 0.0 ); // temporarily, this must be 0.0 or else bad juju | 838 | myCamera.setPitch ( 0.0 ); // temporarily, this must be 0.0 or else bad juju |
| 839 | myCamera.setRoll ( 0.0 ); | 839 | myCamera.setRoll ( 0.0 ); |
| @@ -1265,7 +1265,7 @@ void shiftPaintingColor() · 425 unmodified lines | |||
| 1265 | } | 1265 | } |
| 1266 | 1266 | ||
| 1267 | void setupPaintingVoxel() { | 1267 | void setupPaintingVoxel() { |
| 1268 | glm::vec3 avatarPos = myAvatar.getBodyPosition(); | 1268 | glm::vec3 avatarPos = myAvatar.getPosition(); |
| 1269 | 1269 | ||
| 1270 | ::paintingVoxel.x = avatarPos.z/-10.0; // voxel space x is negative z head space | 1270 | ::paintingVoxel.x = avatarPos.z/-10.0; // voxel space x is negative z head space |
| 1271 | ::paintingVoxel.y = avatarPos.y/-10.0; // voxel space y is negative y head space | 1271 | ::paintingVoxel.y = avatarPos.y/-10.0; // voxel space y is negative y head space |