From b7243b0bfec82ec5fd8fad5c9c7b969156d55c70 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 22 Mar 2014 20:42:34 -0700 Subject: [PATCH] more cleanup --- interface/CMakeLists.txt | 2 +- interface/src/Application.h | 10 ++--- interface/src/avatar/Hand.cpp | 44 +------------------ interface/src/avatar/Hand.h | 10 ----- interface/src/avatar/MyAvatar.cpp | 1 - .../src/ui/overlays/LocalVoxelsOverlay.cpp | 2 +- .../src/{ => voxels}/PrimitiveRenderer.cpp | 0 .../src/{ => voxels}/PrimitiveRenderer.h | 0 interface/src/{ => voxels}/VoxelFade.cpp | 0 interface/src/{ => voxels}/VoxelFade.h | 0 .../src/{ => voxels}/VoxelHideShowThread.cpp | 0 .../src/{ => voxels}/VoxelHideShowThread.h | 0 interface/src/{ => voxels}/VoxelImporter.cpp | 10 +++-- interface/src/{ => voxels}/VoxelImporter.h | 3 +- .../src/{ => voxels}/VoxelPacketProcessor.cpp | 0 .../src/{ => voxels}/VoxelPacketProcessor.h | 0 interface/src/{ => voxels}/VoxelSystem.cpp | 0 interface/src/{ => voxels}/VoxelSystem.h | 0 18 files changed, 16 insertions(+), 66 deletions(-) rename interface/src/{ => voxels}/PrimitiveRenderer.cpp (100%) rename interface/src/{ => voxels}/PrimitiveRenderer.h (100%) rename interface/src/{ => voxels}/VoxelFade.cpp (100%) rename interface/src/{ => voxels}/VoxelFade.h (100%) rename interface/src/{ => voxels}/VoxelHideShowThread.cpp (100%) rename interface/src/{ => voxels}/VoxelHideShowThread.h (100%) rename interface/src/{ => voxels}/VoxelImporter.cpp (97%) rename interface/src/{ => voxels}/VoxelImporter.h (96%) rename interface/src/{ => voxels}/VoxelPacketProcessor.cpp (100%) rename interface/src/{ => voxels}/VoxelPacketProcessor.h (100%) rename interface/src/{ => voxels}/VoxelSystem.cpp (100%) rename interface/src/{ => voxels}/VoxelSystem.h (100%) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 3751c4c857..f991212a6e 100644 --- a/interface/CMakeLists.txt +++ b/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) diff --git a/interface/src/Application.h b/interface/src/Application.h index 38a8f87904..a796a700bb 100644 --- a/interface/src/Application.h +++ b/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; diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 43a1787d13..77586dd7ae 100644 --- a/interface/src/avatar/Hand.cpp +++ b/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); diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index a1b1875424..f6ee5b281f 100755 --- a/interface/src/avatar/Hand.h +++ b/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 _leapFingerTipBalls; std::vector _leapFingerRootBalls; - glm::vec3 _lastFingerAddVoxel, _lastFingerDeleteVoxel; - VoxelDetail _collidingVoxel; - - glm::vec3 _collisionCenter; - float _collisionAge; - float _collisionDuration; - // private methods void setLeapHands(const std::vector& handPositions, const std::vector& 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); }; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index a6a7f22896..5a1cefaa87 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/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" diff --git a/interface/src/ui/overlays/LocalVoxelsOverlay.cpp b/interface/src/ui/overlays/LocalVoxelsOverlay.cpp index 7eaf9ed5c5..460f4eadb6 100644 --- a/interface/src/ui/overlays/LocalVoxelsOverlay.cpp +++ b/interface/src/ui/overlays/LocalVoxelsOverlay.cpp @@ -12,10 +12,10 @@ #include #include -#include #include #include "LocalVoxelsOverlay.h" +#include "voxels/VoxelSystem.h" QMap LocalVoxelsOverlay::_voxelSystemMap; diff --git a/interface/src/PrimitiveRenderer.cpp b/interface/src/voxels/PrimitiveRenderer.cpp similarity index 100% rename from interface/src/PrimitiveRenderer.cpp rename to interface/src/voxels/PrimitiveRenderer.cpp diff --git a/interface/src/PrimitiveRenderer.h b/interface/src/voxels/PrimitiveRenderer.h similarity index 100% rename from interface/src/PrimitiveRenderer.h rename to interface/src/voxels/PrimitiveRenderer.h diff --git a/interface/src/VoxelFade.cpp b/interface/src/voxels/VoxelFade.cpp similarity index 100% rename from interface/src/VoxelFade.cpp rename to interface/src/voxels/VoxelFade.cpp diff --git a/interface/src/VoxelFade.h b/interface/src/voxels/VoxelFade.h similarity index 100% rename from interface/src/VoxelFade.h rename to interface/src/voxels/VoxelFade.h diff --git a/interface/src/VoxelHideShowThread.cpp b/interface/src/voxels/VoxelHideShowThread.cpp similarity index 100% rename from interface/src/VoxelHideShowThread.cpp rename to interface/src/voxels/VoxelHideShowThread.cpp diff --git a/interface/src/VoxelHideShowThread.h b/interface/src/voxels/VoxelHideShowThread.h similarity index 100% rename from interface/src/VoxelHideShowThread.h rename to interface/src/voxels/VoxelHideShowThread.h diff --git a/interface/src/VoxelImporter.cpp b/interface/src/voxels/VoxelImporter.cpp similarity index 97% rename from interface/src/VoxelImporter.cpp rename to interface/src/voxels/VoxelImporter.cpp index 9d8b8ad811..d3c1b259ae 100644 --- a/interface/src/VoxelImporter.cpp +++ b/interface/src/voxels/VoxelImporter.cpp @@ -6,13 +6,17 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // -#include -#include -#include +// include this before QGLWidget, which includes an earlier version of OpenGL +#include "InterfaceConfig.h" #include #include +#include +#include + +#include "voxels/VoxelImporter.h" + const QString SETTINGS_GROUP_NAME = "VoxelImport"; const QString IMPORT_DIALOG_SETTINGS_KEY = "ImportDialogSettings"; diff --git a/interface/src/VoxelImporter.h b/interface/src/voxels/VoxelImporter.h similarity index 96% rename from interface/src/VoxelImporter.h rename to interface/src/voxels/VoxelImporter.h index e3e5a1370c..9ebfc2eef2 100644 --- a/interface/src/VoxelImporter.h +++ b/interface/src/voxels/VoxelImporter.h @@ -12,9 +12,8 @@ #include #include -#include - #include "ui/ImportDialog.h" +#include "voxels/VoxelSystem.h" class ImportTask; diff --git a/interface/src/VoxelPacketProcessor.cpp b/interface/src/voxels/VoxelPacketProcessor.cpp similarity index 100% rename from interface/src/VoxelPacketProcessor.cpp rename to interface/src/voxels/VoxelPacketProcessor.cpp diff --git a/interface/src/VoxelPacketProcessor.h b/interface/src/voxels/VoxelPacketProcessor.h similarity index 100% rename from interface/src/VoxelPacketProcessor.h rename to interface/src/voxels/VoxelPacketProcessor.h diff --git a/interface/src/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp similarity index 100% rename from interface/src/VoxelSystem.cpp rename to interface/src/voxels/VoxelSystem.cpp diff --git a/interface/src/VoxelSystem.h b/interface/src/voxels/VoxelSystem.h similarity index 100% rename from interface/src/VoxelSystem.h rename to interface/src/voxels/VoxelSystem.h