mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add methods to ui/cocoa/texture_factory.go

Browse Source
This commit is contained in:
Hajime Hoshi 2014-01-07 00:10:46 +09:00
parent 0829299fea
commit 1f1c5cba95
6 changed files with 100 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/main.go
View File

@ -59,6 +59,8 @@ func main() {
}
}()
//u.MainLoop()
for {
u.PollEvents()
select {

44
ui/cocoa/window.go → ui/cocoa/game_window.go
View File

@ -26,31 +26,31 @@ import (
)
type GameWindow struct {
ui *cocoaUI
screenWidth int
screenHeight int
screenScale int
closed bool
native *C.EbitenGameWindow
pressedKeys map[ui.Key]struct{}
context *opengl.Context
funcs chan func()
funcsDone chan struct{}
events chan interface{}
graphicsDevice *opengl.Device
screenWidth int
screenHeight int
screenScale int
closed bool
native *C.EbitenGameWindow
pressedKeys map[ui.Key]struct{}
context *opengl.Context
funcs chan func()
funcsDone chan struct{}
events chan interface{}
}
var windows = map[*C.EbitenGameWindow]*GameWindow{}
func runGameWindow(cocoaUI *cocoaUI, width, height, scale int, title string, sharedContext *C.NSOpenGLContext) *GameWindow {
func runGameWindow(graphicsDevice *opengl.Device, width, height, scale int, title string, sharedContext *C.NSOpenGLContext) *GameWindow {
w := &GameWindow{
ui: cocoaUI,
screenWidth: width,
screenHeight: height,
screenScale: scale,
closed: false,
pressedKeys: map[ui.Key]struct{}{},
funcs: make(chan func()),
funcsDone: make(chan struct{}),
graphicsDevice: graphicsDevice,
screenWidth: width,
screenHeight: height,
screenScale: scale,
closed: false,
pressedKeys: map[ui.Key]struct{}{},
funcs: make(chan func()),
funcsDone: make(chan struct{}),
}
cTitle := C.CString(title)
@ -70,7 +70,7 @@ func runGameWindow(cocoaUI *cocoaUI, width, height, scale int, title string, sha
}()
<-ch
w.useGLContext(func() {
w.context = w.ui.graphicsDevice.CreateContext(width, height, scale)
w.context = w.graphicsDevice.CreateContext(width, height, scale)
})
return w
}
@ -93,7 +93,7 @@ func (w *GameWindow) Draw(f func(graphics.Context)) {
return
}
w.useGLContext(func() {
w.ui.graphicsDevice.Update(w.context, f)
w.graphicsDevice.Update(w.context, f)
})
}

9
ui/cocoa/mainloop.c
View File

@ -25,6 +25,15 @@ void initMenu(void) {
keyEquivalent:@"q"];
}
void Run(void) {
NSAutoreleasePool * pool = [NSAutoreleasePool new];
NSApplication* app = [NSApplication sharedApplication];
[app setActivationPolicy:NSApplicationActivationPolicyRegular];
//initMenu();
[app run];
[pool drain];
}
void StartApplication(void) {
NSApplication* app = [NSApplication sharedApplication];
[app setActivationPolicy:NSApplicationActivationPolicyRegular];

64
ui/cocoa/texture_factory.go
View File

@ -8,13 +8,18 @@ package cocoa
//
import "C"
import (
"github.com/hajimehoshi/go-ebiten/graphics"
"github.com/hajimehoshi/go-ebiten/graphics/opengl"
"image"
"runtime"
)
type textureFactory struct {
sharedContext *C.NSOpenGLContext
funcs chan func()
funcsDone chan struct{}
sharedContext *C.NSOpenGLContext
graphicsDevice *opengl.Device
events chan interface{}
funcs chan func()
funcsDone chan struct{}
}
func runTextureFactory() *textureFactory {
@ -30,6 +35,9 @@ func runTextureFactory() *textureFactory {
t.loop()
}()
<-ch
t.useGLContext(func() {
t.graphicsDevice = opengl.NewDevice()
})
return t
}
@ -50,6 +58,52 @@ func (t *textureFactory) useGLContext(f func()) {
<-t.funcsDone
}
func (t *textureFactory) createGameWindow(ui *cocoaUI, width, height, scale int, title string) *GameWindow {
return runGameWindow(ui, width, height, scale, title, t.sharedContext)
func (t *textureFactory) createGameWindow(width, height, scale int, title string) *GameWindow {
return runGameWindow(t.graphicsDevice, width, height, scale, title, t.sharedContext)
}
func (t *textureFactory) Events() <-chan interface{} {
if t.events != nil {
return t.events
}
t.events = make(chan interface{})
return t.events
}
func (t *textureFactory) CreateTexture(tag interface{}, img image.Image, filter graphics.Filter) {
go func() {
var id graphics.TextureId
var err error
t.useGLContext(func() {
id, err = t.graphicsDevice.CreateTexture(img, filter)
})
if t.events == nil {
return
}
e := graphics.TextureCreatedEvent{
Tag: tag,
Id: id,
Error: err,
}
t.events <- e
}()
}
func (t *textureFactory) CreateRenderTarget(tag interface{}, width, height int) {
go func() {
var id graphics.RenderTargetId
var err error
t.useGLContext(func() {
id, err = t.graphicsDevice.CreateRenderTarget(width, height)
})
if t.events == nil {
return
}
e := graphics.RenderTargetCreatedEvent{
Tag: tag,
Id: id,
Error: err,
}
t.events <- e
}()
}

61
ui/cocoa/ui.go
View File

@ -3,21 +3,18 @@ package cocoa
// #cgo CFLAGS: -x objective-c
// #cgo LDFLAGS: -framework Cocoa -framework OpenGL
//
// void Run(void);
// void StartApplication(void);
// void PollEvents(void);
//
import "C"
import (
"github.com/hajimehoshi/go-ebiten/graphics"
"github.com/hajimehoshi/go-ebiten/graphics/opengl"
"github.com/hajimehoshi/go-ebiten/ui"
"image"
)
type cocoaUI struct {
textureFactory *textureFactory
textureFactoryEvents chan interface{}
graphicsDevice *opengl.Device
textureFactory *textureFactory
}
var currentUI *cocoaUI
@ -32,10 +29,6 @@ func getCurrentUI() *cocoaUI {
C.StartApplication()
currentUI.textureFactory = runTextureFactory()
currentUI.textureFactory.useGLContext(func() {
currentUI.graphicsDevice = opengl.NewDevice()
})
return currentUI
}
@ -44,59 +37,17 @@ func UI() ui.UI {
}
func TextureFactory() graphics.TextureFactory {
return getCurrentUI()
return getCurrentUI().textureFactory
}
func (u *cocoaUI) CreateGameWindow(width, height, scale int, title string) ui.GameWindow {
return u.textureFactory.createGameWindow(u, width, height, scale, title)
return u.textureFactory.createGameWindow(width, height, scale, title)
}
func (u *cocoaUI) PollEvents() {
C.PollEvents()
}
func (u *cocoaUI) Events() <-chan interface{} {
if u.textureFactoryEvents != nil {
return u.textureFactoryEvents
}
u.textureFactoryEvents = make(chan interface{})
return u.textureFactoryEvents
}
func (u *cocoaUI) CreateTexture(tag interface{}, img image.Image, filter graphics.Filter) {
go func() {
var id graphics.TextureId
var err error
u.textureFactory.useGLContext(func() {
id, err = u.graphicsDevice.CreateTexture(img, filter)
})
if u.textureFactoryEvents == nil {
return
}
e := graphics.TextureCreatedEvent{
Tag: tag,
Id: id,
Error: err,
}
u.textureFactoryEvents <- e
}()
}
func (u *cocoaUI) CreateRenderTarget(tag interface{}, width, height int) {
go func() {
var id graphics.RenderTargetId
var err error
u.textureFactory.useGLContext(func() {
id, err = u.graphicsDevice.CreateRenderTarget(width, height)
})
if u.textureFactoryEvents == nil {
return
}
e := graphics.RenderTargetCreatedEvent{
Tag: tag,
Id: id,
Error: err,
}
u.textureFactoryEvents <- e
}()
func (u *cocoaUI) MainLoop() {
C.Run()
}

3
ui/ui.go
View File

@ -35,6 +35,7 @@ type WindowClosedEvent struct {
type UI interface {
PollEvents()
CreateGameWindow(screenWidth, screenHeight, screenScale int, title string) GameWindow
MainLoop()
}
type Window interface {
@ -43,5 +44,5 @@ type Window interface {
type GameWindow interface {
Draw(func(graphics.Context))
Events() <-chan interface{}
Window
}