Fix failing platforms

STREGA · STREGA · commit 939086c55d8f · 2023-05-20T22:16:27.000-04:00
diff --git a/Sources/GateEngine/System/Platforms/WASI/WASI/WASIWindow.swift b/Sources/GateEngine/System/Platforms/WASI/WASI/WASIWindow.swift
@@ -125,23 +125,23 @@ class WASIWindow: WindowBacking {
             let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)
             let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))
             Task {@MainActor in
-                self.window.delegate?.mouseChange(event: .entered, position: position)
+                self.window.delegate?.mouseChange(event: .entered, position: position, window: self.window)
             }
             event.preventDefault()
         }
         canvas.addEventListener(type: "mousemove") { event in
             let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)
             let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))
             Task {@MainActor in
-                self.window.delegate?.mouseChange(event: .moved, position: position)
+                self.window.delegate?.mouseChange(event: .moved, position: position, window: self.window)
             }
             event.preventDefault()
         }
         canvas.addEventListener(type: "mouseleave") { event in
             let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)
             let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))
             Task {@MainActor in
-                self.window.delegate?.mouseChange(event: .exited, position: position)
+                self.window.delegate?.mouseChange(event: .exited, position: position, window: self.window)
             }
             event.preventDefault()
         }
@@ -150,7 +150,7 @@ class WASIWindow: WindowBacking {
             let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))
             let button: MouseButton = self.mouseButton(fromEvent: event)
             Task {@MainActor in
-                self.window.delegate?.mouseClick(event: .buttonDown, button: button, count: nil, position: position)
+                self.window.delegate?.mouseClick(event: .buttonDown, button: button, count: nil, position: position, window: self.window)
             }
             event.preventDefault()
         }
@@ -159,7 +159,7 @@ class WASIWindow: WindowBacking {
             let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))
             let button: MouseButton = self.mouseButton(fromEvent: event)
             Task {@MainActor in
-                self.window.delegate?.mouseClick(event: .buttonUp, button: button, count: nil ,position: position)
+                self.window.delegate?.mouseClick(event: .buttonUp, button: button, count: nil ,position: position, window: self.window)
             }
             event.preventDefault()
         }
