From bba32bc06e14bfb0c68786fd572d4ee99bf46f92 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 1 Jan 2023 17:45:20 +0900 Subject: [PATCH] internal/ui: refactoring --- internal/nintendosdk/nintendosdk.go | 7 ------- internal/ui/input_nintendosdk.h | 3 +++ internal/ui/ui_nintendosdk.go | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/nintendosdk/nintendosdk.go b/internal/nintendosdk/nintendosdk.go index 59d5584ce..138e46315 100644 --- a/internal/nintendosdk/nintendosdk.go +++ b/internal/nintendosdk/nintendosdk.go @@ -23,7 +23,6 @@ package nintendosdk // // // UI // void EbitenInitializeGame(); -// void EbitenGetScreenSize(int* width, int* height); // void EbitenBeginFrame(); // void EbitenEndFrame(); import "C" @@ -32,12 +31,6 @@ func InitializeGame() { C.EbitenInitializeGame() } -func ScreenSize() (int, int) { - var width, height C.int - C.EbitenGetScreenSize(&width, &height) - return int(width), int(height) -} - func BeginFrame() { C.EbitenBeginFrame() } diff --git a/internal/ui/input_nintendosdk.h b/internal/ui/input_nintendosdk.h index 72c408e1f..58ab85e57 100644 --- a/internal/ui/input_nintendosdk.h +++ b/internal/ui/input_nintendosdk.h @@ -20,6 +20,9 @@ struct Touch { int y; }; +const int kScreenWidth = 1920; +const int kScreenHeight = 1080; + #ifdef __cplusplus extern "C" { #endif diff --git a/internal/ui/ui_nintendosdk.go b/internal/ui/ui_nintendosdk.go index a88a0cfed..05d610d3a 100644 --- a/internal/ui/ui_nintendosdk.go +++ b/internal/ui/ui_nintendosdk.go @@ -75,8 +75,7 @@ func (u *userInterfaceImpl) Run(game Game, options *RunOptions) error { gamepad.Update() u.updateInputState() - w, h := nintendosdk.ScreenSize() - if err := u.context.updateFrame(u.graphicsDriver, float64(w), float64(h), deviceScaleFactor, u); err != nil { + if err := u.context.updateFrame(u.graphicsDriver, float64(C.kScreenWidth), float64(C.kScreenHeight), deviceScaleFactor, u); err != nil { return err }