Showing the changes to interface/src/VoxelSystem.cpp (1 of 6 files). Show all
Unified · Split
| @@ -128,8 +128,6 @@ void VoxelSystem::elementDeleted(OctreeElement* element) { · 127 unmodified lines | |||
| 128 | 128 | ||
| 129 | void VoxelSystem::setDisableFastVoxelPipeline(bool disableFastVoxelPipeline) { | 129 | void VoxelSystem::setDisableFastVoxelPipeline(bool disableFastVoxelPipeline) { |
| 130 | _useFastVoxelPipeline = !disableFastVoxelPipeline; | 130 | _useFastVoxelPipeline = !disableFastVoxelPipeline; |
| 131 | printf("setDisableFastVoxelPipeline() disableFastVoxelPipeline=%s _useFastVoxelPipeline=%s\n", | ||
| 132 | debug::valueOf(disableFastVoxelPipeline), debug::valueOf(_useFastVoxelPipeline)); | ||
| 133 | setupNewVoxelsForDrawing(); | 131 | setupNewVoxelsForDrawing(); |
| 134 | } | 132 | } |
| 135 | 133 | ||
| @@ -565,7 +563,6 @@ bool VoxelSystem::readFromSchematicFile(const char* filename) { · 429 unmodified lines | |||
| 565 | } | 563 | } |
| 566 | 564 | ||
| 567 | int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { | 565 | int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { |
| 568 | |||
| 569 | unsigned char command = *sourceBuffer; | 566 | unsigned char command = *sourceBuffer; |
| 570 | int numBytesPacketHeader = numBytesForPacketHeader(sourceBuffer); | 567 | int numBytesPacketHeader = numBytesForPacketHeader(sourceBuffer); |
| 571 | switch(command) { | 568 | switch(command) { |
| @@ -645,6 +642,8 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 73 unmodified lines | |||
| 645 | } | 642 | } |
| 646 | 643 | ||
| 647 | void VoxelSystem::setupNewVoxelsForDrawing() { | 644 | void VoxelSystem::setupNewVoxelsForDrawing() { |
| 645 | |||
| 646 | |||
| 648 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 647 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 649 | "setupNewVoxelsForDrawing()"); | 648 | "setupNewVoxelsForDrawing()"); |
| 650 | 649 | ||
| @@ -709,7 +708,6 @@ void VoxelSystem::setupNewVoxelsForDrawing() { · 58 unmodified lines | |||
| 709 | } | 708 | } |
| 710 | 709 | ||
| 711 | void VoxelSystem::setupNewVoxelsForDrawingSingleNode(bool allowBailEarly) { | 710 | void VoxelSystem::setupNewVoxelsForDrawingSingleNode(bool allowBailEarly) { |
| 712 | |||
| 713 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 711 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 714 | "setupNewVoxelsForDrawingSingleNode() xxxxx"); | 712 | "setupNewVoxelsForDrawingSingleNode() xxxxx"); |
| 715 | 713 | ||
| @@ -849,7 +847,6 @@ void VoxelSystem::cleanupRemovedVoxels() { · 133 unmodified lines | |||
| 849 | 847 | ||
| 850 | void VoxelSystem::copyWrittenDataToReadArraysFullVBOs() { | 848 | void VoxelSystem::copyWrittenDataToReadArraysFullVBOs() { |
| 851 | copyWrittenDataSegmentToReadArrays(0, _voxelsInWriteArrays - 1); | 849 | copyWrittenDataSegmentToReadArrays(0, _voxelsInWriteArrays - 1); |
| 852 | |||
| 853 | _voxelsInReadArrays = _voxelsInWriteArrays; | 850 | _voxelsInReadArrays = _voxelsInWriteArrays; |
| 854 | 851 | ||
| 855 | // clear our dirty flags | 852 | // clear our dirty flags |
| @@ -1945,7 +1942,6 @@ void VoxelSystem::hideOutOfView(bool forceFullFrustum) { · 1089 unmodified lines | |||
| 1945 | } | 1942 | } |
| 1946 | 1943 | ||
| 1947 | if (!forceFullFrustum && _culledOnce && args.lastViewFrustum.isVerySimilar(args.thisViewFrustum)) { | 1944 | if (!forceFullFrustum && _culledOnce && args.lastViewFrustum.isVerySimilar(args.thisViewFrustum)) { |
| 1948 | //printf("view frustum hasn't changed BAIL!!!\n"); | ||
| 1949 | _inhideOutOfView = false; | 1945 | _inhideOutOfView = false; |
| 1950 | return; | 1946 | return; |
| 1951 | } | 1947 | } |