Updated dependencies, examples.

alaingalvan · alaingalvan · commit dd5f9d752ebe · 2021-07-04T20:04:56.000-04:00
Using new API for mouse events too, polishing examples.
diff --git a/external/crosswindow b/external/crosswindow
@@ -1 +1 @@
-Subproject commit d81be45b16a83008fdb418b2a71d97df26872332
+Subproject commit 5ebc055b8be080caef24f7a8e258f479f23f4c9b
diff --git a/external/crosswindow-graphics b/external/crosswindow-graphics
@@ -1 +1 @@
-Subproject commit 6382daa8b5b1df08291dd72e1a7ec10d4e8b5949
+Subproject commit 8e0c46197f56ab400a6a16059f51e1909f907246
diff --git a/external/glslang b/external/glslang
@@ -1 +1 @@
-Subproject commit 2c8265bb620300047bb9241e39c60c7afe3a81cb
+Subproject commit 18eef33bd7a4bf5ad8c69f99cb72022608cf6e73
diff --git a/external/opengl-registry b/external/opengl-registry
@@ -1 +1 @@
-Subproject commit e18e52a14e902a9ee29c5bf87478ac2ca21bb06b
+Subproject commit d15191e446614fcec3369577495dfb45b131a27a
diff --git a/external/spirv-cross b/external/spirv-cross
@@ -1 +1 @@
-Subproject commit dc565136fb5f4f1ccc45fb7df9eb02594b4c58a0
+Subproject commit 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
diff --git a/src/01-window-creation/CMakeLists.txt b/src/01-window-creation/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Project Info
 
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-cmake_policy(VERSION 3.6)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
+cmake_policy(VERSION 3.18)
 project(WindowCreation
         VERSION 1.0.0.0
         LANGUAGES C CXX
diff --git a/src/01-window-creation/src/XMain.cpp b/src/01-window-creation/src/XMain.cpp
@@ -32,9 +32,9 @@ void xmain(int argc, const char** argv)
         {
             const xwin::Event& event = eventQueue.front();
 
-            if (event.type == xwin::EventType::Mouse)
+            if (event.type == xwin::EventType::MouseMove)
             {
-                const xwin::MouseData mouse = event.data.mouse;
+                const xwin::MouseMoveData mouse = event.data.mouseMove;
             }
             if (event.type == xwin::EventType::Close)
             {
diff --git a/src/02-events/src/XMain.cpp b/src/02-events/src/XMain.cpp
@@ -42,9 +42,9 @@ void xmain(int argc, const char** argv)
             }
 
             // Mouse Movement
-            if (event.type == xwin::EventType::MouseMoved)
+            if (event.type == xwin::EventType::MouseMove)
             {
-                const xwin::MouseInputData data = event.data.mouseInput;
+                const xwin::MouseMoveData data = event.data.mouseMove;
             }
 
             // Resize
diff --git a/src/04-cross-platform-hello-triangle/CMakeLists.txt b/src/04-cross-platform-hello-triangle/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Project Info
 
-cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-cmake_policy(VERSION 3.6)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
+cmake_policy(VERSION 3.18)
 project(HelloTriangle
         VERSION 1.0.0.0
         LANGUAGES C CXX

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ void xmain(int argc, const char** argv)`
`32`	`32`	`{`
`33`	`33`	`const xwin::Event& event = eventQueue.front();`
`34`	`34`
`35`		`- if (event.type == xwin::EventType::Mouse)`
	`35`	`+ if (event.type == xwin::EventType::MouseMove)`
`36`	`36`	`{`
`37`		`- const xwin::MouseData mouse = event.data.mouse;`
	`37`	`+ const xwin::MouseMoveData mouse = event.data.mouseMove;`
`38`	`38`	`}`
`39`	`39`	`if (event.type == xwin::EventType::Close)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ void xmain(int argc, const char** argv)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Mouse Movement`
`45`		`- if (event.type == xwin::EventType::MouseMoved)`
	`45`	`+ if (event.type == xwin::EventType::MouseMove)`
`46`	`46`	`{`
`47`		`- const xwin::MouseInputData data = event.data.mouseInput;`
	`47`	`+ const xwin::MouseMoveData data = event.data.mouseMove;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// Resize`