Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -855,8 +855,7 @@ void Application::mousePressEvent(QMouseEvent* event) { · 854 unmodified lines | ||
| 855 | 855 | _hoverVoxelOriginalColor[1] = _hoverVoxel.green; |
| 856 | 856 | _hoverVoxelOriginalColor[2] = _hoverVoxel.blue; |
| 857 | 857 | _hoverVoxelOriginalColor[3] = 1; |
| 858 | − _audio.startCollisionSound(1.0, 220, 0.0, 0.999f); | |
| 859 | − qDebug("s = %f\n", _hoverVoxel.s); | |
| 858 | + _audio.startCollisionSound(1.0, 14080 * _hoverVoxel.s * TREE_SCALE, 0.0, 0.999f); | |
| 860 | 859 | _isHoverVoxelSounding = true; |
| 861 | 860 | } |
| 862 | 861 | |
| @@ -1945,10 +1944,11 @@ void Application::update(float deltaTime) { · 1082 unmodified lines | ||
| 1945 | 1944 | |
| 1946 | 1945 | // If we have clicked on a voxel, update it's color |
| 1947 | 1946 | if (_isHoverVoxelSounding) { |
| 1948 | − qDebug("clicking on voxel\n"); | |
| 1949 | 1947 | VoxelNode* hoveredNode = _voxels.getVoxelAt(_hoverVoxel.x, _hoverVoxel.y, _hoverVoxel.z, _hoverVoxel.s); |
| 1950 | − nodeColor clickColor = { 1, 0, 0, 1 }; | |
| 1951 | 1948 | float bright = _audio.getCollisionSoundMagnitude(); |
| 1949 | + nodeColor clickColor = { 255 * bright + _hoverVoxelOriginalColor[0] * (1.f - bright), | |
| 1950 | + _hoverVoxelOriginalColor[1] * (1.f - bright), | |
| 1951 | + _hoverVoxelOriginalColor[2] * (1.f - bright), 1 }; | |
| 1952 | 1952 | hoveredNode->setColor(clickColor); |
| 1953 | 1953 | if (bright < 0.01f) { |
| 1954 | 1954 | hoveredNode->setColor(_hoverVoxelOriginalColor); |
| @@ -1956,7 +1956,17 @@ void Application::update(float deltaTime) { · 1 unmodified line | ||
| 1956 | 1956 | } |
| 1957 | 1957 | } else { |
| 1958 | 1958 | // Check for a new hover voxel |
| 1959 | + glm::vec4 oldVoxel(_hoverVoxel.x, _hoverVoxel.y, _hoverVoxel.z, _hoverVoxel.s); | |
| 1959 | 1960 | _isHoverVoxel = _voxels.findRayIntersection(mouseRayOrigin, mouseRayDirection, _hoverVoxel, distance, face); |
| 1961 | + if (_isHoverVoxel && glm::vec4(_hoverVoxel.x, _hoverVoxel.y, _hoverVoxel.z, _hoverVoxel.s) != oldVoxel) { | |
| 1962 | + //qDebug("bing! x,y,z = %f,%f,%f\n", _hoverVoxel.x, _hoverVoxel.y, _hoverVoxel.z); | |
| 1963 | + _hoverVoxelOriginalColor[0] = _hoverVoxel.red; | |
| 1964 | + _hoverVoxelOriginalColor[1] = _hoverVoxel.green; | |
| 1965 | + _hoverVoxelOriginalColor[2] = _hoverVoxel.blue; | |
| 1966 | + _hoverVoxelOriginalColor[3] = 1; | |
| 1967 | + _audio.startCollisionSound(1.0, 14080 * _hoverVoxel.s * TREE_SCALE, 0.0, 0.992f); | |
| 1968 | + _isHoverVoxelSounding = true; | |
| 1969 | + } | |
| 1960 | 1970 | } |
| 1961 | 1971 | |
| 1962 | 1972 | // If we are dragging on a voxel, add thrust according to the amount the mouse is dragging |