From 7bfda0d60eb38c466ad30de8152d4e56c919e00a Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 15 Jan 2014 10:30:05 -0800 Subject: [PATCH] removed pthread.h --- interface/src/Application.h | 7 +++---- interface/src/VoxelSystem.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index dcc7eb4b43..316fc90b47 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -10,7 +10,6 @@ #define __interface__Application__ #include -#include #include #include @@ -190,7 +189,7 @@ public: void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const; - + virtual void packetSentNotification(ssize_t length); VoxelShader& getVoxelShader() { return _voxelShader; } @@ -209,9 +208,9 @@ public: public slots: void domainChanged(const QString& domainHostname); void nodeKilled(SharedNodePointer node); - + void processDatagrams(); - + void sendAvatarFaceVideoMessage(int frameCount, const QByteArray& data); void exportVoxels(); void importVoxels(); diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index a6c12ac481..ef98271701 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -11,7 +11,6 @@ #include #include // to load voxels from file #include // to load voxels from file -#include #include #include @@ -1594,13 +1593,13 @@ void VoxelSystem::falseColorizeBySource() { }; // create a bunch of colors we'll use during colorization - + foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { if (node->getType() == NODE_TYPE_VOXEL_SERVER) { uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; args.colors[nodeID] = groupColors[groupColor]; - + if (groupColors[groupColor].red > 0) { groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR; } @@ -1610,7 +1609,7 @@ void VoxelSystem::falseColorizeBySource() { if (groupColors[groupColor].blue > 0) { groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR; } - + voxelServerCount++; } }