mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: Line's vertices should be moved by 0.5

Browse Source
This commit is contained in:
Hajime Hoshi 2015-01-17 16:09:09 +09:00
parent 683ffafe8d
commit 1659e9abab
7 changed files with 76 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/shapes/main.go
View File

@ -26,11 +26,13 @@ const (
)
func update(screen *ebiten.Image) error {
screen.DrawRect(0, 0, 100, 100, color.NRGBA{0x80, 0x80, 0xff, 0x80})
for i := 0; i < 6; i++ {
screen.DrawRect(float64(2*i), float64(2*i), 100, 100, color.NRGBA{0x80, 0x80, 0xff, 0x80})
}
screen.FillRect(10, 10, 100, 100, color.NRGBA{0x80, 0x80, 0xff, 0x80})
screen.FillRect(20, 20, 100, 100, color.NRGBA{0x80, 0x80, 0xff, 0x80})
screen.DrawLine(130, 10, 140, 150, color.NRGBA{0xff, 0x80, 0x80, 0x80})
screen.DrawLine(140, 10, 150, 150, color.NRGBA{0xff, 0x80, 0x80, 0x80})
screen.DrawLine(130, 0, 140, 100, color.NRGBA{0xff, 0x80, 0x80, 0x80})
screen.DrawLine(140, 0, 150, 100, color.NRGBA{0xff, 0x80, 0x80, 0x80})
return nil
}

6
image.go
View File

