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

Merge pull request #1063 from OpenSpace/bug/macosbuild

Browse Source 
macos compile and build (still needs ring shader const fix)
This commit is contained in:
Alexander Bock
2020-02-10 23:39:39 +01:00
committed by GitHub
parent b1f8f1536b cae91a5b7c
commit 9cb1169d58
21 changed files with 106 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/loadingscreen.cpp
+1 -2
View File
@@ -166,7 +166,7 @@ void LoadingScreen::render() {
const glm::vec2 dpiScaling = global::windowDelegate.dpiScaling();
const glm::ivec2 res =
glm::vec2(global::windowDelegate.currentSubwindowSize()) / dpiScaling;
glm::vec2(global::windowDelegate.currentSubwindowSize()) * dpiScaling;
float screenAspectRatio = static_cast<float>(res.x) / static_cast<float>(res.y);
@@ -317,7 +317,6 @@ void LoadingScreen::render() {
ProgressbarCenter.y + progressbarSize.y
};
for (Item& item : _items) {
if (!item.hasLocation) {
// Compute a new location