mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/cbackend: rename to nintendosdk

Browse Source 
Updates #2242
This commit is contained in:
Hajime Hoshi 2022-08-12 17:19:28 +09:00
parent e7c0a121c4
commit 8081d0636a
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/context_nintendosdk.go
View File

@ -22,7 +22,7 @@ import (
"github.com/hajimehoshi/oto/v2/mux" "github.com/hajimehoshi/oto/v2/mux"
"github.com/hajimehoshi/ebiten/v2/internal/cbackend" "github.com/hajimehoshi/ebiten/v2/internal/nintendosdk"
) )
func newContext(sampleRate, channelCount, bitDepthInBytes int) (context, chan struct{}, error) { func newContext(sampleRate, channelCount, bitDepthInBytes int) (context, chan struct{}, error) {
@ -30,11 +30,10 @@ func newContext(sampleRate, channelCount, bitDepthInBytes int) (context, chan st
close(ready) close(ready)
c := &contextProxy{mux.New(sampleRate, channelCount, bitDepthInBytes)} c := &contextProxy{mux.New(sampleRate, channelCount, bitDepthInBytes)}
cbackend.OpenAudio(sampleRate, channelCount, c.mux.ReadFloat32s) nintendosdk.OpenAudio(sampleRate, channelCount, c.mux.ReadFloat32s)
return c, ready, nil return c, ready, nil
} }
// contextProxy is a proxy between cbackend.Context and context.
type contextProxy struct { type contextProxy struct {
mux *mux.Mux mux *mux.Mux
} }

8
internal/gamepad/gamepad_nintendosdk.go
View File

@ -20,12 +20,12 @@ package gamepad
import ( import (
"time" "time"
"github.com/hajimehoshi/ebiten/v2/internal/cbackend"
"github.com/hajimehoshi/ebiten/v2/internal/gamepaddb" "github.com/hajimehoshi/ebiten/v2/internal/gamepaddb"
"github.com/hajimehoshi/ebiten/v2/internal/nintendosdk"
) )
type nativeGamepadsImpl struct { type nativeGamepadsImpl struct {
gamepads []cbackend.Gamepad gamepads []nintendosdk.Gamepad
ids map[int]struct{} ids map[int]struct{}
} }
@ -39,7 +39,7 @@ func (*nativeGamepadsImpl) init(gamepads *gamepads) error {
func (g *nativeGamepadsImpl) update(gamepads *gamepads) error { func (g *nativeGamepadsImpl) update(gamepads *gamepads) error {
g.gamepads = g.gamepads[:0] g.gamepads = g.gamepads[:0]
g.gamepads = cbackend.AppendGamepads(g.gamepads) g.gamepads = nintendosdk.AppendGamepads(g.gamepads)
for id := range g.ids { for id := range g.ids {
delete(g.ids, id) delete(g.ids, id)
@ -147,5 +147,5 @@ func (*nativeGamepadImpl) hatState(hat int) int {
} }
func (g *nativeGamepadImpl) vibrate(duration time.Duration, strongMagnitude float64, weakMagnitude float64) { func (g *nativeGamepadImpl) vibrate(duration time.Duration, strongMagnitude float64, weakMagnitude float64) {
cbackend.VibrateGamepad(g.id, duration, strongMagnitude, weakMagnitude) nintendosdk.VibrateGamepad(g.id, duration, strongMagnitude, weakMagnitude)
} }

2
internal/cbackend/cbackend.go → internal/nintendosdk/nintendosdk.go
View File

@ -15,7 +15,7 @@
//go:build nintendosdk //go:build nintendosdk
// +build nintendosdk // +build nintendosdk
package cbackend package nintendosdk
// #cgo !darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all // #cgo !darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all
// #cgo darwin LDFLAGS: -Wl,-undefined,dynamic_lookup // #cgo darwin LDFLAGS: -Wl,-undefined,dynamic_lookup

8
internal/ui/input_nintendosdk.go
View File

@ -20,13 +20,13 @@ package ui
import ( import (
"sync" "sync"
"github.com/hajimehoshi/ebiten/v2/internal/cbackend"
"github.com/hajimehoshi/ebiten/v2/internal/gamepad" "github.com/hajimehoshi/ebiten/v2/internal/gamepad"
"github.com/hajimehoshi/ebiten/v2/internal/nintendosdk"
) )
type Input struct { type Input struct {
gamepads []cbackend.Gamepad gamepads []nintendosdk.Gamepad
touches []cbackend.Touch touches []nintendosdk.Touch
m sync.Mutex m sync.Mutex
} }
@ -38,7 +38,7 @@ func (i *Input) update(context *context) {
gamepad.Update() gamepad.Update()
i.touches = i.touches[:0] i.touches = i.touches[:0]
i.touches = cbackend.AppendTouches(i.touches) i.touches = nintendosdk.AppendTouches(i.touches)
for idx, t := range i.touches { for idx, t := range i.touches {
x, y := context.adjustPosition(float64(t.X), float64(t.Y), deviceScaleFactor) x, y := context.adjustPosition(float64(t.X), float64(t.Y), deviceScaleFactor)

10
internal/ui/ui_nintendosdk.go
View File

@ -20,9 +20,9 @@ package ui
import ( import (
"runtime" "runtime"
"github.com/hajimehoshi/ebiten/v2/internal/cbackend"
"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver" "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl"
"github.com/hajimehoshi/ebiten/v2/internal/nintendosdk"
) )
type graphicsDriverCreatorImpl struct{} type graphicsDriverCreatorImpl struct{}
@ -64,17 +64,17 @@ func (u *userInterfaceImpl) Run(game Game) error {
return err return err
} }
u.graphicsDriver = g u.graphicsDriver = g
cbackend.InitializeGame() nintendosdk.InitializeGame()
for { for {
cbackend.BeginFrame() nintendosdk.BeginFrame()
u.input.update(u.context) u.input.update(u.context)
w, h := cbackend.ScreenSize() w, h := nintendosdk.ScreenSize()
if err := u.context.updateFrame(u.graphicsDriver, float64(w), float64(h), deviceScaleFactor); err != nil { if err := u.context.updateFrame(u.graphicsDriver, float64(w), float64(h), deviceScaleFactor); err != nil {
return err return err
} }
cbackend.EndFrame() nintendosdk.EndFrame()
} }
} }