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

persist voxels in main loop

Browse source
This commit is contained in:
ZappoMan 2013-05-04 09:20:22 -07:00
parent c1847a7511
commit 89eefe461d
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -338,6 +338,16 @@ void voxelDistributor(AgentList* agentList, AgentList::iterator& agent, VoxelAge
} }
} }
void persistVoxelsWhenDirty() {
// check the dirty bit and persist here...
if (::wantVoxelPersist && ::randomTree.isDirty()) {
printf("saving voxels to file...\n");
randomTree.writeToFileV2("voxels.hio2");
randomTree.clearDirtyBit(); // tree is clean after saving
printf("DONE saving voxels to file...\n");
}
}
void *distributeVoxelsToListeners(void *args) { void *distributeVoxelsToListeners(void *args) {
AgentList* agentList = AgentList::getInstance(); AgentList* agentList = AgentList::getInstance();
@ -390,18 +400,6 @@ void attachVoxelAgentDataToAgent(Agent *newAgent) {
void terminate (int sig) { void terminate (int sig) {
printf("terminating now...\n"); printf("terminating now...\n");
// This apparently does not work, because the randomTree has already been freed before this
// sig term handler runs... So, we need to find a better solution than this.
if (false) {
_nodeCount=0;
::randomTree.recurseTreeWithOperation(countVoxelsOperation);
printf("Nodes in scene before saving: %d nodes\n", _nodeCount);
printf("saving voxels to file...\n");
randomTree.writeToFileV2("voxels.hio2");
printf("DONE saving voxels to file...\n");
}
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
@ -446,6 +444,7 @@ int main(int argc, const char * argv[])
if (::wantVoxelPersist) { if (::wantVoxelPersist) {
printf("loading voxels from file...\n"); printf("loading voxels from file...\n");
::randomTree.readFromFileV2("voxels.hio2",true); ::randomTree.readFromFileV2("voxels.hio2",true);
::randomTree.clearDirtyBit(); // the tree is clean since we just loaded it
printf("DONE loading voxels from file...\n"); printf("DONE loading voxels from file...\n");
_nodeCount=0; _nodeCount=0;
::randomTree.recurseTreeWithOperation(countVoxelsOperation); ::randomTree.recurseTreeWithOperation(countVoxelsOperation);
@ -493,7 +492,7 @@ int main(int argc, const char * argv[])
pthread_t sendVoxelThread; pthread_t sendVoxelThread;
pthread_create(&sendVoxelThread, NULL, distributeVoxelsToListeners, NULL); pthread_create(&sendVoxelThread, NULL, distributeVoxelsToListeners, NULL);
sockaddr agentPublicAddress; sockaddr agentPublicAddress;
unsigned char *packetData = new unsigned char[MAX_PACKET_SIZE]; unsigned char *packetData = new unsigned char[MAX_PACKET_SIZE];
@ -501,6 +500,9 @@ int main(int argc, const char * argv[])
// loop to send to agents requesting data // loop to send to agents requesting data
while (true) { while (true) {
// check to see if we need to persist our voxel state
persistVoxelsWhenDirty();
if (agentList->getAgentSocket().receive(&agentPublicAddress, packetData, &receivedBytes)) { if (agentList->getAgentSocket().receive(&agentPublicAddress, packetData, &receivedBytes)) {
// XXXBHG: Hacked in support for 'S' SET command // XXXBHG: Hacked in support for 'S' SET command
if (packetData[0] == PACKET_HEADER_SET_VOXEL) { if (packetData[0] == PACKET_HEADER_SET_VOXEL) {