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-04 10:14:40 +02:00
parent 1b9084a9c0 2e6cf96f1d
commit a4ed06c4a4
10 changed files with 168 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,6 @@ namespace Ray3D {
scanFolder(folder);
} catch (...) {;}
}
initDone = true;
}
@@ -89,9 +88,9 @@ namespace Ray3D {
}
for (std::experimental::filesystem::directory_entry entry : std::experimental::filesystem::directory_iterator(d)) {
const std::string absFile = entry.path().native();
const std::string absFile = entry.path().string();
if (endsWith(absFile, ".obj")) {
std::string name = entry.path().filename();
std::string name = entry.path().filename().string();
name = name.substr(0, name.length() - 4); // without extension
load(absFile, name);
}