mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced std::getline usages with new ghoul::getline

Browse Source
This commit is contained in:
GPayne
2024-03-04 15:37:21 -07:00
parent 041cb5c68b
commit 210e17b0bb
36 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderabledumeshes.cpp
+5 -4
View File
@@ -35,6 +35,7 @@
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/font/fontmanager.h>
#include <ghoul/font/fontrenderer.h>
#include <ghoul/misc/stringhelper.h>
#include <ghoul/misc/templatefactory.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/logging/logmanager.h>
@@ -482,7 +483,7 @@ bool RenderableDUMeshes::readSpeckFile() {
// (signaled by the keywords 'datavar', 'texturevar', and 'texture')
std::string line;
while (true) {
std::getline(file, line);
ghoul::getline(file, line);
if (file.eof()) {
break;
@@ -547,13 +548,13 @@ bool RenderableDUMeshes::readSpeckFile() {
str >> dummy;
} while (dummy != "{");
std::getline(file, line);
ghoul::getline(file, line);
std::stringstream dim(line);
dim >> mesh.numU >> mesh.numV;
// We can now read the vertices data:
for (int l = 0; l < mesh.numU * mesh.numV; ++l) {
std::getline(file, line);
ghoul::getline(file, line);
if (line.substr(0, 1) == "}") {
break;
}
@@ -605,7 +606,7 @@ bool RenderableDUMeshes::readSpeckFile() {
//}
}
std::getline(file, line);
ghoul::getline(file, line);
if (line.substr(0, 1) == "}") {
_renderingMeshesMap.insert({ meshIndex++, mesh });
}