Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-15 06:52:34 +02:00
Code Issues Projects Releases Activity

rwengine: Fix cutscenes only showing a grey screen on macOS.

Browse Source 
This is caused by different handling of formatted input in the C++
standard library on macOS than on a linux box.
On linux, characters after a number are ignored (such as 'f' in this
case), on macOS this leads to an error on the stream.
This commit is contained in:
Christoph Heiss 2018-06-26 14:15:08 +02:00
parent 7061813afd
commit 4e38cb1d30
No known key found for this signature in database
GPG Key ID: 642FF75046E6C3CA
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
rwengine/src/loaders/LoaderCutsceneDAT.cpp
View File

@ -21,14 +21,16 @@ void LoaderCutsceneDAT::load(CutsceneTracks &tracks, const FileHandle& file) {
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
for (int i = 0; i < numZooms; ++i) {
float t = 0.f;
float z = 0.f;
ss >> t;
ss.ignore(2, ',');
ss >> z;
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
tracks.zoom[t] = z;
std::string st, sz;
std::getline(ss, st, ',');
std::getline(ss, sz, ',');
float t = std::stof(st);
tracks.zoom[t] = std::stof(sz);
tracks.duration = std::max(t, tracks.duration);
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
ss.ignore(std::numeric_limits<std::streamsize>::max(), ';');
@ -38,14 +40,16 @@ void LoaderCutsceneDAT::load(CutsceneTracks &tracks, const FileHandle& file) {
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
for (int i = 0; i < numRotations; ++i) {
float t = 0.f;
float r = 0.f;
ss >> t;
ss.ignore(2, ',');
ss >> r;
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
tracks.rotation[t] = r;
std::string st, sr;
std::getline(ss, st, ',');
std::getline(ss, sr, ',');
float t = std::stof(st);
tracks.rotation[t] = std::stof(sr);
tracks.duration = std::max(t, tracks.duration);
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
ss.ignore(std::numeric_limits<std::streamsize>::max(), ';');
@ -55,18 +59,19 @@ void LoaderCutsceneDAT::load(CutsceneTracks &tracks, const FileHandle& file) {
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
for (int i = 0; i < numPositions; ++i) {
float t = 0.f;
glm::vec3 p;
ss >> t;
ss.ignore(2, ',');
ss >> p.x;
ss.ignore(1, ',');
ss >> p.y;
ss.ignore(1, ',');
ss >> p.z;
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
std::string st, sx, sy, sz;
std::getline(ss, st, ',');
std::getline(ss, sx, ',');
std::getline(ss, sy, ',');
std::getline(ss, sz, ',');
float t = std::stof(st);
glm::vec3 p{std::stof(sx), std::stof(sy), std::stof(sz)};
tracks.position[t] = p;
tracks.duration = std::max(t, tracks.duration);
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
ss.ignore(std::numeric_limits<std::streamsize>::max(), ';');
@ -76,18 +81,19 @@ void LoaderCutsceneDAT::load(CutsceneTracks &tracks, const FileHandle& file) {
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
for (int i = 0; i < numTargets; ++i) {
float t = 0.f;
glm::vec3 p;
ss >> t;
ss.ignore(2, ',');
ss >> p.x;
ss.ignore(1, ',');
ss >> p.y;
ss.ignore(1, ',');
ss >> p.z;
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
std::string st, sx, sy, sz;
std::getline(ss, st, ',');
std::getline(ss, sx, ',');
std::getline(ss, sy, ',');
std::getline(ss, sz, ',');
float t = std::stof(st);
glm::vec3 p{std::stof(sx), std::stof(sy), std::stof(sz)};
tracks.target[t] = p;
tracks.duration = std::max(t, tracks.duration);
ss.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
RW_CHECK(ss.eof() || ss.good(), "Loading CutsceneDAT file failed");