mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-19 21:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

ebiten: Rename Draw*WithShader -> Draw*Shader

Browse Source 
Updates #1168
This commit is contained in:
Hajime Hoshi 2020-07-25 23:15:08 +09:00
parent eb056690aa
commit 2bdbcd724d
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/polygons/main.go
View File

@ -139,6 +139,8 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
func main() { func main() {
ebiten.SetWindowSize(screenWidth, screenHeight) ebiten.SetWindowSize(screenWidth, screenHeight)
ebiten.SetWindowTitle("Polygons (Ebiten Demo)") ebiten.SetWindowTitle("Polygons (Ebiten Demo)")
ebiten.SetScreenTransparent(true)
ebiten.SetWindowDecorated(false)
if err := ebiten.RunGame(&Game{ngon: 10}); err != nil { if err := ebiten.RunGame(&Game{ngon: 10}); err != nil {
log.Fatal(err) log.Fatal(err)
} }

4
examples/shader/main.go
View File

@ -107,14 +107,14 @@ func (g *Game) Draw(screen *ebiten.Image) {
w, h := screen.Size() w, h := screen.Size()
cx, cy := ebiten.CursorPosition() cx, cy := ebiten.CursorPosition()
op := &ebiten.DrawRectangleWithShaderOptions{} op := &ebiten.DrawRectShaderOptions{}
op.Uniforms = []interface{}{ op.Uniforms = []interface{}{
float32(g.time) / 60, // Time float32(g.time) / 60, // Time
[]float32{float32(cx), float32(cy)}, // Cursor []float32{float32(cx), float32(cy)}, // Cursor
} }
op.Images[0] = gopherImage op.Images[0] = gopherImage
op.Images[1] = normalImage op.Images[1] = normalImage
screen.DrawRectangleWithShader(w, h, s, op) screen.DrawRectShader(w, h, s, op)
msg := "Press Up/Down to switch the shader." msg := "Press Up/Down to switch the shader."
ebitenutil.DebugPrint(screen, msg) ebitenutil.DebugPrint(screen, msg)

52
image.go
View File

@ -399,10 +399,10 @@ func (i *Image) DrawTriangles(vertices []Vertex, indices []uint16, img *Image, o
i.buffered.DrawTriangles([graphics.ShaderImageNum]*buffered.Image{img.buffered}, vs, is, options.ColorM.impl, mode, filter, driver.Address(options.Address), sr, nil, nil) i.buffered.DrawTriangles([graphics.ShaderImageNum]*buffered.Image{img.buffered}, vs, is, options.ColorM.impl, mode, filter, driver.Address(options.Address), sr, nil, nil)
} }
// DrawRectangleOptionsWithShaderOptions represents options for DrawRectangleOptionsWithShader // DrawRectShaderOptions represents options for DrawRectShader
// //
// This API is experimental. // This API is experimental.
type DrawRectangleWithShaderOptions struct { type DrawRectShaderOptions struct {
// GeoM is a geometry matrix to draw. // GeoM is a geometry matrix to draw.
// The default (zero) value is identify, which draws the rectangle at (0, 0). // The default (zero) value is identify, which draws the rectangle at (0, 0).
GeoM GeoM GeoM GeoM
@ -420,20 +420,20 @@ type DrawRectangleWithShaderOptions struct {
} }
func init() { func init() {
var op DrawRectangleWithShaderOptions var op DrawRectShaderOptions
if got, want := len(op.Images), graphics.ShaderImageNum; got != want { if got, want := len(op.Images), graphics.ShaderImageNum; got != want {
panic(fmt.Sprintf("ebiten: len((DrawRectangleWithShaderOptions{}).Images) must be %d but %d", want, got)) panic(fmt.Sprintf("ebiten: len((DrawRectShaderOptions{}).Images) must be %d but %d", want, got))
} }
} }
// DrawRectangleWithShader draws a rectangle with the specified width and height with the specified shader. // DrawRectShader draws a rectangle with the specified width and height with the specified shader.
// //
// When one of the specified image is non-nil and is disposed, DrawRectangleWithShader panics. // When one of the specified image is non-nil and is disposed, DrawRectShader panics.
// //
// When the image i is disposed, DrawRectangleWithShader does nothing. // When the image i is disposed, DrawRectShader does nothing.
// //
// This API is experimental. // This API is experimental.
func (i *Image) DrawRectangleWithShader(width, height int, shader *Shader, options *DrawRectangleWithShaderOptions) { func (i *Image) DrawRectShader(width, height int, shader *Shader, options *DrawRectShaderOptions) {
i.copyCheck() i.copyCheck()
if i.isDisposed() { if i.isDisposed() {
@ -442,11 +442,11 @@ func (i *Image) DrawRectangleWithShader(width, height int, shader *Shader, optio
// TODO: Implement this. // TODO: Implement this.
if i.isSubImage() { if i.isSubImage() {
panic("ebiten: render to a sub-image is not implemented (DrawRectangleWithShader)") panic("ebiten: render to a sub-image is not implemented (DrawRectShader)")
} }
if options == nil { if options == nil {
options = &DrawRectangleWithShaderOptions{} options = &DrawRectShaderOptions{}
} }
mode := driver.CompositeMode(options.CompositeMode) mode := driver.CompositeMode(options.CompositeMode)
@ -457,11 +457,11 @@ func (i *Image) DrawRectangleWithShader(width, height int, shader *Shader, optio
continue continue
} }
if img.isDisposed() { if img.isDisposed() {
panic("ebiten: the given image to DrawRectangleWithShader must not be disposed") panic("ebiten: the given image to DrawRectShader must not be disposed")
} }
if img.isSubImage() { if img.isSubImage() {
// TODO: Implement this. // TODO: Implement this.
panic("ebiten: rendering a sub-image is not implemented (DrawRectangleWithShader)") panic("ebiten: rendering a sub-image is not implemented (DrawRectShader)")
} }
if w, h := img.Size(); width != w || height != h { if w, h := img.Size(); width != w || height != h {
panic("ebiten: all the source images must be the same size with the rectangle") panic("ebiten: all the source images must be the same size with the rectangle")
@ -476,10 +476,10 @@ func (i *Image) DrawRectangleWithShader(width, height int, shader *Shader, optio
i.buffered.DrawTriangles(imgs, vs, is, nil, mode, driver.FilterNearest, driver.AddressUnsafe, driver.Region{}, shader.shader, options.Uniforms) i.buffered.DrawTriangles(imgs, vs, is, nil, mode, driver.FilterNearest, driver.AddressUnsafe, driver.Region{}, shader.shader, options.Uniforms)
} }
// DrawTrianglesOptionsWithShaderOptions represents options for DrawTrianglesOptionsWithShader // DrawTrianglesShaderOptions represents options for DrawTrianglesShader
// //
// This API is experimental. // This API is experimental.
type DrawTrianglesWithShaderOptions struct { type DrawTrianglesShaderOptions struct {
// CompositeMode is a composite mode to draw. // CompositeMode is a composite mode to draw.
// The default (zero) value is regular alpha blending. // The default (zero) value is regular alpha blending.
CompositeMode CompositeMode CompositeMode CompositeMode
@ -493,24 +493,24 @@ type DrawTrianglesWithShaderOptions struct {
} }
func init() { func init() {
var op DrawTrianglesWithShaderOptions var op DrawTrianglesShaderOptions
if got, want := len(op.Images), graphics.ShaderImageNum; got != want { if got, want := len(op.Images), graphics.ShaderImageNum; got != want {
panic(fmt.Sprintf("ebiten: len((DrawTrianglesWithShaderOptions{}).Images) must be %d but %d", want, got)) panic(fmt.Sprintf("ebiten: len((DrawTrianglesShaderOptions{}).Images) must be %d but %d", want, got))
} }
} }
// DrawTrianglesWithShader draws triangles with the specified vertices and their indices with the specified shader. // DrawTrianglesShader draws triangles with the specified vertices and their indices with the specified shader.
// //
// If len(indices) is not multiple of 3, DrawTrianglesWithShader panics. // If len(indices) is not multiple of 3, DrawTrianglesShader panics.
// //
// If len(indices) is more than MaxIndicesNum, DrawTrianglesWithShader panics. // If len(indices) is more than MaxIndicesNum, DrawTrianglesShader panics.
// //
// When a specified image is non-nil and is disposed, DrawTrianglesWithShader panics. // When a specified image is non-nil and is disposed, DrawTrianglesShader panics.
// //
// When the image i is disposed, DrawTrianglesWithShader does nothing. // When the image i is disposed, DrawTrianglesShader does nothing.
// //
// This API is experimental. // This API is experimental.
func (i *Image) DrawTrianglesWithShader(vertices []Vertex, indices []uint16, shader *Shader, options *DrawTrianglesWithShaderOptions) { func (i *Image) DrawTrianglesShader(vertices []Vertex, indices []uint16, shader *Shader, options *DrawTrianglesShaderOptions) {
i.copyCheck() i.copyCheck()
if i.isDisposed() { if i.isDisposed() {
@ -518,7 +518,7 @@ func (i *Image) DrawTrianglesWithShader(vertices []Vertex, indices []uint16, sha
} }
if i.isSubImage() { if i.isSubImage() {
panic("ebiten: render to a sub-image is not implemented (DrawTrianglesWithShader)") panic("ebiten: render to a sub-image is not implemented (DrawTrianglesShader)")
} }
if len(indices)%3 != 0 { if len(indices)%3 != 0 {
@ -529,7 +529,7 @@ func (i *Image) DrawTrianglesWithShader(vertices []Vertex, indices []uint16, sha
} }
if options == nil { if options == nil {
options = &DrawTrianglesWithShaderOptions{} options = &DrawTrianglesShaderOptions{}
} }
mode := driver.CompositeMode(options.CompositeMode) mode := driver.CompositeMode(options.CompositeMode)
@ -541,11 +541,11 @@ func (i *Image) DrawTrianglesWithShader(vertices []Vertex, indices []uint16, sha
continue continue
} }
if img.isDisposed() { if img.isDisposed() {
panic("ebiten: the given image to DrawTrianglesWithShader must not be disposed") panic("ebiten: the given image to DrawTrianglesShader must not be disposed")
} }
if img.isSubImage() { if img.isSubImage() {
// TODO: Implement this. // TODO: Implement this.
panic("ebiten: rendering a sub-image is not implemented (DrawTrianglesWithShader)") panic("ebiten: rendering a sub-image is not implemented (DrawTrianglesShader)")
} }
if imgw == 0 || imgh == 0 { if imgw == 0 || imgh == 0 {
imgw, imgh = img.Size() imgw, imgh = img.Size()