FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

worked on 3D walls

Browse Source
This commit is contained in:
k-a-z-u
2018-07-24 18:08:08 +02:00
parent 3d79fd5af0
commit f7e4323d58
11 changed files with 261 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/geo/TestBVH2.cpp
View File

@@ -10,7 +10,7 @@
#include "../../floorplan/v2/Floorplan.h"
#include "../../floorplan/v2/FloorplanReader.h"
#include "../../wifi/estimate/ray3/ModelFactory.h"
//#include "../../wifi/estimate/ray3/ModelFactory.h"
struct WrapperBBox2 {

48
tests/geo/TestBVH3.cpp
View File

@@ -8,9 +8,9 @@
#include "../../floorplan/v2/Floorplan.h"
#include "../../floorplan/v2/FloorplanReader.h"
#include "../../wifi/estimate/ray3/ModelFactory.h"
#include "../../floorplan/3D/Builder.h"
using namespace Ray3D;
using namespace Floorplan3D;
struct Wrapper {
@@ -140,37 +140,37 @@ TEST(BVH, tree3) {
}
TEST(BVH, treeMap) {
//TEST(BVH, treeMap) {
std::string file = "/apps/SHL39.xml";
Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(file);
// std::string file = "/apps/SHL39.xml";
// Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(file);
ModelFactory fac(map);
fac.setExportCeilings(false);
fac.setFloors({map->floors[3]});
FloorplanMesh mesh = fac.getMesh();
std::vector<Obstacle3D> obs = mesh.elements;
// ModelFactory fac(map);
// fac.setExportCeilings(false);
// fac.setFloors({map->floors[3]});
// FloorplanMesh mesh = fac.getMesh();
// std::vector<Obstacle3D> obs = mesh.elements;
BVH3Debug<Obstacle3D, BoundingVolumeSphere3, WrapperObs3D> tree;
// BVH3Debug<Obstacle3D, BoundingVolumeSphere3, WrapperObs3D> tree;
for (const Obstacle3D& o : obs) {
tree.add(o);
}
// for (const Obstacle3D& o : obs) {
// tree.add(o);
// }
//tree.show(150);
// //tree.show(150);
//int rounds = tree.optimize();
// //int rounds = tree.optimize();
for (int i = 0; i < 200; ++i) {
tree.optimize(1);
//if (i%3==0) {
tree.show(250, false);
//}
}
// for (int i = 0; i < 200; ++i) {
// tree.optimize(1);
// //if (i%3==0) {
// tree.show(250, false);
// //}
// }
int i = 0; (void) i;
// int i = 0; (void) i;
}
//}
TEST(BVH, treeRandom) {

9
tests/ray/TestModelFac.cpp
View File

@@ -1,22 +1,21 @@
#ifdef WITH_TESTS
#include "../Tests.h"
#include "../../wifi/estimate/ray3/ModelFactory.h"
#include "../../floorplan/3D/Builder.h"
#include "../../floorplan/v2/FloorplanReader.h"
#include <fstream>
using namespace Ray3D;
TEST(Ray, ModelFac) {
TEST(Floorplan3D, ModelFac) {
//std::string file = "/apps/paper/diss/data/maps/SHL42_nm.xml";
std::string file = "/mnt/vm/paper/diss/data/maps/SHL42_nm.xml";
Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(file);
ModelFactory fac(map);
Floorplan3D::Builder fac(map);
//fac.triangulize();
FloorplanMesh mesh = fac.getMesh();
Floorplan3D::FloorplanMesh mesh = fac.getMesh();
std::ofstream out("/tmp/fhws.ply");
out << mesh.toPLY() << std::endl;

2
tests/ray/TestRayTrace3.cpp
View File

@@ -18,7 +18,7 @@ TEST(RayTrace3, test) {
Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(file);
Floorplan::AccessPoint* ap = map->floors[0]->accesspoints[4];
ModelFactory fac(map);
Builder fac(map);
std::ofstream outOBJ("/tmp/vm/map.obj");
outOBJ << fac.getMesh().toOBJ("obj").obj;
outOBJ.close();