diff --git a/Sources/GateEngine/System/Platforms/Win32/Win32Platform.swift b/Sources/GateEngine/System/Platforms/Win32/Win32Platform.swift
@@ -106,7 +106,7 @@ extension Win32Platform {
 
         Game.shared.didFinishLaunching()
         
-        var window: Win32Window? = Game.shared.windowManager.mainWindow?.backing as? Win32Window
+        var window: Win32Window? = Game.shared.windowManager.mainWindow?.windowBacking as? Win32Window
         mainLoop: while true {
             if Game.shared.windowManager.windows.isEmpty {
                 window = nil
diff --git a/Sources/GateEngine/System/Platforms/Win32/Win32Window.swift b/Sources/GateEngine/System/Platforms/Win32/Win32Window.swift
@@ -279,7 +279,7 @@ fileprivate extension Win32Window {
                 event = .entered
             }
             mouseState.mouseMoved(lpParam)
-            windowDelegate.mouseChange(event: event, position: mouseState.position)        
+            windowDelegate.mouseChange(event: event, position: mouseState.position, window: self.window)
         }
     }
 
@@ -289,7 +289,7 @@ fileprivate extension Win32Window {
     func _msgMouseExited() {
         if let windowDelegate: WindowDelegate = window.delegate {
             mouseState.mouseExited()
-            windowDelegate.mouseChange(event: .exited, position: mouseState.position)        
+            windowDelegate.mouseChange(event: .exited, position: mouseState.position, window: self.window)
         }
     }
 
@@ -326,47 +326,47 @@ fileprivate extension Win32Window {
     @MainActor
     func _mouseDownLeft(_ lparam: LPARAM) {
         let position: Position2 = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonDown, button: .button1, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonDown, button: .button1, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
     @preconcurrency 
     @MainActor
     func _mouseUpLeft(_ lparam: LPARAM) {
         let position: Position2 = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonUp, button: .button1, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonUp, button: .button1, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
     @preconcurrency 
     @MainActor
     func _mouseDownRight(_ lparam: LPARAM) {
         let position = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonDown, button: .button2, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonDown, button: .button2, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
     @preconcurrency 
     @MainActor
     func _mouseUpRight(_ lparam: LPARAM) {
         let position: Position2 = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonUp, button: .button2, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonUp, button: .button2, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
     @preconcurrency 
     @MainActor
     func _mouseDownMiddle(_ lparam: LPARAM) {
         let position: Position2 = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonDown, button: .button3, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonDown, button: .button3, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
     @preconcurrency 
     @MainActor
     func _mouseUpMiddle(_ lparam: LPARAM) {
         let position: Position2 = positionFrom(lparam)
-        window.delegate?.mouseClick(event: .buttonUp, button: .button3, count: nil, position: position)
+        window.delegate?.mouseClick(event: .buttonUp, button: .button3, count: nil, position: position, window: self.window)
     }
 
     @inline(__always)
@@ -376,9 +376,9 @@ fileprivate extension Win32Window {
         let wparam: Int32 = Int32(wparam)
         let position: Position2 = positionFrom(lparam)
         if wparam & XBUTTON1 == XBUTTON1 {
-            window.delegate?.mouseClick(event: .buttonDown, button: .button4, count: nil, position: position)
+            window.delegate?.mouseClick(event: .buttonDown, button: .button4, count: nil, position: position, window: self.window)
         }else if wparam & XBUTTON2 == XBUTTON2 {
-            window.delegate?.mouseClick(event: .buttonDown, button: .button5, count: nil, position: position)
+            window.delegate?.mouseClick(event: .buttonDown, button: .button5, count: nil, position: position, window: self.window)
         }
     }
 
@@ -389,9 +389,9 @@ fileprivate extension Win32Window {
         let wparam: Int32 = Int32(wparam)
         let position: Position2 = positionFrom(lparam)
         if wparam & XBUTTON1 == XBUTTON1 {
-            window.delegate?.mouseClick(event: .buttonUp, button: .button4, count: nil, position: position)
+            window.delegate?.mouseClick(event: .buttonUp, button: .button4, count: nil, position: position, window: self.window)
         }else if wparam & XBUTTON2 == XBUTTON2 {
-            window.delegate?.mouseClick(event: .buttonUp, button: .button5, count: nil, position: position)
+            window.delegate?.mouseClick(event: .buttonUp, button: .button5, count: nil, position: position, window: self.window)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -125,23 +125,23 @@ class WASIWindow: WindowBacking {`
`125`	`125`	`let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)`
`126`	`126`	`let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))`
`127`	`127`	`Task {@MainActor in`
`128`		`- self.window.delegate?.mouseChange(event: .entered, position: position)`
	`128`	`+ self.window.delegate?.mouseChange(event: .entered, position: position, window: self.window)`
`129`	`129`	`}`
`130`	`130`	`event.preventDefault()`
`131`	`131`	`}`
`132`	`132`	`canvas.addEventListener(type: "mousemove") { event in`
`133`	`133`	`let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)`
`134`	`134`	`let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))`
`135`	`135`	`Task {@MainActor in`
`136`		`- self.window.delegate?.mouseChange(event: .moved, position: position)`
	`136`	`+ self.window.delegate?.mouseChange(event: .moved, position: position, window: self.window)`
`137`	`137`	`}`
`138`	`138`	`event.preventDefault()`
`139`	`139`	`}`
`140`	`140`	`canvas.addEventListener(type: "mouseleave") { event in`
`141`	`141`	`let event = DOM.MouseEvent(unsafelyWrapping: event.jsObject)`
`142`	`142`	`let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))`
`143`	`143`	`Task {@MainActor in`
`144`		`- self.window.delegate?.mouseChange(event: .exited, position: position)`
	`144`	`+ self.window.delegate?.mouseChange(event: .exited, position: position, window: self.window)`
`145`	`145`	`}`
`146`	`146`	`event.preventDefault()`
`147`	`147`	`}`
`@@ -150,7 +150,7 @@ class WASIWindow: WindowBacking {`
`150`	`150`	`let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))`
`151`	`151`	`let button: MouseButton = self.mouseButton(fromEvent: event)`
`152`	`152`	`Task {@MainActor in`
`153`		`- self.window.delegate?.mouseClick(event: .buttonDown, button: button, count: nil, position: position)`
	`153`	`+ self.window.delegate?.mouseClick(event: .buttonDown, button: button, count: nil, position: position, window: self.window)`
`154`	`154`	`}`
`155`	`155`	`event.preventDefault()`
`156`	`156`	`}`
`@@ -159,7 +159,7 @@ class WASIWindow: WindowBacking {`
`159`	`159`	`let position: Position2 = Position2(x: Float(event.pageX), y: Float(event.pageY))`
`160`	`160`	`let button: MouseButton = self.mouseButton(fromEvent: event)`
`161`	`161`	`Task {@MainActor in`
`162`		`- self.window.delegate?.mouseClick(event: .buttonUp, button: button, count: nil ,position: position)`
	`162`	`+ self.window.delegate?.mouseClick(event: .buttonUp, button: button, count: nil ,position: position, window: self.window)`
`163`	`163`	`}`
`164`	`164`	`event.preventDefault()`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ fileprivate extension Win32Window {`
`279`	`279`	`event = .entered`
`280`	`280`	`}`
`281`	`281`	`mouseState.mouseMoved(lpParam)`
`282`		`- windowDelegate.mouseChange(event: event, position: mouseState.position)`
	`282`	`+ windowDelegate.mouseChange(event: event, position: mouseState.position, window: self.window)`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`@@ -289,7 +289,7 @@ fileprivate extension Win32Window {`
`289`	`289`	`func _msgMouseExited() {`
`290`	`290`	`if let windowDelegate: WindowDelegate = window.delegate {`
`291`	`291`	`mouseState.mouseExited()`
`292`		`- windowDelegate.mouseChange(event: .exited, position: mouseState.position)`
	`292`	`+ windowDelegate.mouseChange(event: .exited, position: mouseState.position, window: self.window)`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`@@ -326,47 +326,47 @@ fileprivate extension Win32Window {`
`326`	`326`	`@MainActor`
`327`	`327`	`func _mouseDownLeft(_ lparam: LPARAM) {`
`328`	`328`	`let position: Position2 = positionFrom(lparam)`
`329`		`- window.delegate?.mouseClick(event: .buttonDown, button: .button1, count: nil, position: position)`
	`329`	`+ window.delegate?.mouseClick(event: .buttonDown, button: .button1, count: nil, position: position, window: self.window)`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`@inline(__always)`
`333`	`333`	`@preconcurrency`
`334`	`334`	`@MainActor`
`335`	`335`	`func _mouseUpLeft(_ lparam: LPARAM) {`
`336`	`336`	`let position: Position2 = positionFrom(lparam)`
`337`		`- window.delegate?.mouseClick(event: .buttonUp, button: .button1, count: nil, position: position)`
	`337`	`+ window.delegate?.mouseClick(event: .buttonUp, button: .button1, count: nil, position: position, window: self.window)`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`@inline(__always)`
`341`	`341`	`@preconcurrency`
`342`	`342`	`@MainActor`
`343`	`343`	`func _mouseDownRight(_ lparam: LPARAM) {`
`344`	`344`	`let position = positionFrom(lparam)`
`345`		`- window.delegate?.mouseClick(event: .buttonDown, button: .button2, count: nil, position: position)`
	`345`	`+ window.delegate?.mouseClick(event: .buttonDown, button: .button2, count: nil, position: position, window: self.window)`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`@inline(__always)`
`349`	`349`	`@preconcurrency`
`350`	`350`	`@MainActor`
`351`	`351`	`func _mouseUpRight(_ lparam: LPARAM) {`
`352`	`352`	`let position: Position2 = positionFrom(lparam)`
`353`		`- window.delegate?.mouseClick(event: .buttonUp, button: .button2, count: nil, position: position)`
	`353`	`+ window.delegate?.mouseClick(event: .buttonUp, button: .button2, count: nil, position: position, window: self.window)`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`@inline(__always)`
`357`	`357`	`@preconcurrency`
`358`	`358`	`@MainActor`
`359`	`359`	`func _mouseDownMiddle(_ lparam: LPARAM) {`
`360`	`360`	`let position: Position2 = positionFrom(lparam)`
`361`		`- window.delegate?.mouseClick(event: .buttonDown, button: .button3, count: nil, position: position)`
	`361`	`+ window.delegate?.mouseClick(event: .buttonDown, button: .button3, count: nil, position: position, window: self.window)`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`@inline(__always)`
`365`	`365`	`@preconcurrency`
`366`	`366`	`@MainActor`
`367`	`367`	`func _mouseUpMiddle(_ lparam: LPARAM) {`
`368`	`368`	`let position: Position2 = positionFrom(lparam)`
`369`		`- window.delegate?.mouseClick(event: .buttonUp, button: .button3, count: nil, position: position)`
	`369`	`+ window.delegate?.mouseClick(event: .buttonUp, button: .button3, count: nil, position: position, window: self.window)`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`@inline(__always)`
`@@ -376,9 +376,9 @@ fileprivate extension Win32Window {`
`376`	`376`	`let wparam: Int32 = Int32(wparam)`
`377`	`377`	`let position: Position2 = positionFrom(lparam)`
`378`	`378`	`if wparam & XBUTTON1 == XBUTTON1 {`
`379`		`- window.delegate?.mouseClick(event: .buttonDown, button: .button4, count: nil, position: position)`
	`379`	`+ window.delegate?.mouseClick(event: .buttonDown, button: .button4, count: nil, position: position, window: self.window)`
`380`	`380`	`}else if wparam & XBUTTON2 == XBUTTON2 {`
`381`		`- window.delegate?.mouseClick(event: .buttonDown, button: .button5, count: nil, position: position)`
	`381`	`+ window.delegate?.mouseClick(event: .buttonDown, button: .button5, count: nil, position: position, window: self.window)`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
`@@ -389,9 +389,9 @@ fileprivate extension Win32Window {`
`389`	`389`	`let wparam: Int32 = Int32(wparam)`
`390`	`390`	`let position: Position2 = positionFrom(lparam)`
`391`	`391`	`if wparam & XBUTTON1 == XBUTTON1 {`
`392`		`- window.delegate?.mouseClick(event: .buttonUp, button: .button4, count: nil, position: position)`
	`392`	`+ window.delegate?.mouseClick(event: .buttonUp, button: .button4, count: nil, position: position, window: self.window)`
`393`	`393`	`}else if wparam & XBUTTON2 == XBUTTON2 {`
`394`		`- window.delegate?.mouseClick(event: .buttonUp, button: .button5, count: nil, position: position)`
	`394`	`+ window.delegate?.mouseClick(event: .buttonUp, button: .button5, count: nil, position: position, window: self.window)`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`	`}`