mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-11-10 04:57:26 +01:00
graphics: Optimize vertices function for browsers
This commit is contained in:
Hajime Hoshi
parent
5a1eb24138
commit
6cdcdd6d51
@ -17,8 +17,6 @@ package ebiten
|
||||
import (
|
||||
"image"
|
||||
"math"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/internal/graphics"
|
||||
)
|
||||
|
||||
// An ImagePart is deprecated (as of 1.1.0-alpha): Use ImageParts instead.
|
||||
@ -75,63 +73,3 @@ func u(x, width2p int) int16 {
|
||||
func v(y, height2p int) int16 {
|
||||
return int16(math.MaxInt16 * y / height2p)
|
||||
}
|
||||
|
||||
func vertices(parts ImageParts, width, height int, geo *GeoM) []int16 {
|
||||
// TODO: This function should be in graphics package?
|
||||
totalSize := graphics.QuadVertexSizeInBytes() / 2
|
||||
oneSize := totalSize / 4
|
||||
l := parts.Len()
|
||||
vs := make([]int16, l*totalSize)
|
||||
width2p := graphics.NextPowerOf2Int(width)
|
||||
height2p := graphics.NextPowerOf2Int(height)
|
||||
n := 0
|
||||
geo16 := floatsToInt16s(geo.Element(0, 0),
|
||||
geo.Element(0, 1),
|
||||
geo.Element(1, 0),
|
||||
geo.Element(1, 1),
|
||||
geo.Element(0, 2),
|
||||
geo.Element(1, 2))
|
||||
for i := 0; i < l; i++ {
|
||||
dx0, dy0, dx1, dy1 := parts.Dst(i)
|
||||
if dx0 == dx1 || dy0 == dy1 {
|
||||
continue
|
||||
}
|
||||
x0, y0, x1, y1 := int16(dx0), int16(dy0), int16(dx1), int16(dy1)
|
||||
sx0, sy0, sx1, sy1 := parts.Src(i)
|
||||
if sx0 == sx1 || sy0 == sy1 {
|
||||
continue
|
||||
}
|
||||
u0, v0, u1, v1 := u(sx0, width2p), v(sy0, height2p), u(sx1, width2p), v(sy1, height2p)
|
||||
offset := n * totalSize
|
||||
vs[offset] = x0
|
||||
vs[offset+1] = y0
|
||||
vs[offset+2] = u0
|
||||
vs[offset+3] = v0
|
||||
for j, g := range geo16 {
|
||||
vs[offset+4+j] = g
|
||||
}
|
||||
vs[offset+oneSize] = x1
|
||||
vs[offset+oneSize+1] = y0
|
||||
vs[offset+oneSize+2] = u1
|
||||
vs[offset+oneSize+3] = v0
|
||||
for j, g := range geo16 {
|
||||
vs[offset+oneSize+4+j] = g
|
||||
}
|
||||
vs[offset+2*oneSize] = x0
|
||||
vs[offset+2*oneSize+1] = y1
|
||||
vs[offset+2*oneSize+2] = u0
|
||||
vs[offset+2*oneSize+3] = v1
|
||||
for j, g := range geo16 {
|
||||
vs[offset+2*oneSize+4+j] = g
|
||||
}
|
||||
vs[offset+3*oneSize] = x1
|
||||
vs[offset+3*oneSize+1] = y1
|
||||
vs[offset+3*oneSize+2] = u1
|
||||
vs[offset+3*oneSize+3] = v1
|
||||
for j, g := range geo16 {
|
||||
vs[offset+3*oneSize+4+j] = g
|
||||
}
|
||||
n++
|
||||
}
|
||||
return vs[:n*totalSize]
|
||||
}
|
||||
|
||||
37
math.go
37
math.go
@ -1,37 +0,0 @@
|
||||
// Copyright 2016 The Ebiten Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build !js
|
||||
|
||||
package ebiten
|
||||
|
||||
import (
|
||||
"unsafe"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/internal/endian"
|
||||
)
|
||||
|
||||
func floatsToInt16s(xs ...float64) []int16 {
|
||||
r := make([]int16, 0, len(xs)*2)
|
||||
for _, x := range xs {
|
||||
x32 := float32(x)
|
||||
n := *(*uint32)(unsafe.Pointer(&x32))
|
||||
if endian.IsLittle() {
|
||||
r = append(r, int16(n), int16(n>>16))
|
||||
} else {
|
||||
r = append(r, int16(n>>16), int16(n))
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
31
math_js.go
31
math_js.go
@ -1,31 +0,0 @@
|
||||
// Copyright 2016 The Ebiten Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build js
|
||||
|
||||
package ebiten
|
||||
|
||||
import (
|
||||
"github.com/gopherjs/gopherjs/js"
|
||||
)
|
||||
|
||||
func floatsToInt16s(xs ...float64) []int16 {
|
||||
a := js.Global.Get("ArrayBuffer").New(4 * len(xs))
|
||||
af32 := js.Global.Get("Float32Array").New(a)
|
||||
a16 := js.Global.Get("Int16Array").New(a)
|
||||
for i, x := range xs {
|
||||
af32.SetIndex(i, x)
|
||||
}
|
||||
return a16.Interface().([]int16)
|
||||
}
|
||||
98
vertices.go
Normal file
98
vertices.go
Normal file
@ -0,0 +1,98 @@
|
||||
// Copyright 2016 The Ebiten Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build !js
|
||||
|
||||
package ebiten
|
||||
|
||||
import (
|
||||
"unsafe"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/internal/endian"
|
||||
"github.com/hajimehoshi/ebiten/internal/graphics"
|
||||
)
|
||||
|
||||
func floatsToInt16s(xs ...float64) []int16 {
|
||||
r := make([]int16, 0, len(xs)*2)
|
||||
for _, x := range xs {
|
||||
x32 := float32(x)
|
||||
n := *(*uint32)(unsafe.Pointer(&x32))
|
||||
if endian.IsLittle() {
|
||||
r = append(r, int16(n), int16(n>>16))
|
||||
} else {
|
||||
r = append(r, int16(n>>16), int16(n))
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func vertices(parts ImageParts, width, height int, geo *GeoM) []int16 {
|
||||
// TODO: This function should be in graphics package?
|
||||
totalSize := graphics.QuadVertexSizeInBytes() / 2
|
||||
oneSize := totalSize / 4
|
||||
l := parts.Len()
|
||||
vs := make([]int16, l*totalSize)
|
||||
width2p := graphics.NextPowerOf2Int(width)
|
||||
height2p := graphics.NextPowerOf2Int(height)
|
||||
n := 0
|
||||
geo16 := floatsToInt16s(geo.Element(0, 0),
|
||||
geo.Element(0, 1),
|
||||
geo.Element(1, 0),
|
||||
geo.Element(1, 1),
|
||||
geo.Element(0, 2),
|
||||
geo.Element(1, 2))
|
||||
for i := 0; i < l; i++ {
|
||||
dx0, dy0, dx1, dy1 := parts.Dst(i)
|
||||
if dx0 == dx1 || dy0 == dy1 {
|
||||
continue
|
||||
}
|
||||
x0, y0, x1, y1 := int16(dx0), int16(dy0), int16(dx1), int16(dy1)
|
||||
sx0, sy0, sx1, sy1 := parts.Src(i)
|
||||
if sx0 == sx1 || sy0 == sy1 {
|
||||
continue
|
||||
}
|
||||
u0, v0, u1, v1 := u(sx0, width2p), v(sy0, height2p), u(sx1, width2p), v(sy1, height2p)
|
||||
offset := n * totalSize
|
||||
vs[offset] = x0
|
||||
vs[offset+1] = y0
|
||||
vs[offset+2] = u0
|
||||
vs[offset+3] = v0
|
||||
for j, g := range geo16 {
|
||||
vs[offset+4+j] = g
|
||||
}
|
||||
vs[offset+oneSize] = x1
|
||||
vs[offset+oneSize+1] = y0
|
||||
vs[offset+oneSize+2] = u1
|
||||
vs[offset+oneSize+3] = v0
|
||||
for j, g := range geo16 {
|
||||
vs[offset+oneSize+4+j] = g
|
||||
}
|
||||
vs[offset+2*oneSize] = x0
|
||||
vs[offset+2*oneSize+1] = y1
|
||||
vs[offset+2*oneSize+2] = u0
|
||||
vs[offset+2*oneSize+3] = v1
|
||||
for j, g := range geo16 {
|
||||
vs[offset+2*oneSize+4+j] = g
|
||||
}
|
||||
vs[offset+3*oneSize] = x1
|
||||
vs[offset+3*oneSize+1] = y1
|
||||
vs[offset+3*oneSize+2] = u1
|
||||
vs[offset+3*oneSize+3] = v1
|
||||
for j, g := range geo16 {
|
||||
vs[offset+3*oneSize+4+j] = g
|
||||
}
|
||||
n++
|
||||
}
|
||||
return vs[:n*totalSize]
|
||||
}
|
||||
85
vertices_js.go
Normal file
85
vertices_js.go
Normal file
@ -0,0 +1,85 @@
|
||||
// Copyright 2016 The Ebiten Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build js
|
||||
|
||||
package ebiten
|
||||
|
||||
import (
|
||||
"github.com/gopherjs/gopherjs/js"
|
||||
"github.com/hajimehoshi/ebiten/internal/graphics"
|
||||
)
|
||||
|
||||
func vertices(parts ImageParts, width, height int, geo *GeoM) []int16 {
|
||||
// TODO: This function should be in graphics package?
|
||||
totalSize := graphics.QuadVertexSizeInBytes() / 2
|
||||
oneSize := totalSize / 4
|
||||
l := parts.Len()
|
||||
a := js.Global.Get("ArrayBuffer").New(l * totalSize * 2)
|
||||
af32 := js.Global.Get("Float32Array").New(a)
|
||||
a16 := js.Global.Get("Int16Array").New(a)
|
||||
width2p := graphics.NextPowerOf2Int(width)
|
||||
height2p := graphics.NextPowerOf2Int(height)
|
||||
gs := []float64{geo.Element(0, 0),
|
||||
geo.Element(0, 1),
|
||||
geo.Element(1, 0),
|
||||
geo.Element(1, 1),
|
||||
geo.Element(0, 2),
|
||||
geo.Element(1, 2)}
|
||||
n := 0
|
||||
for i := 0; i < l; i++ {
|
||||
dx0, dy0, dx1, dy1 := parts.Dst(i)
|
||||
if dx0 == dx1 || dy0 == dy1 {
|
||||
continue
|
||||
}
|
||||
x0, y0, x1, y1 := int16(dx0), int16(dy0), int16(dx1), int16(dy1)
|
||||
sx0, sy0, sx1, sy1 := parts.Src(i)
|
||||
if sx0 == sx1 || sy0 == sy1 {
|
||||
continue
|
||||
}
|
||||
u0, v0, u1, v1 := u(sx0, width2p), v(sy0, height2p), u(sx1, width2p), v(sy1, height2p)
|
||||
offset := n * totalSize
|
||||
a16.SetIndex(offset, x0)
|
||||
a16.SetIndex(offset+1, y0)
|
||||
a16.SetIndex(offset+2, u0)
|
||||
a16.SetIndex(offset+3, v0)
|
||||
for j, g := range gs {
|
||||
af32.SetIndex((offset+4)/2+j, g)
|
||||
}
|
||||
a16.SetIndex(offset+oneSize, x1)
|
||||
a16.SetIndex(offset+oneSize+1, y0)
|
||||
a16.SetIndex(offset+oneSize+2, u1)
|
||||
a16.SetIndex(offset+oneSize+3, v0)
|
||||
for j, g := range gs {
|
||||
af32.SetIndex((offset+oneSize+4)/2+j, g)
|
||||
}
|
||||
a16.SetIndex(offset+2*oneSize, x0)
|
||||
a16.SetIndex(offset+2*oneSize+1, y1)
|
||||
a16.SetIndex(offset+2*oneSize+2, u0)
|
||||
a16.SetIndex(offset+2*oneSize+3, v1)
|
||||
for j, g := range gs {
|
||||
af32.SetIndex((offset+2*oneSize+4)/2+j, g)
|
||||
}
|
||||
a16.SetIndex(offset+3*oneSize, x1)
|
||||
a16.SetIndex(offset+3*oneSize+1, y1)
|
||||
a16.SetIndex(offset+3*oneSize+2, u1)
|
||||
a16.SetIndex(offset+3*oneSize+3, v1)
|
||||
for j, g := range gs {
|
||||
af32.SetIndex((offset+3*oneSize+4)/2+j, g)
|
||||
}
|
||||
n++
|
||||
}
|
||||
// TODO: Need to slice
|
||||
return a16.Interface().([]int16)
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user