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

Merge pull request #251 from ZappoMan/render_voxels_optimization

Browse source 
Fix Ryan's render problem (hopefully) and don't crash with too many voxels
This commit is contained in:
ZappoMan 2013-05-08 18:50:30 -07:00
commit b9781c2191
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/VoxelSystem.cpp
View file

@ -220,6 +220,11 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) {
}
int VoxelSystem::newway__updateNodeInArray(VoxelNode* node) {
// If we've run out of room, then just bail...
if (_voxelsInWriteArrays >= MAX_VOXELS_PER_SYSTEM) {
return 0;
}
if (node->getShouldRender()) {
glm::vec3 startVertex = node->getCorner();
float voxelScale = node->getScale();

2
libraries/voxels/src/VoxelConstants.h
View file

@ -19,7 +19,7 @@ const int TREE_SCALE = 128;
const int NUMBER_OF_CHILDREN = 8;
const int MAX_VOXEL_PACKET_SIZE = 1492;
const int MAX_TREE_SLICE_BYTES = 26;
const int MAX_VOXELS_PER_SYSTEM = 500000;
const int MAX_VOXELS_PER_SYSTEM = 200000;
const int VERTICES_PER_VOXEL = 24;
const int VERTEX_POINTS_PER_VOXEL = 3 * VERTICES_PER_VOXEL;
const int INDICES_PER_VOXEL = 3 * 12;

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

@ -24,7 +24,7 @@ void addLandscape(VoxelTree * tree) {
printf("Adding Landscape...\n");
}
void addScene(VoxelTree * tree) {
void voxelTutorial(VoxelTree * tree) {
printf("adding scene...\n");
// We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...