From 7c604b544e9145d767e5a5b2301774b0b8bc80d0 Mon Sep 17 00:00:00 2001 From: iobyte Date: Wed, 12 Jul 2023 02:31:11 +0000 Subject: [PATCH] trackgen: work around visual studio tellg/seekg bug when reading file with unix line endings git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9101 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: abb0ee47ed6230b5766471a1417b449bb654a38d Former-commit-id: 1f668d48959d371da8730087dbca0a24dff0dcbf --- src/tools/trackgen/ac3d.cpp | 4 ++-- src/tools/trackgen/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/trackgen/ac3d.cpp b/src/tools/trackgen/ac3d.cpp index 56bfb4600..56d263057 100644 --- a/src/tools/trackgen/ac3d.cpp +++ b/src/tools/trackgen/ac3d.cpp @@ -1058,7 +1058,7 @@ void Ac3d::addDefaultMaterial() void Ac3d::readFile(const std::string &fileName) { - std::ifstream fin(fileName); + std::ifstream fin(fileName, std::ios::binary); if (!fin) throw Exception("Couldn't open file"); @@ -1082,7 +1082,7 @@ void Ac3d::readFile(const std::string &fileName) tokenizeLine(line, tokens); - if (tokens.empty()) + if (tokens.empty() || tokens[0].empty()) continue; if (tokens.at(0) == "MATERIAL") materials.emplace_back(tokens); diff --git a/src/tools/trackgen/main.cpp b/src/tools/trackgen/main.cpp index 6660867ce..6f8fe6d29 100644 --- a/src/tools/trackgen/main.cpp +++ b/src/tools/trackgen/main.cpp @@ -98,7 +98,7 @@ public: //! Constructor. Application::Application() -: GfApplication("TrackGen", "1.6.0.30", "Terrain generator for tracks") +: GfApplication("TrackGen", "1.6.0.31", "Terrain generator for tracks") , HeightSteps(30) , Bump(false) , Raceline(false)