Merge branch 'master' into psemek-audio

jhasse · Nov 29, 2023 · 710ea5b · 710ea5b
2 parents 4e3d640 + b32072d
commit 710ea5b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 49 deletions.
diff --git a/.vscode/build.bat b/.vscode/build.bat
@@ -2,6 +2,6 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build
 if exist build\build.ninja (
     rem file exists
 ) else (
-    cmake -Bbuild -GNinja -DJNGL_VIDEO=0 -DCMAKE_BUILD_TYPE=Debug
+    cmake -Bbuild -G"Ninja Multi-Config" -DJNGL_VIDEO=0
 )
 cmake --build build
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,30 +1,11 @@
 {
 	"version": "0.2.0",
 	"configurations": [
-		{
-			"type": "gdb",
-			"request": "launch",
-			"name": "jngl-test (GDB)",
-			"target": "./build/jngl-test",
-			"cwd": "${workspaceRoot}",
-			"valuesFormatting": "prettyPrinters",
-			"preLaunchTask": "build"
-		},
-		{
-			"type": "gdb",
-			"request": "launch",
-			"name": "videoplayer (GDB)",
-			"target": "./build/videoplayer",
-			"arguments": "data/verysmall.ogv",
-			"cwd": "${workspaceRoot}",
-			"valuesFormatting": "prettyPrinters",
-			"preLaunchTask": "build"
-		},
 		{
 			"type": "lldb",
 			"request": "launch",
 			"name": "jngl-test (LLDB)",
-			"program": "${workspaceRoot}/build/jngl-test",
+			"program": "${workspaceRoot}/build/Debug/jngl-test",
 			"args": [],
 			"cwd": "${workspaceRoot}",
 			"preLaunchTask": "build"
@@ -33,7 +14,7 @@
 			"type": "lldb",
 			"request": "launch",
 			"name": "videoplayer",
-			"program": "${workspaceRoot}/build/videoplayer",
+			"program": "${workspaceRoot}/build/Debug/videoplayer",
 			"args": ["data/verysmall.ogv"],
 			"cwd": "${workspaceRoot}",
 			"preLaunchTask": "build"
@@ -42,7 +23,7 @@
 			"type": "lldb",
 			"request": "launch",
 			"name": "jngl-unittest (LLDB)",
-			"program": "${workspaceRoot}/build/jngl-unittest",
+			"program": "${workspaceRoot}/build/Debug/jngl-unittest",
 			"args": [],
 			"cwd": "${workspaceRoot}/build",
 			"preLaunchTask": "build"
@@ -51,7 +32,7 @@
 			"name": "jngl-test (C/C++)",
 			"type": "cppdbg",
 			"request": "launch",
-			"program": "${workspaceRoot}/build/jngl-test",
+			"program": "${workspaceRoot}/build/Debug/jngl-test",
 			"args": [],
 			"stopAtEntry": false,
 			"cwd": "${workspaceRoot}",
@@ -76,7 +57,7 @@
 			"name": "jngl-unittest (C/C++)",
 			"type": "cppdbg",
 			"request": "launch",
-			"program": "${workspaceRoot}/build/jngl-unittest",
+			"program": "${workspaceRoot}/build/Debug/jngl-unittest",
 			"args": [],
 			"stopAtEntry": false,
 			"cwd": "${workspaceRoot}/build",

diff --git a/src/android/window.cpp b/src/android/window.cpp
@@ -39,10 +39,6 @@ bool Window::getKeyDown(const std::string& key) {
 }
 
 bool Window::getKeyPressed(const std::string& key) {
-	if (characterPressed_[key]) {
-		characterPressed_[key] = false;
-		return true;
-	}
 	return characterPressed_[key];
 }
 

diff --git a/src/ios/window.cpp b/src/ios/window.cpp
@@ -35,10 +35,6 @@ bool Window::getKeyDown(const std::string& key) {
 }
 
 bool Window::getKeyPressed(const std::string& key) {
-	if (characterPressed_[key]) {
-		characterPressed_[key] = false;
-		return true;
-	}
 	return characterPressed_[key];
 }
 

diff --git a/src/jngl/FrameBuffer.cpp b/src/jngl/FrameBuffer.cpp
@@ -73,9 +73,15 @@ FrameBuffer::FrameBuffer(const Pixels width, const Pixels height)
 
 	assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
 
+	if (impl->letterboxing) {
+		glDisable(GL_SCISSOR_TEST);
+	}
 	glClearColor(1, 1, 1, 0);
 	glClear(GL_COLOR_BUFFER_BIT);
 	clearBackgroundColor();
+	if (impl->letterboxing) {
+		glEnable(GL_SCISSOR_TEST);
+	}
 
 	glBindFramebuffer(GL_FRAMEBUFFER, impl->systemFbo);
 	glBindRenderbuffer(GL_RENDERBUFFER, impl->systemBuffer);

diff --git a/src/sdl/window.cpp b/src/sdl/window.cpp
@@ -78,7 +78,12 @@ Window::Window(const std::string& title, int width, int height, const bool fulls
 
 	impl->context = SDL_GL_CreateContext(impl->sdlWindow);
 #ifdef GLAD_GL
-	gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress));
+	const auto glVersion = gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress));
+	if (glVersion < GLAD_MAKE_VERSION(2, 0)) {
+		throw std::runtime_error("Your graphics card is missing OpenGL 2.0 support (it supports " +
+		                         std::to_string(GLAD_VERSION_MAJOR(glVersion)) + "." +
+		                         std::to_string(GLAD_VERSION_MINOR(glVersion)) + ").");
+	}
 #endif
 
 	if (isMultisampleSupported_) {
@@ -219,10 +224,6 @@ bool Window::getKeyDown(const std::string& key) {
 }
 
 bool Window::getKeyPressed(const std::string& key) {
-	if (characterPressed_[key]) {
-		characterPressed_[key] = false;
-		return true;
-	}
 	return characterPressed_[key];
 }
 
@@ -337,10 +338,12 @@ void Window::UpdateInput() {
 				}
 				characterDown_[tmp] = true;
 				characterPressed_[tmp] = true;
+				needToBeSetFalse_.push(&characterPressed_[tmp]);
 			}
 			if (event.key.keysym.sym == SDLK_SPACE) {
 				characterDown_[" "] = true;
 				characterPressed_[" "] = true;
+				needToBeSetFalse_.push(&characterPressed_[" "]);
 			}
 			anyKeyPressed_ = true;
 			break;
