removed some hackery

This commit is contained in:
ZappoMan 2013-11-07 17:21:45 -08:00
parent 1587cf0bbe
commit cad51885e8
2 changed files with 0 additions and 152 deletions

View file

@ -651,141 +651,3 @@ const char* VoxelSceneStats::getItemValue(Item item) {
}
int VoxelSceneStats::getItemDetailsCount(Item item) {
return _ITEMS[item].detailsCount;
}
float VoxelSceneStats::getItemDetailsValue(Item item, int detailIndex) {
const uint64_t USECS_PER_SECOND = 1000 * 1000;
int calcFPS, calculatedKBPS;
const int MAX_DETAILS_ITEMS = 6;
float items[MAX_DETAILS_ITEMS];
switch(item) {
case ITEM_ELAPSED: {
calcFPS = (float)USECS_PER_SECOND / (float)_elapsed;
items[0] = _elapsed;
items[1] = calcFPS;
break;
}
case ITEM_ENCODE:
calcFPS = (float)USECS_PER_SECOND / (float)_totalEncodeTime;
items[0] = _totalEncodeTime;
items[1] = calcFPS;
break;
case ITEM_PACKETS: {
float elapsedSecs = ((float)_elapsed / (float)USECS_PER_SECOND);
calculatedKBPS = elapsedSecs == 0 ? 0 : ((_bytes * 8) / elapsedSecs) / 1000;
items[0] = _packets;
items[1] = _bytes;
items[2] = calculatedKBPS;
break;
}
case ITEM_VOXELS_SERVER: {
items[0] = _totalVoxels;
items[1] = _totalInternal;
items[2] = _totalLeaves;
break;
}
case ITEM_VOXELS: {
unsigned long total = _existsInPacketBitsWritten + _colorSent;
float calculatedBPV = total == 0 ? 0 : (_bytes * 8) / total;
float averageBPV = _bitsPerVoxelAverage.getAverage();
items[0] = total;
items[1] = calculatedBPV;
items[2] = averageBPV;
items[3] = _existsInPacketBitsWritten;
items[4] = _colorSent;
break;
}
case ITEM_TRAVERSED: {
items[0] = _traversed;
items[1] = _internal;
items[2] = _leaves;
break;
}
case ITEM_SKIPPED: {
unsigned long total = _skippedDistance + _skippedOutOfView +
_skippedWasInView + _skippedNoChange + _skippedOccluded;
unsigned long internal = _internalSkippedDistance + _internalSkippedOutOfView +
_internalSkippedWasInView + _internalSkippedNoChange + _internalSkippedOccluded;
unsigned long leaves = _leavesSkippedDistance + _leavesSkippedOutOfView +
_leavesSkippedWasInView + _leavesSkippedNoChange + _leavesSkippedOccluded;
items[0] = total;
items[1] = internal;
items[2] = leaves;
break;
}
case ITEM_SKIPPED_DISTANCE: {
items[0] = _skippedDistance;
items[1] = _internalSkippedDistance;
items[2] = _leavesSkippedDistance;
break;
}
case ITEM_SKIPPED_OUT_OF_VIEW: {
items[0] = _skippedOutOfView;
items[1] = _internalSkippedOutOfView;
items[2] = _leavesSkippedOutOfView;
break;
}
case ITEM_SKIPPED_WAS_IN_VIEW: {
items[0] = _skippedWasInView;
items[1] = _internalSkippedWasInView;
items[2] = _leavesSkippedWasInView;
break;
}
case ITEM_SKIPPED_NO_CHANGE: {
items[0] = _skippedNoChange;
items[1] = _internalSkippedNoChange;
items[2] = _leavesSkippedNoChange;
break;
}
case ITEM_SKIPPED_OCCLUDED: {
items[0] = _skippedOccluded;
items[1] = _internalSkippedOccluded;
items[2] = _leavesSkippedOccluded;
break;
}
case ITEM_COLORS: {
items[0] = _colorSent;
items[1] = _internalColorSent;
items[2] = _leavesColorSent;
break;
}
case ITEM_DIDNT_FIT: {
items[0] = _didntFit;
items[1] = _internalDidntFit;
items[2] = _leavesDidntFit;
items[3] = _treesRemoved;
break;
}
case ITEM_BITS: {
items[0] = _colorBitsWritten;
items[1] = _existsBitsWritten;
items[2] = _existsInPacketBitsWritten;
break;
}
case ITEM_MODE: {
items[0] = _isMoving ? 1.0 : 0.0;
items[1] = !_isMoving ? 1.0 : 0.0;
items[2] = _isFullScene ? 1.0 : 0.0;
items[3] = !_isFullScene ? 1.0 : 0.0;
break;
}
default:
sprintf(_itemValueBuffer, "");
break;
}
return items[detailIndex];
}
const char* VoxelSceneStats::getItemDetailsLabel(Item item, int detailIndex) {
QString labels(_ITEMS[item].detailsLabels);
QStringList labelsList = labels.split(QString(","));
QString label = labelsList.at(detailIndex);
sprintf(_itemValueBuffer, "%s", label.toLocal8Bit().constData());
return _itemValueBuffer;
}

View file

@ -132,20 +132,6 @@ public:
/// \param Item item The item from the stats you're interested in.
const char* getItemValue(Item item);
/// Returns a count of the number of detailed values for an item tracked by VoxelSceneStats
/// \param Item item The item from the stats you're interested in.
int getItemDetailsCount(Item item);
/// The value for the detailed component for an item tracked by VoxelSceneStats
/// \param Item item The item from the stats you're interested in.
/// \param int detailIndex The index for the detailed componet from the stats you're interested in.
float getItemDetailsValue(Item item, int detailIndex);
/// The label for the detailed component for an item tracked by VoxelSceneStats
/// \param Item item The item from the stats you're interested in.
/// \param int detailIndex The index for the detailed componet from the stats you're interested in.
const char* getItemDetailsLabel(Item item, int detailIndex);
/// Returns OctCode for root node of the jurisdiction of this particular voxel server
unsigned char* getJurisdictionRoot() const { return _jurisdictionRoot; }