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

examples/shader: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2020-06-24 02:47:51 +09:00
parent 545342262f
commit ebb3bcfeb5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/shader/image.go
View File

@ -16,6 +16,8 @@
package main
var Time float
var Cursor vec2
var Image texture2d
func Vertex(position vec2, texCoord vec2, color vec4) (vec4, vec2) {
@ -27,7 +29,7 @@ func Vertex(position vec2, texCoord vec2, color vec4) (vec4, vec2) {
) * vec4(position, 0, 1), texCoord
}
func Fragment(position vec4, tex vec2) vec4 {
func Fragment(position vec4, texCoord vec2) vec4 {
// TODO: Instead of using texture2D directly, define and use special functions for Ebiten images.
return texture2D(Image, tex)
return texture2D(Image, texCoord)
}

2
examples/shader/image_go.go
View File

@ -3,4 +3,4 @@
package main
var image_go = []byte("// Copyright 2020 The Ebiten Authors\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n// +build ignore\n\npackage main\n\nvar Image texture2d\n\nfunc Vertex(position vec2, texCoord vec2, color vec4) (vec4, vec2) {\n\treturn mat4(\n\t\t2/viewportSize().x, 0, 0, 0,\n\t\t0, 2/viewportSize().y, 0, 0,\n\t\t0, 0, 1, 0,\n\t\t-1, -1, 0, 1,\n\t) * vec4(position, 0, 1), texCoord\n}\n\nfunc Fragment(position vec4, tex vec2) vec4 {\n\t// TODO: Instead of using texture2D directly, define and use special functions for Ebiten images.\n\treturn texture2D(Image, tex)\n}\n")
var image_go = []byte("// Copyright 2020 The Ebiten Authors\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n// +build ignore\n\npackage main\n\nvar Time float\nvar Cursor vec2\nvar Image texture2d\n\nfunc Vertex(position vec2, texCoord vec2, color vec4) (vec4, vec2) {\n\treturn mat4(\n\t\t2/viewportSize().x, 0, 0, 0,\n\t\t0, 2/viewportSize().y, 0, 0,\n\t\t0, 0, 1, 0,\n\t\t-1, -1, 0, 1,\n\t) * vec4(position, 0, 1), texCoord\n}\n\nfunc Fragment(position vec4, texCoord vec2) vec4 {\n\t// TODO: Instead of using texture2D directly, define and use special functions for Ebiten images.\n\treturn texture2D(Image, texCoord)\n}\n")

16
examples/shader/main.go
View File

@ -125,16 +125,14 @@ func (g *Game) Draw(screen *ebiten.Image) {
cx, cy := ebiten.CursorPosition()
op := &ebiten.DrawTrianglesWithShaderOptions{}
switch g.idx {
case 0:
op.Uniforms = []interface{}{
float32(g.time) / 60, // Time
[]float32{float32(cx), float32(cy)}, // Cursor
}
default:
op.Uniforms = []interface{}{
op.Uniforms = []interface{}{
float32(g.time) / 60, // Time
[]float32{float32(cx), float32(cy)}, // Cursor
}
if g.idx != 0 {
op.Uniforms = append(op.Uniforms,
gophersImage, // Image
}
)
}
screen.DrawTrianglesWithShader(vs, is, s, op)