more cleanup

interface/CMakeLists.txt

@@ -48,7 +48,7 @@ configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVe
 
 # grab the implementation and header files from src dirs
 file(GLOB INTERFACE_SRCS src/*.cpp src/*.h)
-foreach(SUBDIR avatar devices renderer ui starfield location scripting)
+foreach(SUBDIR avatar devices renderer ui starfield location scripting voxels)
   file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h)
   set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
 endforeach(SUBDIR)

interface/src/Application.h

@@ -44,11 +44,6 @@
 #include "PacketHeaders.h"
 #include "ParticleTreeRenderer.h"
 #include "Stars.h"
-#include "VoxelFade.h"
-#include "VoxelHideShowThread.h"
-#include "VoxelPacketProcessor.h"
-#include "VoxelSystem.h"
-#include "VoxelImporter.h"
 #include "avatar/Avatar.h"
 #include "avatar/AvatarManager.h"
 #include "avatar/MyAvatar.h"
@@ -70,6 +65,11 @@
 #include "ui/LogDialog.h"
 #include "ui/UpdateDialog.h"
 #include "ui/overlays/Overlays.h"
+#include "voxels/VoxelFade.h"
+#include "voxels/VoxelHideShowThread.h"
+#include "voxels/VoxelImporter.h"
+#include "voxels/VoxelPacketProcessor.h"
+#include "voxels/VoxelSystem.h"
 
 
 class QAction;

interface/src/avatar/Hand.cpp

@@ -27,10 +27,7 @@ Hand::Hand(Avatar* owningAvatar) :
     HandData((AvatarData*)owningAvatar),
 
     _owningAvatar(owningAvatar),
-    _renderAlpha(1.0),
-    _collisionCenter(0,0,0),
-    _collisionAge(0),
-    _collisionDuration(0)
+    _renderAlpha(1.0)
 {
 }
 
@@ -42,10 +39,6 @@ void Hand::reset() {
 
 void Hand::simulate(float deltaTime, bool isMine) {
     
-    if (_collisionAge > 0.f) {
-        _collisionAge += deltaTime;
-    }
-    
     calculateGeometry();
     
     if (isMine) {
@@ -222,26 +215,6 @@ void Hand::collideAgainstOurself() {
     }
 }
 
-void Hand::handleVoxelCollision(PalmData* palm, const glm::vec3& fingerTipPosition, VoxelTreeElement* voxel, float deltaTime) {
-    //  Collision between finger and a voxel plays sound
-    const float LOWEST_FREQUENCY = 100.f;
-    const float HERTZ_PER_RGB = 3.f;
-    const float DECAY_PER_SAMPLE = 0.0005f;
-    const float DURATION_MAX = 2.0f;
-    const float MIN_VOLUME = 0.1f;
-    float volume = MIN_VOLUME + glm::clamp(glm::length(palm->getRawVelocity()), 0.f, (1.f - MIN_VOLUME));
-    float duration = volume;
-    _collisionCenter = fingerTipPosition;
-    _collisionAge = deltaTime;
-    _collisionDuration = duration;
-    int voxelBrightness = voxel->getColor()[0] + voxel->getColor()[1] + voxel->getColor()[2];
-    float frequency = LOWEST_FREQUENCY + (voxelBrightness * HERTZ_PER_RGB);
-    Application::getInstance()->getAudio()->startDrumSound(volume,
-                                                           frequency,
-                                                           DURATION_MAX,
-                                                           DECAY_PER_SAMPLE);
-}
-
 void Hand::calculateGeometry() {
     // generate finger tip balls....
     _leapFingerTipBalls.clear();
@@ -312,21 +285,6 @@ void Hand::render(bool isMine) {
         renderLeapHands(isMine);
     }
 
-    if (isMine) {
-        //  If hand/voxel collision has happened, render a little expanding sphere
-        if (_collisionAge > 0.f) {
-            float opacity = glm::clamp(1.f - (_collisionAge / _collisionDuration), 0.f, 1.f);
-            glColor4f(1, 0, 0, 0.5 * opacity);
-            glPushMatrix();
-            glTranslatef(_collisionCenter.x, _collisionCenter.y, _collisionCenter.z);
-            glutSolidSphere(_collisionAge * 0.25f, 20, 20);
-            glPopMatrix();
-            if (_collisionAge > _collisionDuration) {
-                _collisionAge = 0.f;
-            }
-        }
-    }
-
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_RESCALE_NORMAL);
     

interface/src/avatar/Hand.h

@@ -22,7 +22,6 @@
 
 #include "InterfaceConfig.h"
 #include "world.h"
-#include "VoxelSystem.h"
 
 
 class Avatar;
@@ -72,13 +71,6 @@ private:
     std::vector<HandBall> _leapFingerTipBalls;
     std::vector<HandBall> _leapFingerRootBalls;
     
-    glm::vec3 _lastFingerAddVoxel, _lastFingerDeleteVoxel;
-    VoxelDetail _collidingVoxel;
-    
-    glm::vec3 _collisionCenter;
-    float _collisionAge;
-    float _collisionDuration;
-    
     // private methods
     void setLeapHands(const std::vector<glm::vec3>& handPositions,
                       const std::vector<glm::vec3>& handNormals);
@@ -88,8 +80,6 @@ private:
     
     void calculateGeometry();
     
-    void handleVoxelCollision(PalmData* palm, const glm::vec3& fingerTipPosition, VoxelTreeElement* voxel, float deltaTime);
-
     void playSlaps(PalmData& palm, Avatar* avatar);
 };
 

interface/src/avatar/MyAvatar.cpp

@@ -26,7 +26,6 @@
 #include "Menu.h"
 #include "MyAvatar.h"
 #include "Physics.h"
-#include "VoxelSystem.h"
 #include "devices/Faceshift.h"
 #include "devices/OculusManager.h"
 #include "ui/TextRenderer.h"

interface/src/ui/overlays/LocalVoxelsOverlay.cpp

@@ -12,10 +12,10 @@
 #include <QGLWidget>
 #include <QScriptValue>
 
-#include <VoxelSystem.h>
 #include <Application.h>
 
 #include "LocalVoxelsOverlay.h"
+#include "voxels/VoxelSystem.h"
 
 QMap<QString, WeakVoxelSystemPointer> LocalVoxelsOverlay::_voxelSystemMap;
 

interface/src/voxels/VoxelImporter.cpp

@@ -6,13 +6,17 @@
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
-#include <VoxelImporter.h>
-#include <Application.h>
-#include <LocalVoxelsList.h>
+// include this before QGLWidget, which includes an earlier version of OpenGL
+#include "InterfaceConfig.h"
 
 #include <QFileInfo>
 #include <QThreadPool>
 
+#include <Application.h>
+#include <LocalVoxelsList.h>
+
+#include "voxels/VoxelImporter.h"
+
 const QString SETTINGS_GROUP_NAME = "VoxelImport";
 const QString IMPORT_DIALOG_SETTINGS_KEY = "ImportDialogSettings";
 

interface/src/voxels/VoxelImporter.h

@@ -12,9 +12,8 @@
 #include <QThread>
 #include <QRunnable>
 
-#include <VoxelSystem.h>
-
 #include "ui/ImportDialog.h"
+#include "voxels/VoxelSystem.h"
 
 class ImportTask;