mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 19:22:49 +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

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

@ -91,12 +91,12 @@ func (game *Rects) Draw(g graphics.Context) {
g.Fill(0, 0, 0) g.Fill(0, 0, 0)
game.offscreenInited = true game.offscreenInited = true
} }
g.DrawTexture(g.TextureID(game.rectTextureID), g.DrawTexture(g.ToTexture(game.rectTextureID),
game.rectGeometryMatrix(), game.rectGeometryMatrix(),
game.rectColorMatrix()) game.rectColorMatrix())
g.ResetOffscreen() g.ResetOffscreen()
g.DrawTexture(g.TextureID(game.offscreenID), g.DrawTexture(g.ToTexture(game.offscreenID),
matrix.IdentityGeometry(), matrix.IdentityGeometry(),
matrix.IdentityColor()) matrix.IdentityColor())
} }

8
graphics/graphics.go
View File

@ -19,19 +19,19 @@ type TexturePart struct {
} }
type Context interface { type Context interface {
TextureID(renderTargetID RenderTargetID) TextureID ToTexture(renderTargetID RenderTargetID) TextureID
Clear() Clear()
Fill(r, g, b uint8) Fill(r, g, b uint8)
DrawTexture(textureID TextureID, DrawTexture(id TextureID,
geometryMatrix matrix.Geometry, geometryMatrix matrix.Geometry,
colorMatrix matrix.Color) colorMatrix matrix.Color)
DrawTextureParts(textureID TextureID, DrawTextureParts(id TextureID,
parts []TexturePart, parts []TexturePart,
geometryMatrix matrix.Geometry, geometryMatrix matrix.Geometry,
colorMatrix matrix.Color) colorMatrix matrix.Color)
ResetOffscreen() ResetOffscreen()
SetOffscreen(renderTargetID RenderTargetID) SetOffscreen(id RenderTargetID)
} }
type TextureFactory interface { 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)] 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) return graphics.TextureID(renderTargetID)
} }
@ -172,7 +172,7 @@ func (context *Context) setOffscreen(renderTarget *Texture) {
C.GLsizei(abs(renderTarget.textureHeight))) C.GLsizei(abs(renderTarget.textureHeight)))
} }
func (context *Context) resetOffscreen() { func (context *Context) setMainFramebufferOffscreen() {
context.setOffscreen(context.mainFramebufferTexture) context.setOffscreen(context.mainFramebufferTexture)
} }
@ -273,7 +273,7 @@ func (context *Context) NewRenderTarget(width, height int) graphics.RenderTarget
context.setOffscreen((*Texture)(renderTarget)) context.setOffscreen((*Texture)(renderTarget))
context.Clear() context.Clear()
context.resetOffscreen() context.setMainFramebufferOffscreen()
return graphics.RenderTargetID(renderTarget.id) 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_MIN_FILTER, C.GL_LINEAR)
C.glTexParameteri(C.GL_TEXTURE_2D, C.GL_TEXTURE_MAG_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.setMainFramebufferOffscreen()
context.resetOffscreen()
context.Clear() context.Clear()
scale := float64(context.screenScale) scale := float64(context.screenScale)