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

Rename Context.TextureID -> ToTexture

Browse Source
This commit is contained in:
Hajime Hoshi 2013-10-18 00:45:12 +09:00
parent cb25b6a9e4
commit e2509e3439
8 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/game/input/input.go
View File

@ -11,7 +11,7 @@ import (
type Input struct {
textTextureID graphics.TextureID
inputState ebiten.InputState
inputState ebiten.InputState
}
func New() *Input {

10
example/game/monochrome/monochrome.go
View File

@ -10,15 +10,15 @@ import (
)
const (
ebitenTextureWidth = 57
ebitenTextureWidth = 57
ebitenTextureHeight = 26
)
type Monochrome struct {
ebitenTextureID graphics.TextureID
ch chan bool
colorMatrix matrix.Color
geometryMatrix matrix.Geometry
ebitenTextureID graphics.TextureID
ch chan bool
colorMatrix matrix.Color
geometryMatrix matrix.Geometry
}
func New() *Monochrome {

8
example/game/rects/rects.go
View File

@ -11,9 +11,9 @@ import (
)
type Rects struct {
rectTextureID graphics.RenderTargetID
rectTextureID graphics.RenderTargetID
rectTextureInited bool
offscreenID graphics.RenderTargetID
offscreenID graphics.RenderTargetID
offscreenInited bool
rectBounds *graphics.Rect
rectColor *color.RGBA
@ -91,12 +91,12 @@ func (game *Rects) Draw(g graphics.Context) {
g.Fill(0, 0, 0)
game.offscreenInited = true
}
g.DrawTexture(g.TextureID(game.rectTextureID),
g.DrawTexture(g.ToTexture(game.rectTextureID),
game.rectGeometryMatrix(),
game.rectColorMatrix())
g.ResetOffscreen()
g.DrawTexture(g.TextureID(game.offscreenID),
g.DrawTexture(g.ToTexture(game.offscreenID),
matrix.IdentityGeometry(),
matrix.IdentityColor())
}

8
example/game/rotating/rotating.go
View File

@ -11,14 +11,14 @@ import (
)
const (
ebitenTextureWidth = 57
ebitenTextureWidth = 57
ebitenTextureHeight = 26
)
type Rotating struct {
ebitenTextureID graphics.TextureID
x int
geometryMatrix matrix.Geometry
ebitenTextureID graphics.TextureID
x int
geometryMatrix matrix.Geometry
}
func New() *Rotating {

4
example/game/sprites/sprites.go
View File

@ -11,7 +11,7 @@ import (
)
const (
ebitenTextureWidth = 57
ebitenTextureWidth = 57
ebitenTextureHeight = 26
)
@ -65,7 +65,7 @@ func (sprite *Sprite) Update() {
type Sprites struct {
ebitenTextureID graphics.TextureID
sprites []*Sprite
sprites []*Sprite
}
func New() *Sprites {

8
graphics/graphics.go
View File

@ -19,19 +19,19 @@ type TexturePart struct {
}
type Context interface {
TextureID(renderTargetID RenderTargetID) TextureID
ToTexture(renderTargetID RenderTargetID) TextureID
Clear()
Fill(r, g, b uint8)
DrawTexture(textureID TextureID,
DrawTexture(id TextureID,
geometryMatrix matrix.Geometry,
colorMatrix matrix.Color)
DrawTextureParts(textureID TextureID,
DrawTextureParts(id TextureID,
parts []TexturePart,
geometryMatrix matrix.Geometry,
colorMatrix matrix.Color)
ResetOffscreen()
SetOffscreen(renderTargetID RenderTargetID)
SetOffscreen(id RenderTargetID)
}
type TextureFactory interface {

6
graphics/opengl/context.go
View File

@ -52,7 +52,7 @@ func (context *Context) Init() {
context.screen = context.textures[C.GLuint(screenID)]
}
func (context *Context) TextureID(renderTargetID graphics.RenderTargetID) graphics.TextureID {
func (context *Context) ToTexture(renderTargetID graphics.RenderTargetID) graphics.TextureID {
return graphics.TextureID(renderTargetID)
}
@ -172,7 +172,7 @@ func (context *Context) setOffscreen(renderTarget *Texture) {
C.GLsizei(abs(renderTarget.textureHeight)))
}
func (context *Context) resetOffscreen() {
func (context *Context) setMainFramebufferOffscreen() {
context.setOffscreen(context.mainFramebufferTexture)
}
@ -273,7 +273,7 @@ func (context *Context) NewRenderTarget(width, height int) graphics.RenderTarget
context.setOffscreen((*Texture)(renderTarget))
context.Clear()
context.resetOffscreen()
context.setMainFramebufferOffscreen()
return graphics.RenderTargetID(renderTarget.id)
}

3
graphics/opengl/device.go
View File

@ -43,8 +43,7 @@ func (device *Device) Update(draw func(graphics.Context)) {
C.glTexParameteri(C.GL_TEXTURE_2D, C.GL_TEXTURE_MIN_FILTER, C.GL_LINEAR)
C.glTexParameteri(C.GL_TEXTURE_2D, C.GL_TEXTURE_MAG_FILTER, C.GL_LINEAR)
// TODO: The name is not good.
context.resetOffscreen()
context.setMainFramebufferOffscreen()
context.Clear()
scale := float64(context.screenScale)