Merge branch 'linux' of https://github.com/GooborgStudios/synglechance into linux

cleanup.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 rm -rf journal/mac/__pycache__
+rm -rf steamshim_parent/steamshim
 rm -rf build
 rm -rf dist
 rm -rf _______.app

make-oneshot-linux.sh

@@ -22,6 +22,10 @@ echo "-> ${cyan}Generate makefile...${color_reset}"
 qmake -qt=5
 echo "-> ${cyan}Compile engine...${color_reset}"
 make -j${make_threads}
+echo "-> ${cyan}Compile steamshim...${color_reset}"
+cd steamshim_parent
+HOST=linux64 make -j${make_threads}
+cd ..
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 
@@ -42,4 +46,4 @@ rm -rf journal/unix/__pycache__
 rm -rf build
 rm -rf dist
 
-echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}"
+echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/GooborgStudios/synglechance/issues${color_reset}"

make-oneshot-mac.command

@@ -4,7 +4,7 @@ set -e
 cd `dirname $0`
 
 # User-configurable variables
-mac_version="1.0.2"
+mac_version="1.0.4"
 make_threads=8
 ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot
 
@@ -22,6 +22,10 @@ echo "-> ${cyan}Generate makefile...${color_reset}"
 qmake MRIVERSION=2.5
 echo "-> ${cyan}Compile engine...${color_reset}"
 make -j${make_threads}
+echo "-> ${cyan}Compile steamshim...${color_reset}"
+cd steamshim_parent
+HOST=osx make -j${make_threads}
+cd ..
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 
@@ -43,7 +47,7 @@ if [ ! -e $ResourcesDir ]
 	mkdir -p "$ResourcesDir"
 fi
 
-cp patches/mac/steamshim ./OneShot.app/Contents/Resources/steamshim
+cp steamshim_parent/steamshim ./OneShot.app/Contents/Resources/steamshim
 cp patches/mac/libsteam_api.dylib ./OneShot.app/Contents/Libraries/libsteam_api.dylib
 cmake -P patches/mac/CompleteBundle.cmake
 cp assets/icon.icns ./OneShot.app/Contents/Resources/icon.icns
@@ -75,4 +79,4 @@ rm -rf journal/unix/__pycache__
 rm -rf build
 rm -rf dist
 
-echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}"
+echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/GooborgStudios/synglechance/issues${color_reset}"

patches/mac/Info.plist.in

@@ -19,7 +19,7 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleVersion</key>
-		<string>macOS Port v.ONESHOTMACVERSION (OneShot Solstice Update)</string>
+		<string>macOS Port v.ONESHOTMACVERSION</string>
 		<key>CFBundleShortVersionString</key>
 		<string>ONESHOTMACVERSION</string>
 		<key>LSApplicationCategoryType</key>

src/graphics.cpp

@@ -743,6 +743,9 @@ void Graphics::transition(int duration,
 
 	setBrightness(255);
 
+	/* Capture new scene */
+	p->screen.composite();
+
 	/* The PP frontbuffer will hold the current scene after the
 	 * composition step. Since the backbuffer is unused during
 	 * the transition, we can reuse it as the target buffer for
@@ -750,9 +753,6 @@ void Graphics::transition(int duration,
 	TEXFBO &currentScene = p->screen.getPP().frontBuffer();
 	TEXFBO &transBuffer  = p->screen.getPP().backBuffer();
 
-	/* Capture new scene */
-	p->screen.composite();
-
 	/* If no transition bitmap is provided,
 	 * we can use a simplified shader */
 	TransShader &transShader = shState->shaders().trans;