From dfba64a1fd265655ee492dd237fadd29697f3000 Mon Sep 17 00:00:00 2001 From: Thomas Friedel Date: Wed, 21 Mar 2018 15:51:07 +0100 Subject: [PATCH] fixed some bugs from the float32->float64 conversion --- canvas.go | 2 +- images.go | 4 ++-- text.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/canvas.go b/canvas.go index 87209cc..1ee1b6e 100644 --- a/canvas.go +++ b/canvas.go @@ -532,7 +532,7 @@ func (cv *Canvas) FillRect(x, y, w, h float64) { p3 := cv.tf(vec{x + w, y}) gli.BindBuffer(gl_ARRAY_BUFFER, buf) - data := [8]float64{p0[0], p0[1], p1[0], p1[1], p2[0], p2[1], p3[0], p3[1]} + data := [8]float32{float32(p0[0]), float32(p0[1]), float32(p1[0]), float32(p1[1]), float32(p2[0]), float32(p2[1]), float32(p3[0]), float32(p3[1])} gli.BufferData(gl_ARRAY_BUFFER, len(data)*4, unsafe.Pointer(&data[0]), gl_STREAM_DRAW) vertex := cv.useShader(&cv.state.fill) diff --git a/images.go b/images.go index 9d9f82d..cac7318 100644 --- a/images.go +++ b/images.go @@ -224,8 +224,8 @@ func (cv *Canvas) DrawImage(image interface{}, coords ...float64) { p3 := cv.tf(vec{dx + dw, dy}) gli.BindBuffer(gl_ARRAY_BUFFER, buf) - data := [16]float64{p0[0], p0[1], p1[0], p1[1], p2[0], p2[1], p3[0], p3[1], - sx, sy, sx, sy + sh, sx + sw, sy + sh, sx + sw, sy} + data := [16]float32{float32(p0[0]), float32(p0[1]), float32(p1[0]), float32(p1[1]), float32(p2[0]), float32(p2[1]), float32(p3[0]), float32(p3[1]), + float32(sx), float32(sy), float32(sx), float32(sy + sh), float32(sx + sw), float32(sy + sh), float32(sx + sw), float32(sy)} gli.BufferData(gl_ARRAY_BUFFER, len(data)*4, unsafe.Pointer(&data[0]), gl_STREAM_DRAW) gli.ActiveTexture(gl_TEXTURE0) diff --git a/text.go b/text.go index 01a3db6..edb8487 100644 --- a/text.go +++ b/text.go @@ -103,8 +103,8 @@ func (cv *Canvas) FillText(str string, x, y float64) { p3 := cv.tf(vec{float64(bounds.Max.X) + x, float64(bounds.Min.Y) + y}) tw := float64(bounds.Dx()) / alphaTexSize th := float64(bounds.Dy()) / alphaTexSize - data := [16]float64{p0[0], p0[1], p1[0], p1[1], p2[0], p2[1], p3[0], p3[1], - 0, 1, 0, 1 - th, tw, 1 - th, tw, 1} + data := [16]float32{float32(p0[0]), float32(p0[1]), float32(p1[0]), float32(p1[1]), float32(p2[0]), float32(p2[1]), float32(p3[0]), float32(p3[1]), + 0, 1, 0, float32(1 - th), float32(tw), float32(1 - th), float32(tw), 1} gli.BufferData(gl_ARRAY_BUFFER, len(data)*4, unsafe.Pointer(&data[0]), gl_STREAM_DRAW) gli.VertexAttribPointer(vertex, 2, gl_FLOAT, false, 0, nil)