@@ -352,14 +355,11 @@ void Window::UpdateInput() {
 			if (strlen(name) == 1) {
 				std::string tmp(1, name[0]);
 				characterDown_[tmp] = false;
-				characterPressed_[tmp] = false;
 				tmp[0] = tolower(name[0]);
 				characterDown_[tmp] = false;
-				characterPressed_[tmp] = false;
 			}
 			if (event.key.keysym.sym == SDLK_SPACE) {
 				characterDown_[" "] = false;
-				characterPressed_[" "] = false;
 			}
 			break;
 		}

diff --git a/src/win32/windowimpl.cpp b/src/win32/windowimpl.cpp
@@ -426,7 +426,6 @@ void Window::UpdateInput() {
 			impl->distinguishLeftRight();
 			int scanCode = msg.lParam & 0x7f8000;
 			characterDown_[scanCodeToCharacter[scanCode]] = false;
-			characterPressed_[scanCodeToCharacter[scanCode]] = false;
 		} break;
 		case WM_CHAR: {
 			std::vector<char> buf(4);
@@ -466,6 +465,7 @@ void Window::UpdateInput() {
 			scanCodeToCharacter[scanCode] = character;
 			characterDown_[character] = true;
 			characterPressed_[character] = true;
+			needToBeSetFalse_.push(&characterPressed_[character]);
 			textInput += character;
 		} break;
 		}
@@ -488,9 +488,6 @@ void Window::UpdateInput() {
 		for (auto& it : characterDown_) {
 			it.second = false;
 		}
-		for (auto& it : characterPressed_) {
-			it.second = false;
-		}
 		for (auto& b : mouseDown_) {
 			b = false;
 		}
@@ -601,10 +598,6 @@ bool Window::getKeyDown(const std::string& key) {
 }
 
 bool Window::getKeyPressed(const std::string& key) {
-	if (characterPressed_[key]) {
-		characterPressed_[key] = false;
-		return true;
-	}
 	return characterPressed_[key];
 }
 

diff --git a/src/window.cpp b/src/window.cpp
@@ -189,6 +189,9 @@ void Window::setKeyPressed(const key::KeyType key, bool p) {
 
 void Window::setKeyPressed(const std::string& key, bool p) {
 	characterPressed_[key] = p;
+	if (p) {
+		needToBeSetFalse_.push(&characterPressed_[key]);
+	}
 }
 
 bool keyDown(const char key) {