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

VS fixes

Browse Source
This commit is contained in:
Markus Bullmann
2018-03-27 13:59:47 +02:00
parent 705763f03c
commit e6444ceeb7
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,10 +54,10 @@ namespace Ray3D {
//while ((dir = readdir(d)) != NULL) {
for (std::experimental::filesystem::directory_entry entry : std::experimental::filesystem::directory_iterator(d)) {
//const std::string absFile = folder + "/" + dir->d_name;
const std::string absFile = entry.path().native();
const std::string absFile = entry.path().string();
if (endsWith(absFile, ".obj")) {
//std::string name = std::string(dir->d_name);
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);
}

2
wifi/estimate/ray3/OBJReader.h
View File

@@ -28,7 +28,7 @@ public:
/** one triangle */
struct Face {
VNT vnt[3];
Face(VNT v1, VNT v2, VNT v3) : vnt({v1,v2,v3}) {;}
Face(VNT v1, VNT v2, VNT v3) : vnt{v1,v2,v3} {;}
};
/** internal data */