Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 15:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up constants for voxels

Browse source
This commit is contained in:
ZappoMan 2013-04-29 06:49:57 -07:00
parent 78e8751a79
commit 781721b79c
7 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/VoxelSystem.cpp
View file

@ -18,15 +18,10 @@
#include <OctalCode.h>
#include <pthread.h>
#include "Log.h"
#include "VoxelConstants.h"
#include "VoxelSystem.h"
const int MAX_VOXELS_PER_SYSTEM = 250000;
const int VERTICES_PER_VOXEL = 24;
const int VERTEX_POINTS_PER_VOXEL = 3 * VERTICES_PER_VOXEL;
const int INDICES_PER_VOXEL = 3 * 12;
float identityVertices[] = { 0,0,0, 1,0,0, 1,1,0, 0,1,0, 0,0,1, 1,0,1, 1,1,1, 0,1,1,
0,0,0, 1,0,0, 1,1,0, 0,1,0, 0,0,1, 1,0,1, 1,1,1, 0,1,1,
0,0,0, 1,0,0, 1,1,0, 0,1,0, 0,0,1, 1,0,1, 1,1,1, 0,1,1 };

2
libraries/voxels/src/VoxelNode.cpp
View file

@ -12,9 +12,9 @@
#include "SharedUtil.h"
#include "voxels_Log.h"
#include "VoxelNode.h"
#include "VoxelConstants.h"
#include "OctalCode.h"
#include "AABox.h"
using voxels_lib::printLog;
// using voxels_lib::printLog;

3
libraries/voxels/src/VoxelNode.h
View file

@ -15,9 +15,6 @@
typedef unsigned char colorPart;
typedef unsigned char nodeColor[4];
const int TREE_SCALE = 10;
class VoxelNode {
private:
nodeColor _trueColor;

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

@ -62,6 +62,7 @@
#include "VoxelNodeBag.h"
#include "ViewFrustum.h"
#include <fstream> // to load voxels from file
#include "VoxelConstants.h"
using voxels_lib::printLog;

3
libraries/voxels/src/VoxelTree.h
View file

@ -16,9 +16,6 @@
#include "VoxelNodeBag.h"
#include "MarkerNode.h"
const int MAX_VOXEL_PACKET_SIZE = 1492;
const int MAX_TREE_SLICE_BYTES = 26;
// Callback function, for recuseTreeWithOperation
typedef bool (*RecurseVoxelTreeOperation)(VoxelNode* node, bool down, void* extraData);

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

@ -14,7 +14,7 @@
#include <AvatarData.h>
#include "MarkerNode.h"
#include "VoxelNodeBag.h"
#include "VoxelTree.h" // for MAX_VOXEL_PACKET_SIZE
#include "VoxelConstants.h"
class VoxelAgentData : public AvatarData {
public:

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

@ -29,9 +29,6 @@
const int VOXEL_LISTEN_PORT = 40106;
const int VERTICES_PER_VOXEL = 8;
const int VERTEX_POINTS_PER_VOXEL = 3 * VERTICES_PER_VOXEL;
const int COLOR_VALUES_PER_VOXEL = 3 * VERTICES_PER_VOXEL;
const int VOXEL_SIZE_BYTES = 3 + (3 * sizeof(float));
const int VOXELS_PER_PACKET = (MAX_PACKET_SIZE - 1) / VOXEL_SIZE_BYTES;