Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed pthread.h

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-15 10:30:05 -08:00
parent 0df826bbd8
commit 7bfda0d60e
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.h
View file

@ -10,7 +10,6 @@
#define __interface__Application__ #define __interface__Application__
#include <map> #include <map>
#include <pthread.h>
#include <time.h> #include <time.h>
#include <QApplication> #include <QApplication>
@ -190,7 +189,7 @@ public:
void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal,
float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const; float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const;
virtual void packetSentNotification(ssize_t length); virtual void packetSentNotification(ssize_t length);
VoxelShader& getVoxelShader() { return _voxelShader; } VoxelShader& getVoxelShader() { return _voxelShader; }
@ -209,9 +208,9 @@ public:
public slots: public slots:
void domainChanged(const QString& domainHostname); void domainChanged(const QString& domainHostname);
void nodeKilled(SharedNodePointer node); void nodeKilled(SharedNodePointer node);
void processDatagrams(); void processDatagrams();
void sendAvatarFaceVideoMessage(int frameCount, const QByteArray& data); void sendAvatarFaceVideoMessage(int frameCount, const QByteArray& data);
void exportVoxels(); void exportVoxels();
void importVoxels(); void importVoxels();

7
interface/src/VoxelSystem.cpp
View file

@ -11,7 +11,6 @@
#include <cmath> #include <cmath>
#include <iostream> // to load voxels from file #include <iostream> // to load voxels from file
#include <fstream> // to load voxels from file #include <fstream> // to load voxels from file
#include <pthread.h>
#include <OctalCode.h> #include <OctalCode.h>
#include <PacketHeaders.h> #include <PacketHeaders.h>
@ -1594,13 +1593,13 @@ void VoxelSystem::falseColorizeBySource() {
}; };
// create a bunch of colors we'll use during colorization // create a bunch of colors we'll use during colorization
foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
if (node->getType() == NODE_TYPE_VOXEL_SERVER) { if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID());
int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS;
args.colors[nodeID] = groupColors[groupColor]; args.colors[nodeID] = groupColors[groupColor];
if (groupColors[groupColor].red > 0) { if (groupColors[groupColor].red > 0) {
groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR; groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR;
} }
@ -1610,7 +1609,7 @@ void VoxelSystem::falseColorizeBySource() {
if (groupColors[groupColor].blue > 0) { if (groupColors[groupColor].blue > 0) {
groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR; groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR;
} }
voxelServerCount++; voxelServerCount++;
} }
} }