Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

octree tests tweaks

Browse source 
Conflicts:
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
This commit is contained in:
ZappoMan 2014-06-25 11:31:36 -07:00
parent 9e0f010edd
commit 142fc02ec5
2 changed files with 16 additions and 5 deletions
tests/octree/src
ModelTests.cppmain.cpp

17
tests/octree/src/ModelTests.cpp
View file

@ -26,7 +26,7 @@
void ModelTests::modelTreeTests(bool verbose) {
bool extraVerbose = false;
bool extraVerbose = true;
int testsTaken = 0;
int testsPassed = 0;
int testsFailed = 0;
@ -240,9 +240,10 @@ void ModelTests::modelTreeTests(bool verbose) {
{
// seed the random number generator so that our tests are reproducible
srand(0xFEEDBEEF);
ModelTree tree;
testsTaken++;
const int TEST_ITERATIONS = 10000;
const int TEST_ITERATIONS = 10;
QString testName = "Performance - add model to tree " + QString::number(TEST_ITERATIONS) + " times";
if (verbose) {
qDebug() << "Test" << testsTaken <<":" << qPrintable(testName);
@ -266,11 +267,21 @@ void ModelTests::modelTreeTests(bool verbose) {
properties.setRadius(halfMeter);
properties.setModelURL("https://s3-us-west-1.amazonaws.com/highfidelity-public/ozan/theater.fbx");
if (extraVerbose) {
qDebug() << "iteration:" << i
<< "ading model at x/y/z=" << randomX << "," << randomY << "," << randomZ;
qDebug() << "before:" << i << "getOctreeElementsCount()=" << tree.getOctreeElementsCount();
}
quint64 startAdd = usecTimestampNow();
tree.addModel(modelID, properties);
quint64 endAdd = usecTimestampNow();
totalElapsedAdd += (endAdd - startAdd);
if (extraVerbose) {
qDebug() << "after:" << i << "getOctreeElementsCount()=" << tree.getOctreeElementsCount();
}
quint64 startFind = usecTimestampNow();
float targetRadius = oneMeter * 2.0 / (float)TREE_SCALE; // in tree units
const ModelItem* foundModelByRadius = tree.findClosestModel(randomPositionInTreeUnits, targetRadius);
@ -285,7 +296,7 @@ void ModelTests::modelTreeTests(bool verbose) {
// Every 1000th test, show the size of the tree...
if (verbose && (i % 1000 == 0)) {
qDebug() << "after test:" << i << "getOctreeElementsCount()=" << tree.getOctreeElementsCount();
qDebug() << "after test:" << i << "getOctreeElementsCount()=" << tree.getOctreeElementsCount();
}
bool passed = foundModelByRadius && foundModelByID && (foundModelByRadius == foundModelByID);

4
tests/octree/src/main.cpp
View file

@ -17,8 +17,8 @@ int main(int argc, const char* argv[]) {
const char* VERBOSE = "--verbose";
bool verbose = cmdOptionExists(argc, argv, VERBOSE);
qDebug() << "OctreeTests::runAllTests()";
OctreeTests::runAllTests(verbose);
AABoxCubeTests::runAllTests(verbose);
//OctreeTests::runAllTests(verbose);
//AABoxCubeTests::runAllTests(verbose);
ModelTests::runAllTests(verbose);
return 0;
}