@ -96,7 +96,7 @@ func (i *Image) DrawImage(image *Image, options *DrawImageOptions) (err error) {
}
// DrawLine draws a line.
func (i *Image) DrawLine(x0, y0, x1, y1 int, clr color.Color) error {
func (i *Image) DrawLine(x0, y0, x1, y1 float64, clr color.Color) error {
return i.DrawLines(&line{x0, y0, x1, y1, clr})
}
@ -108,7 +108,7 @@ func (i *Image) DrawLines(lines Lines) (err error) {
return
}
func (i *Image) DrawRect(x, y, width, height int, clr color.Color) error {
func (i *Image) DrawRect(x, y, width, height float64, clr color.Color) error {
return i.DrawLines(&rectsAsLines{&rect{x, y, width, height, clr}})
}
@ -117,7 +117,7 @@ func (i *Image) DrawRects(rects Rects) error {
}
// FillRect draws a filled rectangle.
func (i *Image) FillRect(x, y, width, height int, clr color.Color) error {
func (i *Image) FillRect(x, y, width, height float64, clr color.Color) error {
return i.FillRects(&rect{x, y, width, height, clr})
}

4
internal/graphics/framebuffer.go
View File

@ -116,7 +116,7 @@ func (f *Framebuffer) DrawTexture(c *opengl.Context, t *Texture, quads TextureQu
type Lines interface {
Len() int
Points(i int) (x0, y0, x1, y1 int)
Points(i int) (x0, y0, x1, y1 float64)
Color(i int) color.Color
}
@ -130,7 +130,7 @@ func (f *Framebuffer) DrawLines(c *opengl.Context, lines Lines) error {
type Rects interface {
Len() int
Rect(i int) (x, y, width, height int)
Rect(i int) (x, y, width, height float64)
Color(i int) color.Color
}

10
internal/graphics/internal/shader/draw.go
View File

@ -62,7 +62,7 @@ func DrawTexture(c *opengl.Context, texture opengl.Texture, projectionMatrix *[4
return errors.New(fmt.Sprintf("len(quads) must be equal to or less than %d", quadsMaxNum))
}
f := useProgramTexture(c, glMatrix(projectionMatrix), texture, geo, color)
f := useProgramForTexture(c, glMatrix(projectionMatrix), texture, geo, color)
defer f.FinishProgram()
vertices := vertices[0:0]
@ -91,7 +91,7 @@ func DrawTexture(c *opengl.Context, texture opengl.Texture, projectionMatrix *[4
type Lines interface {
Len() int
Points(i int) (x0, y0, x1, y1 int)
Points(i int) (x0, y0, x1, y1 float64)
Color(i int) color.Color
}
@ -107,7 +107,7 @@ func DrawLines(c *opengl.Context, projectionMatrix *[4][4]float64, lines Lines)
return nil
}
f := useProgramLines(c, glMatrix(projectionMatrix))
f := useProgramForLines(c, glMatrix(projectionMatrix))
defer f.FinishProgram()
vertices := vertices[0:0]
@ -135,7 +135,7 @@ func DrawLines(c *opengl.Context, projectionMatrix *[4][4]float64, lines Lines)
type Rects interface {
Len() int
Rect(i int) (x, y, width, height int)
Rect(i int) (x, y, width, height float64)
Color(i int) color.Color
}
@ -151,7 +151,7 @@ func FillRects(c *opengl.Context, projectionMatrix *[4][4]float64, rects Rects)
return nil
}
f := useProgramRects(c, glMatrix(projectionMatrix))
f := useProgramForRects(c, glMatrix(projectionMatrix))
defer f.FinishProgram()
vertices := vertices[0:0]

51
internal/graphics/internal/shader/program.go
View File

@ -26,7 +26,8 @@ var (
var (
programTexture opengl.Program
programSolid opengl.Program
programSolidRect opengl.Program
programSolidLine opengl.Program
)
const indicesNum = math.MaxUint16 + 1
@ -34,13 +35,14 @@ const quadsMaxNum = indicesNum / 6
// unsafe.SizeOf can't be used because unsafe doesn't work with GopherJS.
const int16Size = 2
const float32Size = 4
func initialize(c *opengl.Context) error {
shaderVertexNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertex))
shaderVertexModelviewNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertexModelview))
if err != nil {
return err
}
defer c.DeleteShader(shaderVertexNative)
defer c.DeleteShader(shaderVertexModelviewNative)
shaderVertexColorNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertexColor))
if err != nil {
@ -48,6 +50,12 @@ func initialize(c *opengl.Context) error {
}
defer c.DeleteShader(shaderVertexColorNative)
shaderVertexColorLineNative, err := c.NewShader(c.VertexShader, shader(c, shaderVertexColorLine))
if err != nil {
return err
}
defer c.DeleteShader(shaderVertexColorLineNative)
shaderFragmentTextureNative, err := c.NewShader(c.FragmentShader, shader(c, shaderFragmentTexture))
if err != nil {
return err
@ -61,14 +69,14 @@ func initialize(c *opengl.Context) error {
defer c.DeleteShader(shaderFragmentSolidNative)
programTexture, err = c.NewProgram([]opengl.Shader{
shaderVertexNative,
shaderVertexModelviewNative,
shaderFragmentTextureNative,
})
if err != nil {
return err
}
programSolid, err = c.NewProgram([]opengl.Shader{
programSolidRect, err = c.NewProgram([]opengl.Shader{
shaderVertexColorNative,
shaderFragmentSolidNative,
})
@ -76,7 +84,16 @@ func initialize(c *opengl.Context) error {
return err
}
const stride = int16Size * 8 // 8 = (2 for vertex) + (2 for texture) + (4 for color)
programSolidLine, err = c.NewProgram([]opengl.Shader{
shaderVertexColorLineNative,
shaderFragmentSolidNative,
})
if err != nil {
return err
}
// 16 [bytse] is an arbitrary number which seems enough to draw anything. Fix this if necessary.
const stride = 16
c.NewBuffer(c.ArrayBuffer, 4*stride*quadsMaxNum, c.DynamicDraw)
indices := make([]uint16, 6*quadsMaxNum)
@ -107,7 +124,7 @@ func (p programFinisher) FinishProgram() {
p()
}
func useProgramTexture(c *opengl.Context, projectionMatrix []float32, texture opengl.Texture, geo Matrix, color Matrix) programFinisher {
func useProgramForTexture(c *opengl.Context, projectionMatrix []float32, texture opengl.Texture, geo Matrix, color Matrix) programFinisher {
if !lastProgram.Equals(programTexture) {
c.UseProgram(programTexture)
lastProgram = programTexture
@ -168,12 +185,12 @@ func useProgramTexture(c *opengl.Context, projectionMatrix []float32, texture op
}
}
func useProgramLines(c *opengl.Context, projectionMatrix []float32) programFinisher {
if !lastProgram.Equals(programSolid) {
c.UseProgram(programSolid)
lastProgram = programSolid
func useProgramForLines(c *opengl.Context, projectionMatrix []float32) programFinisher {
if !lastProgram.Equals(programSolidLine) {
c.UseProgram(programSolidLine)
lastProgram = programSolidLine
}
program := programSolid
program := programSolidLine
c.BindElementArrayBuffer(indexBufferLines)
@ -192,12 +209,12 @@ func useProgramLines(c *opengl.Context, projectionMatrix []float32) programFinis
}
}
func useProgramRects(c *opengl.Context, projectionMatrix []float32) programFinisher {
if !lastProgram.Equals(programSolid) {
c.UseProgram(programSolid)
lastProgram = programSolid
func useProgramForRects(c *opengl.Context, projectionMatrix []float32) programFinisher {
if !lastProgram.Equals(programSolidRect) {
c.UseProgram(programSolidRect)
lastProgram = programSolidRect
}
program := programSolid
program := programSolidRect
c.BindElementArrayBuffer(indexBufferQuads)

16
internal/graphics/internal/shader/shader.go
View File

@ -22,8 +22,9 @@ import (
type shaderId int
const (
shaderVertex shaderId = iota
shaderVertexModelview shaderId = iota
shaderVertexColor
shaderVertexColorLine
shaderFragmentTexture
shaderFragmentSolid
)
@ -38,7 +39,7 @@ func shader(c *opengl.Context, id shaderId) string {
}
var shaders = map[shaderId]string{
shaderVertex: `
shaderVertexModelview: `
uniform highp mat4 projection_matrix;
uniform highp mat4 modelview_matrix;
attribute highp vec2 vertex;
@ -60,6 +61,17 @@ void main(void) {
vertex_out_color = color;
gl_Position = projection_matrix * vec4(vertex, 0, 1);
}
`,
shaderVertexColorLine: `
uniform highp mat4 projection_matrix;
attribute highp vec2 vertex;
attribute lowp vec4 color;
varying lowp vec4 vertex_out_color;
void main(void) {
vertex_out_color = color;
gl_Position = projection_matrix * vec4(vertex + vec2(0.5, 0.5), 0, 1);
}
`,
shaderFragmentTexture: `
uniform lowp sampler2D texture;

24
shapes.go
View File

@ -21,13 +21,13 @@ import (
// A Lines represents the set of lines.
type Lines interface {
Len() int
Points(i int) (x0, y0, x1, y1 int) // TODO: Change to float64?
Points(i int) (x0, y0, x1, y1 float64)
Color(i int) color.Color
}
type line struct {
x0, y0 int
x1, y1 int
x0, y0 float64
x1, y1 float64
color color.Color
}
@ -35,7 +35,7 @@ func (l *line) Len() int {
return 1
}
func (l *line) Points(i int) (x0, y0, x1, y1 int) {
func (l *line) Points(i int) (x0, y0, x1, y1 float64) {
return l.x0, l.y0, l.x1, l.y1
}
@ -51,17 +51,17 @@ func (r *rectsAsLines) Len() int {
return r.Rects.Len() * 4
}
func (r *rectsAsLines) Points(i int) (x0, y0, x1, y1 int) {
func (r *rectsAsLines) Points(i int) (x0, y0, x1, y1 float64) {
x, y, w, h := r.Rects.Rect(i / 4)
switch i % 4 {
case 0:
return x, y, x + w, y
case 1:
return x, y, x + 1, y + h
return x, y + 1, x, y + h - 1
case 2:
return x, y + h, x + w, y + h
return x, y + h - 1, x + w, y + h - 1
case 3:
return x + w, y, x + w, y + h
return x + w - 1, y + 1, x + w - 1, y + h - 1
}
panic("not reach")
}
@ -73,13 +73,13 @@ func (r *rectsAsLines) Color(i int) color.Color {
// A Rects represents the set of rectangles.
type Rects interface {
Len() int
Rect(i int) (x, y, width, height int) // TODO: Change to float64?
Rect(i int) (x, y, width, height float64)
Color(i int) color.Color
}
type rect struct {
x, y int
width, height int
x, y float64
width, height float64
color color.Color
}
@ -87,7 +87,7 @@ func (r *rect) Len() int {
return 1
}
func (r *rect) Rect(i int) (x, y, width, height int) {
func (r *rect) Rect(i int) (x, y, width, height float64) {
return r.x, r.y, r.width, r.height
}