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

Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation

Browse source
This commit is contained in:
ZappoMan 2013-06-07 11:31:32 -07:00
commit e65c0a25fa
4 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -1151,7 +1151,7 @@ static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail) {
if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){ if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){
AgentList::getInstance()->broadcastToAgents(bufferOut, sizeOut, &AGENT_TYPE_VOXEL, 1); AgentList::getInstance()->broadcastToAgents(bufferOut, sizeOut, &AGENT_TYPE_VOXEL, 1);
delete bufferOut; delete[] bufferOut;
} }
} }
@ -1287,7 +1287,7 @@ void Application::importVoxels() {
} }
if (calculatedOctCode) { if (calculatedOctCode) {
delete calculatedOctCode; delete[] calculatedOctCode;
} }
// restore the main window's active state // restore the main window's active state
@ -1339,7 +1339,7 @@ void Application::pasteVoxels() {
} }
if (calculatedOctCode) { if (calculatedOctCode) {
delete calculatedOctCode; delete[] calculatedOctCode;
} }
} }
@ -1456,7 +1456,7 @@ void Application::initMenu() {
QMenu* renderDebugMenu = debugMenu->addMenu("Render Debugging Tools"); QMenu* renderDebugMenu = debugMenu->addMenu("Render Debugging Tools");
renderDebugMenu->addAction("Show Render Pipeline Warnings", this, SLOT(setRenderWarnings(bool)))->setCheckable(true); renderDebugMenu->addAction("Show Render Pipeline Warnings", this, SLOT(setRenderWarnings(bool)))->setCheckable(true);
renderDebugMenu->addAction("Kill Local Voxels", this, SLOT(doKillLocalVoxels())); renderDebugMenu->addAction("Kill Local Voxels", this, SLOT(doKillLocalVoxels()), Qt::CTRL | Qt::Key_K);
renderDebugMenu->addAction("Randomize Voxel TRUE Colors", this, SLOT(doRandomizeVoxelColors()), Qt::CTRL | Qt::Key_R); renderDebugMenu->addAction("Randomize Voxel TRUE Colors", this, SLOT(doRandomizeVoxelColors()), Qt::CTRL | Qt::Key_R);
renderDebugMenu->addAction("FALSE Color Voxels Randomly", this, SLOT(doFalseRandomizeVoxelColors())); renderDebugMenu->addAction("FALSE Color Voxels Randomly", this, SLOT(doFalseRandomizeVoxelColors()));
renderDebugMenu->addAction("FALSE Color Voxel Every Other Randomly", this, SLOT(doFalseRandomizeEveryOtherVoxelColors())); renderDebugMenu->addAction("FALSE Color Voxel Every Other Randomly", this, SLOT(doFalseRandomizeEveryOtherVoxelColors()));

2
libraries/shared/src/SharedUtil.cpp
View file

@ -223,7 +223,7 @@ bool createVoxelEditMessage(unsigned char command, short int sequence,
actualMessageSize+=lengthOfVoxelData; actualMessageSize+=lengthOfVoxelData;
} }
// cleanup // cleanup
delete voxelData; delete[] voxelData;
} }
if (success) { if (success) {

13
libraries/voxels/src/VoxelTree.cpp
View file

@ -260,8 +260,7 @@ void VoxelTree::readBitstreamToTree(unsigned char * bitstream, unsigned long int
void VoxelTree::deleteVoxelAt(float x, float y, float z, float s, bool stage) { void VoxelTree::deleteVoxelAt(float x, float y, float z, float s, bool stage) {
unsigned char* octalCode = pointToVoxel(x,y,z,s,0,0,0); unsigned char* octalCode = pointToVoxel(x,y,z,s,0,0,0);
deleteVoxelCodeFromTree(octalCode, stage); deleteVoxelCodeFromTree(octalCode, stage);
delete octalCode; // cleanup memory delete[] octalCode; // cleanup memory
reaverageVoxelColors(rootNode);
} }
class DeleteVoxelCodeFromTreeArgs { class DeleteVoxelCodeFromTreeArgs {
@ -366,9 +365,6 @@ void VoxelTree::deleteVoxelCodeFromTreeRecursion(VoxelNode* node, void* extraDat
childNode->stageForDeletion(); childNode->stageForDeletion();
} else { } else {
node->deleteChildAtIndex(childIndex); // note: this will track dirtiness and lastChanged for this node node->deleteChildAtIndex(childIndex); // note: this will track dirtiness and lastChanged for this node
if (_shouldReaverage) {
node->setColorFromAverageOfChildren();
}
} }
// track our tree dirtiness // track our tree dirtiness
@ -504,7 +500,6 @@ void VoxelTree::processRemoveVoxelBitstream(unsigned char * bitstream, int buffe
voxelCode+=voxelDataSize; voxelCode+=voxelDataSize;
atByte+=voxelDataSize; atByte+=voxelDataSize;
} }
reaverageVoxelColors(rootNode); // Fix our colors!! Need to call it on rootNode
} }
void VoxelTree::printTreeForDebugging(VoxelNode *startNode) { void VoxelTree::printTreeForDebugging(VoxelNode *startNode) {
@ -553,6 +548,7 @@ void VoxelTree::printTreeForDebugging(VoxelNode *startNode) {
} }
} }
// Note: this is an expensive call. Don't call it unless you really need to reaverage the entire tree (from startNode)
void VoxelTree::reaverageVoxelColors(VoxelNode *startNode) { void VoxelTree::reaverageVoxelColors(VoxelNode *startNode) {
// if our tree is a reaveraging tree, then we do this, otherwise we don't do anything // if our tree is a reaveraging tree, then we do this, otherwise we don't do anything
if (_shouldReaverage) { if (_shouldReaverage) {
@ -632,7 +628,7 @@ VoxelNode* VoxelTree::getVoxelAt(float x, float y, float z, float s) const {
if (*node->getOctalCode() != *octalCode) { if (*node->getOctalCode() != *octalCode) {
node = NULL; node = NULL;
} }
delete octalCode; // cleanup memory delete[] octalCode; // cleanup memory
return node; return node;
} }
@ -640,7 +636,7 @@ void VoxelTree::createVoxel(float x, float y, float z, float s,
unsigned char red, unsigned char green, unsigned char blue, bool destructive) { unsigned char red, unsigned char green, unsigned char blue, bool destructive) {
unsigned char* voxelData = pointToVoxel(x,y,z,s,red,green,blue); unsigned char* voxelData = pointToVoxel(x,y,z,s,red,green,blue);
this->readCodeColorBufferToTree(voxelData, destructive); this->readCodeColorBufferToTree(voxelData, destructive);
delete voxelData; delete[] voxelData;
} }
@ -786,7 +782,6 @@ void VoxelTree::createSphere(float radius, float xc, float yc, float zc, float v
thisRadius += thisVoxelSize; thisRadius += thisVoxelSize;
thisVoxelSize = std::max(voxelSize, thisVoxelSize / 2.0f); thisVoxelSize = std::max(voxelSize, thisVoxelSize / 2.0f);
} }
this->reaverageVoxelColors(this->rootNode);
} }
int VoxelTree::searchForColoredNodes(int maxSearchLevel, VoxelNode* node, const ViewFrustum& viewFrustum, VoxelNodeBag& bag, int VoxelTree::searchForColoredNodes(int maxSearchLevel, VoxelNode* node, const ViewFrustum& viewFrustum, VoxelNodeBag& bag,

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

@ -51,7 +51,7 @@ const int MAX_VOXEL_TREE_DEPTH_LEVELS = 4;
const int ENVIRONMENT_SEND_INTERVAL_USECS = 1000000; const int ENVIRONMENT_SEND_INTERVAL_USECS = 1000000;
VoxelTree randomTree(false); // this is NOT a reaveraging tree VoxelTree serverTree(true); // this IS a reaveraging tree
bool wantVoxelPersist = true; bool wantVoxelPersist = true;
bool wantLocalDomain = false; bool wantLocalDomain = false;
@ -98,7 +98,7 @@ void randomlyFillVoxelTree(int levelsToGo, VoxelNode *currentRootNode) {
void eraseVoxelTreeAndCleanupAgentVisitData() { void eraseVoxelTreeAndCleanupAgentVisitData() {
// As our tree to erase all it's voxels // As our tree to erase all it's voxels
::randomTree.eraseAllVoxels(); ::serverTree.eraseAllVoxels();
// enumerate the agents clean up their marker nodes // enumerate the agents clean up their marker nodes
for (AgentList::iterator agent = AgentList::getInstance()->begin(); agent != AgentList::getInstance()->end(); agent++) { for (AgentList::iterator agent = AgentList::getInstance()->begin(); agent != AgentList::getInstance()->end(); agent++) {
VoxelAgentData* agentData = (VoxelAgentData*) agent->getLinkedData(); VoxelAgentData* agentData = (VoxelAgentData*) agent->getLinkedData();
@ -123,7 +123,7 @@ void resInVoxelDistributor(AgentList* agentList,
searchLoops++; searchLoops++;
searchLevelWas = agentData->getMaxSearchLevel(); searchLevelWas = agentData->getMaxSearchLevel();
int maxLevelReached = randomTree.searchForColoredNodes(agentData->getMaxSearchLevel(), randomTree.rootNode, int maxLevelReached = serverTree.searchForColoredNodes(agentData->getMaxSearchLevel(), serverTree.rootNode,
viewFrustum, agentData->nodeBag); viewFrustum, agentData->nodeBag);
agentData->setMaxLevelReached(maxLevelReached); agentData->setMaxLevelReached(maxLevelReached);
@ -167,7 +167,7 @@ void resInVoxelDistributor(AgentList* agentList,
while (packetsSentThisInterval < PACKETS_PER_CLIENT_PER_INTERVAL - (shouldSendEnvironments ? 1 : 0)) { while (packetsSentThisInterval < PACKETS_PER_CLIENT_PER_INTERVAL - (shouldSendEnvironments ? 1 : 0)) {
if (!agentData->nodeBag.isEmpty()) { if (!agentData->nodeBag.isEmpty()) {
VoxelNode* subTree = agentData->nodeBag.extract(); VoxelNode* subTree = agentData->nodeBag.extract();
bytesWritten = randomTree.encodeTreeBitstream(agentData->getMaxSearchLevel(), subTree, bytesWritten = serverTree.encodeTreeBitstream(agentData->getMaxSearchLevel(), subTree,
&tempOutputBuffer[0], MAX_VOXEL_PACKET_SIZE - 1, &tempOutputBuffer[0], MAX_VOXEL_PACKET_SIZE - 1,
agentData->nodeBag, &viewFrustum, agentData->nodeBag, &viewFrustum,
agentData->getWantColor(), WANT_EXISTS_BITS); agentData->getWantColor(), WANT_EXISTS_BITS);
@ -268,16 +268,16 @@ void deepestLevelVoxelDistributor(AgentList* agentList,
// helps improve overall bitrate performance. // helps improve overall bitrate performance.
if (::wantSearchForColoredNodes) { if (::wantSearchForColoredNodes) {
// If the bag was empty, then send everything in view, not just the delta // If the bag was empty, then send everything in view, not just the delta
maxLevelReached = randomTree.searchForColoredNodes(INT_MAX, randomTree.rootNode, agentData->getCurrentViewFrustum(), maxLevelReached = serverTree.searchForColoredNodes(INT_MAX, serverTree.rootNode, agentData->getCurrentViewFrustum(),
agentData->nodeBag, wantDelta, lastViewFrustum); agentData->nodeBag, wantDelta, lastViewFrustum);
// if nothing was found in view, send the root node. // if nothing was found in view, send the root node.
if (agentData->nodeBag.isEmpty()){ if (agentData->nodeBag.isEmpty()){
agentData->nodeBag.insert(randomTree.rootNode); agentData->nodeBag.insert(serverTree.rootNode);
} }
agentData->setViewSent(false); agentData->setViewSent(false);
} else { } else {
agentData->nodeBag.insert(randomTree.rootNode); agentData->nodeBag.insert(serverTree.rootNode);
} }
} }
@ -310,7 +310,7 @@ void deepestLevelVoxelDistributor(AgentList* agentList,
while (packetsSentThisInterval < PACKETS_PER_CLIENT_PER_INTERVAL - (shouldSendEnvironments ? 1 : 0)) { while (packetsSentThisInterval < PACKETS_PER_CLIENT_PER_INTERVAL - (shouldSendEnvironments ? 1 : 0)) {
if (!agentData->nodeBag.isEmpty()) { if (!agentData->nodeBag.isEmpty()) {
VoxelNode* subTree = agentData->nodeBag.extract(); VoxelNode* subTree = agentData->nodeBag.extract();
bytesWritten = randomTree.encodeTreeBitstream(INT_MAX, subTree, bytesWritten = serverTree.encodeTreeBitstream(INT_MAX, subTree,
&tempOutputBuffer[0], MAX_VOXEL_PACKET_SIZE - 1, &tempOutputBuffer[0], MAX_VOXEL_PACKET_SIZE - 1,
agentData->nodeBag, &agentData->getCurrentViewFrustum(), agentData->nodeBag, &agentData->getCurrentViewFrustum(),
agentData->getWantColor(), WANT_EXISTS_BITS, DONT_CHOP_LEVELS, agentData->getWantColor(), WANT_EXISTS_BITS, DONT_CHOP_LEVELS,
@ -386,14 +386,14 @@ void persistVoxelsWhenDirty() {
double sinceLastTime = (now - ::lastPersistVoxels) / 1000.0; double sinceLastTime = (now - ::lastPersistVoxels) / 1000.0;
// check the dirty bit and persist here... // check the dirty bit and persist here...
if (::wantVoxelPersist && ::randomTree.isDirty() && sinceLastTime > VOXEL_PERSIST_INTERVAL) { if (::wantVoxelPersist && ::serverTree.isDirty() && sinceLastTime > VOXEL_PERSIST_INTERVAL) {
{ {
PerformanceWarning warn(::shouldShowAnimationDebug, PerformanceWarning warn(::shouldShowAnimationDebug,
"persistVoxelsWhenDirty() - reaverageVoxelColors()", ::shouldShowAnimationDebug); "persistVoxelsWhenDirty() - reaverageVoxelColors()", ::shouldShowAnimationDebug);
// after done inserting all these voxels, then reaverage colors // after done inserting all these voxels, then reaverage colors
randomTree.reaverageVoxelColors(randomTree.rootNode); serverTree.reaverageVoxelColors(serverTree.rootNode);
} }
@ -402,8 +402,8 @@ void persistVoxelsWhenDirty() {
"persistVoxelsWhenDirty() - writeToSVOFile()", ::shouldShowAnimationDebug); "persistVoxelsWhenDirty() - writeToSVOFile()", ::shouldShowAnimationDebug);
printf("saving voxels to file...\n"); printf("saving voxels to file...\n");
randomTree.writeToSVOFile(::wantLocalDomain ? LOCAL_VOXELS_PERSIST_FILE : VOXELS_PERSIST_FILE); serverTree.writeToSVOFile(::wantLocalDomain ? LOCAL_VOXELS_PERSIST_FILE : VOXELS_PERSIST_FILE);
randomTree.clearDirtyBit(); // tree is clean after saving serverTree.clearDirtyBit(); // tree is clean after saving
printf("DONE saving voxels to file...\n"); printf("DONE saving voxels to file...\n");
} }
::lastPersistVoxels = usecTimestampNow(); ::lastPersistVoxels = usecTimestampNow();
@ -505,10 +505,10 @@ int main(int argc, const char * argv[]) {
bool persistantFileRead = false; bool persistantFileRead = false;
if (::wantVoxelPersist) { if (::wantVoxelPersist) {
printf("loading voxels from file...\n"); printf("loading voxels from file...\n");
persistantFileRead = ::randomTree.readFromSVOFile(::wantLocalDomain ? LOCAL_VOXELS_PERSIST_FILE : VOXELS_PERSIST_FILE); persistantFileRead = ::serverTree.readFromSVOFile(::wantLocalDomain ? LOCAL_VOXELS_PERSIST_FILE : VOXELS_PERSIST_FILE);
::randomTree.clearDirtyBit(); // the tree is clean since we just loaded it ::serverTree.clearDirtyBit(); // the tree is clean since we just loaded it
printf("DONE loading voxels from file... fileRead=%s\n", debug::valueOf(persistantFileRead)); printf("DONE loading voxels from file... fileRead=%s\n", debug::valueOf(persistantFileRead));
unsigned long nodeCount = ::randomTree.getVoxelCount(); unsigned long nodeCount = ::serverTree.getVoxelCount();
printf("Nodes after loading scene %ld nodes\n", nodeCount); printf("Nodes after loading scene %ld nodes\n", nodeCount);
} }
@ -517,7 +517,7 @@ int main(int argc, const char * argv[]) {
const char* INPUT_FILE = "-i"; const char* INPUT_FILE = "-i";
const char* voxelsFilename = getCmdOption(argc, argv, INPUT_FILE); const char* voxelsFilename = getCmdOption(argc, argv, INPUT_FILE);
if (voxelsFilename) { if (voxelsFilename) {
randomTree.readFromSVOFile(voxelsFilename); serverTree.readFromSVOFile(voxelsFilename);
} }
// Check to see if the user passed in a command line option for setting packet send rate // Check to see if the user passed in a command line option for setting packet send rate
@ -535,7 +535,7 @@ int main(int argc, const char * argv[]) {
if (cmdOptionExists(argc, argv, ADD_RANDOM_VOXELS)) { if (cmdOptionExists(argc, argv, ADD_RANDOM_VOXELS)) {
// create an octal code buffer and load it with 0 so that the recursive tree fill can give // create an octal code buffer and load it with 0 so that the recursive tree fill can give
// octal codes to the tree nodes that it is creating // octal codes to the tree nodes that it is creating
randomlyFillVoxelTree(MAX_VOXEL_TREE_DEPTH_LEVELS, randomTree.rootNode); randomlyFillVoxelTree(MAX_VOXEL_TREE_DEPTH_LEVELS, serverTree.rootNode);
} }
const char* ADD_SCENE = "--AddScene"; const char* ADD_SCENE = "--AddScene";
@ -554,7 +554,7 @@ int main(int argc, const char * argv[]) {
// TEMPORARILY DISABLED!!! // TEMPORARILY DISABLED!!!
bool actuallyAddScene = false; // !noAddScene && (addScene || (::wantVoxelPersist && !persistantFileRead)); bool actuallyAddScene = false; // !noAddScene && (addScene || (::wantVoxelPersist && !persistantFileRead));
if (actuallyAddScene) { if (actuallyAddScene) {
addSphereScene(&randomTree); addSphereScene(&serverTree);
} }
// for now, initialize the environments with fixed values // for now, initialize the environments with fixed values
@ -633,7 +633,7 @@ int main(int argc, const char * argv[]) {
delete []vertices; delete []vertices;
} }
randomTree.readCodeColorBufferToTree(voxelData, destructive); serverTree.readCodeColorBufferToTree(voxelData, destructive);
// skip to next // skip to next
voxelData += voxelDataSize; voxelData += voxelDataSize;
atByte += voxelDataSize; atByte += voxelDataSize;
@ -643,7 +643,7 @@ int main(int argc, const char * argv[]) {
// Send these bits off to the VoxelTree class to process them // Send these bits off to the VoxelTree class to process them
pthread_mutex_lock(&::treeLock); pthread_mutex_lock(&::treeLock);
randomTree.processRemoveVoxelBitstream((unsigned char*)packetData, receivedBytes); serverTree.processRemoveVoxelBitstream((unsigned char*)packetData, receivedBytes);
pthread_mutex_unlock(&::treeLock); pthread_mutex_unlock(&::treeLock);
} }
if (packetData[0] == PACKET_HEADER_Z_COMMAND) { if (packetData[0] == PACKET_HEADER_Z_COMMAND) {
@ -664,7 +664,7 @@ int main(int argc, const char * argv[]) {
} }
if (strcmp(command, ADD_SCENE_COMMAND) == 0) { if (strcmp(command, ADD_SCENE_COMMAND) == 0) {
printf("got Z message == add scene\n"); printf("got Z message == add scene\n");
addSphereScene(&randomTree); addSphereScene(&serverTree);
rebroadcast = false; rebroadcast = false;
} }
if (strcmp(command, TEST_COMMAND) == 0) { if (strcmp(command, TEST_COMMAND) == 0) {