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

Merge branch 'master' of https://git.frank-ebner.de/FHWS/Indoor

Browse Source
This commit is contained in:
k-a-z-u
2018-04-03 15:04:07 +02:00
parent 5d089f4b86 bb31bc3b2d
commit 1b9084a9c0
25 changed files with 620 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wifi/estimate/ray3/OBJPool.h
View File

@@ -113,9 +113,11 @@ namespace Ray3D {
// create triangles
Obstacle3D obs;
for (const OBJReader::Face& face : reader.getData().faces) {
const Triangle3 tria(face.vnt[0].vertex, face.vnt[1].vertex, face.vnt[2].vertex);
obs.triangles.push_back(tria);
for (const OBJReader::Object& obj : reader.getData().objects) {
for (const OBJReader::Face& face : obj.faces) {
const Triangle3 tria(face.vnt[0].vertex, face.vnt[1].vertex, face.vnt[2].vertex);
obs.triangles.push_back(tria);
}
}
Log::add(this->name, "loaded: " + absName + " [" + std::to_string(obs.triangles.size()) + " triangles]", true);