interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change TrianglesPicture to return (pic Vec, ok bool)

This commit is contained in:
faiface 2017-03-05 11:47:09 +01:00
parent 77c39d03c7
commit c1c1bae358
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data.go
View File

@ -11,9 +11,10 @@ import (
// TrianglesData specifies a list of Triangles vertices with three common properties: Position, // TrianglesData specifies a list of Triangles vertices with three common properties: Position,
// Color and Texture. // Color and Texture.
type TrianglesData []struct { type TrianglesData []struct {
Position Vec Position Vec
Color NRGBA Color NRGBA
Picture Vec Picture Vec
HasPicture bool
} }
// MakeTrianglesData creates TrianglesData of length len initialized with default property values. // MakeTrianglesData creates TrianglesData of length len initialized with default property values.
@ -40,10 +41,11 @@ func (td *TrianglesData) SetLen(len int) {
needAppend := len - td.Len() needAppend := len - td.Len()
for i := 0; i < needAppend; i++ { for i := 0; i < needAppend; i++ {
*td = append(*td, struct { *td = append(*td, struct {
Position Vec Position Vec
Color NRGBA Color NRGBA
Picture Vec Picture Vec
}{V(0, 0), NRGBA{1, 1, 1, 1}, V(-1, -1)}) HasPicture bool
}{V(0, 0), NRGBA{1, 1, 1, 1}, V(0, 0), false})
} }
} }
if len < td.Len() { if len < td.Len() {
@ -77,7 +79,7 @@ func (td *TrianglesData) updateData(t Triangles) {
} }
if t, ok := t.(TrianglesPicture); ok { if t, ok := t.(TrianglesPicture); ok {
for i := range *td { for i := range *td {
(*td)[i].Picture = t.Picture(i) (*td)[i].Picture, (*td)[i].HasPicture = t.Picture(i)
} }
} }
} }
@ -111,8 +113,8 @@ func (td *TrianglesData) Color(i int) NRGBA {
} }
// Picture returns the picture property of i-th vertex. // Picture returns the picture property of i-th vertex.
func (td *TrianglesData) Picture(i int) Vec { func (td *TrianglesData) Picture(i int) (pic Vec, ok bool) {
return (*td)[i].Picture return (*td)[i].Picture, (*td)[i].HasPicture
} }
// PictureData specifies an in-memory rectangular area of NRGBA pixels and implements Picture and // PictureData specifies an in-memory rectangular area of NRGBA pixels and implements Picture and

2
interface.go
View File

@ -97,7 +97,7 @@ type TrianglesColor interface {
// Note that this represents picture coordinates, not an actual picture. // Note that this represents picture coordinates, not an actual picture.
type TrianglesPicture interface { type TrianglesPicture interface {
Triangles Triangles
Picture(i int) Vec Picture(i int) (pic Vec, ok bool)
} }
// Picture represents a rectangular area of raster data, such as a color. It has Bounds which // Picture represents a rectangular area of raster data, such as a color. It has Bounds which