Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cutscene only showing a grey screen on macOS. #533

Merged
merged 2 commits into from Jun 26, 2018
Merged

Fix cutscene only showing a grey screen on macOS. #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e38cb1
rwengine: Fix cutscenes only showing a grey screen on macOS.
christoph-heiss Jun 26, 2018
359d61e
cmake: Fix linking failure when using the C++17 or C++TS filesystem l…
christoph-heiss Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmake_configure.cmake
View file
Open in desktop
Expand Up @@ -67,10 +67,14 @@ else()
endif()

if(FILESYSTEM_LIBRARY STREQUAL "CXX17")
set(CMAKE_CXX_STANDARD 17)
target_compile_definitions(rw_interface INTERFACE "RW_FS_LIBRARY=0")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_link_libraries(rw_interface INTERFACE "stdc++fs")
endif()
elseif(FILESYSTEM_LIBRARY STREQUAL "CXXTS")
target_compile_definitions(rw_interface INTERFACE "RW_FS_LIBRARY=1")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_link_libraries(rw_interface INTERFACE "stdc++fs")
endif()
elseif(FILESYSTEM_LIBRARY STREQUAL "BOOST")
Expand Down
74 changes: 40 additions & 34 deletions rwengine/src/loaders/LoaderCutsceneDAT.cpp
View file
Open in desktop
Expand Up @@ -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(), ';');
Expand All @@ -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(), ';');
Expand All @@ -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(), ';');
Expand All @@ -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");
Expand Down