Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-08-23 16:25:17 -07:00
parent 0693d0cbbd
commit 0c03fdd366
9 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
voxel-server/src/NodeWatcher.cpp
View file

@ -5,7 +5,7 @@
// Created by Brad Hefta-Gaub on 8/21/13
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
// Threaded or non-threaded object for sending voxels to a client
// Node List Hook that watches for Node's being killed in order to clean up node specific memory and threads
//
#include <NodeList.h>

2
voxel-server/src/NodeWatcher.h
View file

@ -5,7 +5,7 @@
// Created by Brad Hefta-Gaub on 8/21/13
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
// Threaded or non-threaded object for sending voxels to a client
// Node List Hook that watches for Node's being killed in order to clean up node specific memory and threads
//
#ifndef __voxel_server__NodeWatcher__

10
voxel-server/src/VoxelNodeData.cpp
View file

@ -32,9 +32,7 @@ VoxelNodeData::VoxelNodeData(Node* owningNode) :
// Create voxel sending thread...
uint16_t nodeID = getOwningNode()->getNodeID();
_voxelSendThread = new VoxelSendThread(nodeID);
if (_voxelSendThread) {
_voxelSendThread->initialize(true);
}
_voxelSendThread->initialize(true);
}
@ -59,10 +57,8 @@ void VoxelNodeData::writeToPacket(unsigned char* buffer, int bytes) {
VoxelNodeData::~VoxelNodeData() {
delete[] _voxelPacket;
if (_voxelSendThread) {
_voxelSendThread->terminate();
delete _voxelSendThread;
}
_voxelSendThread->terminate();
delete _voxelSendThread;
}
bool VoxelNodeData::updateCurrentViewFrustum() {

2
voxel-server/src/VoxelNodeData.h
View file

@ -18,7 +18,7 @@
#include <VoxelNodeBag.h>
#include <VoxelSceneStats.h>
class VoxelSendThread; // forward declare
class VoxelSendThread;
class VoxelNodeData : public AvatarData {
public:

2
voxel-server/src/VoxelPersistThread.cpp
View file

@ -5,7 +5,7 @@
// Created by Brad Hefta-Gaub on 8/21/13
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
// Threaded or non-threaded voxel persistance
// Threaded or non-threaded voxel persistence
//
#include <NodeList.h>

2
voxel-server/src/VoxelPersistThread.h
View file

@ -5,7 +5,7 @@
// Created by Brad Hefta-Gaub on 8/21/13
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
// Threaded or non-threaded voxel persistance
// Threaded or non-threaded voxel persistence
//
#ifndef __voxel_server__VoxelPersistThread__

5
voxel-server/src/VoxelSendThread.cpp
View file

@ -5,7 +5,7 @@
// Created by Brad Hefta-Gaub on 8/21/13
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
// Threaded or non-threaded voxel persistance
// Threaded or non-threaded voxel packet sender
//
#include <NodeList.h>
@ -19,9 +19,6 @@ VoxelSendThread::VoxelSendThread(uint16_t nodeID) :
_nodeID(nodeID) {
}
VoxelSendThread::~VoxelSendThread() {
}
bool VoxelSendThread::process() {
uint64_t lastSendTime = usecTimestampNow();

1
voxel-server/src/VoxelSendThread.h
View file

@ -21,7 +21,6 @@
class VoxelSendThread : public virtual GenericThread {
public:
VoxelSendThread(uint16_t nodeID);
~VoxelSendThread();
protected:
/// Implements generic processing behavior for this thread.
virtual bool process();

2
voxel-server/src/main.cpp
View file

@ -177,7 +177,7 @@ int main(int argc, const char * argv[]) {
}
printf("wantVoxelPersist=%s\n", debug::valueOf(::wantVoxelPersist));
// if we want Voxel Persistance, load the local file now...
// if we want Voxel Persistence, load the local file now...
bool persistantFileRead = false;
if (::wantVoxelPersist) {