Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into retryagain

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-13 16:13:38 -08:00
commit ce03853da5
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -1121,7 +1121,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) {
return; return;
} }
if (_isHoverVoxel) { if (_isHoverVoxel) {
_myAvatar.orbit(glm::vec3(_hoverVoxel.x, _hoverVoxel.y, _hoverVoxel.z) * (float)TREE_SCALE, deltaX, deltaY); _myAvatar.orbit(getMouseVoxelWorldCoordinates(_hoverVoxel), deltaX, deltaY);
return; return;
} }
} }
@ -1618,10 +1618,9 @@ void Application::makeVoxel(glm::vec3 position,
isDestructive); isDestructive);
} }
const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) { glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVoxel) {
return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE, return glm::vec3((mouseVoxel.x + mouseVoxel.s / 2.f) * TREE_SCALE, (mouseVoxel.y + mouseVoxel.s / 2.f) * TREE_SCALE,
(_mouseVoxel.y + _mouseVoxel.s / 2.f) * TREE_SCALE, (mouseVoxel.z + mouseVoxel.s / 2.f) * TREE_SCALE);
(_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE);
} }
const float NUDGE_PRECISION_MIN = 1 / pow(2.0, 12.0); const float NUDGE_PRECISION_MIN = 1 / pow(2.0, 12.0);

2
interface/src/Application.h
View file

@ -142,7 +142,7 @@ public:
void removeVoxel(glm::vec3 position, float scale); void removeVoxel(glm::vec3 position, float scale);
const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVoxel);
QGLWidget* getGLWidget() { return _glWidget; } QGLWidget* getGLWidget() { return _glWidget; }
MyAvatar* getAvatar() { return &_myAvatar; } MyAvatar* getAvatar() { return &_myAvatar; }

4
libraries/metavoxels/src/MetavoxelData.cpp
View file

@ -301,8 +301,8 @@ void MetavoxelNode::clearChildren(const AttributePointer& attribute) {
} }
int MetavoxelPath::operator[](int index) const { int MetavoxelPath::operator[](int index) const {
return _array.at(index * BITS_PER_ELEMENT) | (_array.at(index * BITS_PER_ELEMENT + 1) << 1) | return (int)_array.at(index * BITS_PER_ELEMENT) | ((int)_array.at(index * BITS_PER_ELEMENT + 1) << 1) |
(_array.at(index * BITS_PER_ELEMENT + 2) << 2); ((int)_array.at(index * BITS_PER_ELEMENT + 2) << 2);
} }
MetavoxelPath& MetavoxelPath::operator+=(int element) { MetavoxelPath& MetavoxelPath::operator+=(int element) {

2
libraries/voxels/src/VoxelTreeElement.h
View file

@ -92,4 +92,4 @@ protected:
}; };
#endif /* defined(__hifi__VoxelTreeElement__) */ #endif /* defined(__hifi__VoxelTreeElement__) */