Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -3069,6 +3069,19 @@ void Application::displaySide(Camera& whichCamera) { · 3068 unmodified lines | |||
| 3069 | 3069 | ||
| 3070 | // brad's frustum for debugging | 3070 | // brad's frustum for debugging |
| 3071 | if (_frustumOn->isChecked()) renderViewFrustum(_viewFrustum); | 3071 | if (_frustumOn->isChecked()) renderViewFrustum(_viewFrustum); |
| 3072 | |||
| 3073 | // render voxel fades if they exist | ||
| 3074 | if (_voxelFades.size() > 0) { | ||
| 3075 | for(std::vector<VoxelFade>::iterator fade = _voxelFades.begin(); fade != _voxelFades.end();) { | ||
| 3076 | fade->render(); | ||
| 3077 | if(fade->isDone()) { | ||
| 3078 | fade = _voxelFades.erase(fade); | ||
| 3079 | } else { | ||
| 3080 | ++fade; | ||
| 3081 | } | ||
| 3082 | } | ||
| 3083 | } | ||
| 3084 | |||
| 3072 | } | 3085 | } |
| 3073 | 3086 | ||
| 3074 | void Application::displayOverlay() { | 3087 | void Application::displayOverlay() { |
| @@ -3839,6 +3852,15 @@ void Application::nodeKilled(Node* node) { · 764 unmodified lines | |||
| 3839 | 3852 | ||
| 3840 | printf("voxel server going away...... v[%f, %f, %f, %f]\n", | 3853 | printf("voxel server going away...... v[%f, %f, %f, %f]\n", |
| 3841 | jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s); | 3854 | jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s); |
| 3855 | |||
| 3856 | // Add the jurisditionDetails object to the list of "fade outs" | ||
| 3857 | const float NODE_KILLED_RED = 1.0f; | ||
| 3858 | const float NODE_KILLED_GREEN = 0.0f; | ||
| 3859 | const float NODE_KILLED_BLUE = 0.0f; | ||
| 3860 | |||
| 3861 | VoxelFade fade(VoxelFade::FADE_OUT, NODE_KILLED_RED, NODE_KILLED_GREEN, NODE_KILLED_BLUE); | ||
| 3862 | fade.voxelDetails = jurisditionDetails; | ||
| 3863 | _voxelFades.push_back(fade); | ||
| 3842 | } | 3864 | } |
| 3843 | } | 3865 | } |
| 3844 | } | 3866 | } |
| @@ -3860,6 +3882,15 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng · 15 unmodified lines | |||
| 3860 | if (_voxelServerJurisdictions.find(nodeID) == _voxelServerJurisdictions.end()) { | 3882 | if (_voxelServerJurisdictions.find(nodeID) == _voxelServerJurisdictions.end()) { |
| 3861 | printf("stats from new voxel server... v[%f, %f, %f, %f]\n", | 3883 | printf("stats from new voxel server... v[%f, %f, %f, %f]\n", |
| 3862 | jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s); | 3884 | jurisditionDetails.x, jurisditionDetails.y, jurisditionDetails.z, jurisditionDetails.s); |
| 3885 | |||
| 3886 | // Add the jurisditionDetails object to the list of "fade outs" | ||
| 3887 | const float NODE_ADDED_RED = 0.0f; | ||
| 3888 | const float NODE_ADDED_GREEN = 1.0f; | ||
| 3889 | const float NODE_ADDED_BLUE = 0.0f; | ||
| 3890 | |||
| 3891 | VoxelFade fade(VoxelFade::FADE_OUT, NODE_ADDED_RED, NODE_ADDED_GREEN, NODE_ADDED_BLUE); | ||
| 3892 | fade.voxelDetails = jurisditionDetails; | ||
| 3893 | _voxelFades.push_back(fade); | ||
| 3863 | } | 3894 | } |
| 3864 | // store jurisdiction details for later use | 3895 | // store jurisdiction details for later use |
| 3865 | _voxelServerJurisdictions[nodeID] = jurisditionDetails; | 3896 | _voxelServerJurisdictions[nodeID] = jurisditionDetails; |