Showing the changes to interface/src/main.cpp (1 of 1 file). Show all
Unified · Split
| @@ -143,11 +143,12 @@ bool renderStatsOn = false; // Whether to show onscreen text overlay wi · 142 unmodified lines | |||
| 143 | bool renderVoxels = true; // Whether to render voxels | 143 | bool renderVoxels = true; // Whether to render voxels |
| 144 | bool renderStarsOn = true; // Whether to display the stars | 144 | bool renderStarsOn = true; // Whether to display the stars |
| 145 | bool renderAtmosphereOn = true; // Whether to display the atmosphere | 145 | bool renderAtmosphereOn = true; // Whether to display the atmosphere |
| 146 | bool renderAvatarsOn = true; // Whether to render avatars | 146 | bool renderAvatarsOn = true; // Whether to render avatars |
| 147 | bool renderFirstPersonOn = false; // Whether to render in first person | ||
| 147 | bool paintOn = false; // Whether to paint voxels as you fly around | 148 | bool paintOn = false; // Whether to paint voxels as you fly around |
| 148 | VoxelDetail paintingVoxel; // The voxel we're painting if we're painting | 149 | VoxelDetail paintingVoxel; // The voxel we're painting if we're painting |
| 149 | unsigned char dominantColor = 0; // The dominant color of the voxel we're painting | 150 | unsigned char dominantColor = 0; // The dominant color of the voxel we're painting |
| 150 | bool perfStatsOn = false; // Do we want to display perfStats? | 151 | bool perfStatsOn = false; // Do we want to display perfStats? |
| 151 | 152 | ||
| 152 | bool logOn = true; // Whether to show on-screen log | 153 | bool logOn = true; // Whether to show on-screen log |
| 153 | 154 | ||
| @@ -1198,7 +1199,12 @@ int setRenderAvatars(int state) { · 1044 unmodified lines | |||
| 1198 | return setValue(state, &::renderAvatarsOn); | 1199 | return setValue(state, &::renderAvatarsOn); |
| 1199 | } | 1200 | } |
| 1200 | 1201 | ||
| 1201 | 1202 | int setRenderFirstPerson(int state) { | |
| 1203 | bool value = setValue(state, &::renderFirstPersonOn); | ||
| 1204 | if (::renderFirstPersonOn) { myCamera.setMode(CAMERA_MODE_FIRST_PERSON); } | ||
| 1205 | else { myCamera.setMode(CAMERA_MODE_THIRD_PERSON); } | ||
| 1206 | return value; | ||
| 1207 | } | ||
| 1202 | 1208 | ||
| 1203 | int setOculus(int state) { | 1209 | int setOculus(int state) { |
| 1204 | bool wasOn = ::oculusOn; | 1210 | bool wasOn = ::oculusOn; |
| @@ -1361,6 +1367,7 @@ void initMenu() { · 156 unmodified lines | |||
| 1361 | menuColumnRender->addRow("Stars (*)", setStars); | 1367 | menuColumnRender->addRow("Stars (*)", setStars); |
| 1362 | menuColumnRender->addRow("Atmosphere (A)", setAtmosphere); | 1368 | menuColumnRender->addRow("Atmosphere (A)", setAtmosphere); |
| 1363 | menuColumnRender->addRow("Avatars", setRenderAvatars); | 1369 | menuColumnRender->addRow("Avatars", setRenderAvatars); |
| 1370 | menuColumnRender->addRow("First Person (p)", setRenderFirstPerson); | ||
| 1364 | menuColumnRender->addRow("Oculus (o)", setOculus); | 1371 | menuColumnRender->addRow("Oculus (o)", setOculus); |
| 1365 | 1372 | ||
| 1366 | // Tools | 1373 | // Tools |
| @@ -1578,6 +1585,8 @@ void key(unsigned char k, int x, int y) { · 211 unmodified lines | |||
| 1578 | if (k == 'f') setFullscreen(!::fullscreen); | 1585 | if (k == 'f') setFullscreen(!::fullscreen); |
| 1579 | if (k == 'o') setOculus(!::oculusOn); | 1586 | if (k == 'o') setOculus(!::oculusOn); |
| 1580 | 1587 | ||
| 1588 | if (k == 'p') myCamera.setMode(CAMERA_MODE_FIRST_PERSON); | ||
| 1589 | |||
| 1581 | if (k == '[') ::viewFrustumOffsetYaw -= 0.5; | 1590 | if (k == '[') ::viewFrustumOffsetYaw -= 0.5; |
| 1582 | if (k == ']') ::viewFrustumOffsetYaw += 0.5; | 1591 | if (k == ']') ::viewFrustumOffsetYaw += 0.5; |
| 1583 | if (k == '{') ::viewFrustumOffsetPitch -= 0.5; | 1592 | if (k == '{') ::viewFrustumOffsetPitch -= 0.5; |