Merge All Branches

cmake/CPM.cmake

@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: MIT
+#
+# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
+
+set(CPM_DOWNLOAD_VERSION 0.38.7)
+set(CPM_HASH_SUM "83e5eb71b2bbb8b1f2ad38f1950287a057624e385c238f6087f94cdfc44af9c5")
+
+if(CPM_SOURCE_CACHE)
+    set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+    set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+else()
+    set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+endif()
+
+# Expand relative path. This is important if the provided path contains a tilde (~)
+get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
+
+file(DOWNLOAD
+        https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+        ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
+)
+
+include(${CPM_DOWNLOAD_LOCATION})

include/rewindow/types/window.h

@@ -155,7 +155,6 @@ public:
     void restoreMouseFromLastCenter(); // Feels nicer for users
 
 
-    static void setVsyncEnabled(bool b);
     void setFullscreen(bool fs);
     void setResizable(bool resizable);
     void setVsyncEnabled(bool);

main.cpp

@@ -10,7 +10,7 @@ void KeyDown(KeyDownEvent e)
 
 int main() {
     auto* window = new RWindow();
-    window->init(RenderingAPI::OPENGL, "name",100,100);
+    window->init(RenderingAPI::OPENGL, "name",100,100, true);
     window->setFlag(RWindowFlags::RESIZABLE, false);
 
     window->onKeyboardPress += KeyDown;

src/linux/event.cpp

@@ -1,10 +1 @@
 #include "../include/rewindow/types/event.h"
-bool RWindowEvent::empty() {
-    if (timePoint == EmptyRWindowEvent.timePoint || this->timePoint == EmptyKeyDownEvent.timePoint || this->timePoint == EmptyMouseButtonDownEvent.timePoint)
-        return true;
-    return false;
-}
-
-std::chrono::high_resolution_clock::time_point RWindowEvent::timeStamp() {
-    return timePoint;
-}

src/linux/window.cpp

@@ -162,7 +162,7 @@ void RWindow::pollEvents() {
         }
 
         if (xev.type == ButtonRelease) {
-            for (unsigned int i = 0; i < events.size(); i++) {
+            /*for (unsigned int i = 0; i < events.size(); i++) {
                 if (auto *e = dynamic_cast<MouseButtonDownEvent *>(events[i])) {
                     if ((int) e->button == (int) xev.xbutton.button) {
                         delete eventLog[i];