Move some files of internal to internal/graphics

This commit is contained in:
Hajime Hoshi 2015-01-27 00:08:24 +09:00
parent e23b0758e5
commit ae450433db
7 changed files with 18 additions and 22 deletions

View File

@ -20,7 +20,7 @@ install:
script:
- go test -v ./...
- gopherjs test -v github.com/hajimehoshi/ebiten github.com/hajimehoshi/ebiten/internal
- gopherjs test -v github.com/hajimehoshi/ebiten github.com/hajimehoshi/ebiten/internal/graphics
- gopherjs build -v github.com/hajimehoshi/ebiten/example/blocks
notifications:

View File

@ -17,7 +17,6 @@ package ebiten
import (
"errors"
"fmt"
"github.com/hajimehoshi/ebiten/internal"
"github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
"github.com/hajimehoshi/ebiten/internal/ui"
@ -48,7 +47,6 @@ func (i *Image) Clear() (err error) {
// Fill fills the image with a solid color.
func (i *Image) Fill(clr color.Color) (err error) {
i.pixels = nil
//r, g, b, a := internal.RGBA(clr)
cr, cg, cb, ca := clr.RGBA()
const max = math.MaxUint16
r := float64(cr) / max
@ -166,7 +164,7 @@ func (i *Image) At(x, y int) color.Color {
})
}
w, _ := i.Size()
w = internal.NextPowerOf2Int(w)
w = graphics.NextPowerOf2Int(w)
idx := 4*x + 4*y*w
r, g, b, a := i.pixels[idx], i.pixels[idx+1], i.pixels[idx+2], i.pixels[idx+3]
return color.RGBA{r, g, b, a}

View File

@ -15,7 +15,7 @@
package ebiten
import (
"github.com/hajimehoshi/ebiten/internal"
"github.com/hajimehoshi/ebiten/internal/graphics"
"image"
"math"
)
@ -68,11 +68,11 @@ func (w *wholeImage) Src(i int) (x0, y0, x1, y1 int) {
}
func u(x int, width int) int {
return math.MaxInt16 * x / internal.NextPowerOf2Int(width)
return math.MaxInt16 * x / graphics.NextPowerOf2Int(width)
}
func v(y int, height int) int {
return math.MaxInt16 * y / internal.NextPowerOf2Int(height)
return math.MaxInt16 * y / graphics.NextPowerOf2Int(height)
}
type textureQuads struct {

View File

@ -15,7 +15,6 @@
package graphics
import (
"github.com/hajimehoshi/ebiten/internal"
"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
"image/color"
)
@ -90,18 +89,18 @@ func (f *Framebuffer) Dispose(c *opengl.Context) {
}
func (f *Framebuffer) setAsViewport(c *opengl.Context) error {
width := internal.NextPowerOf2Int(f.width)
height := internal.NextPowerOf2Int(f.height)
width := NextPowerOf2Int(f.width)
height := NextPowerOf2Int(f.height)
return c.SetViewport(f.native, width, height)
}
func (f *Framebuffer) projectionMatrix() *[4][4]float64 {
width := internal.NextPowerOf2Int(f.width)
height := internal.NextPowerOf2Int(f.height)
width := NextPowerOf2Int(f.width)
height := NextPowerOf2Int(f.height)
m := orthoProjectionMatrix(0, width, 0, height)
if f.flipY {
m[1][1] *= -1
m[1][3] += float64(f.height) / float64(internal.NextPowerOf2Int(f.height)) * 2
m[1][3] += float64(f.height) / float64(NextPowerOf2Int(f.height)) * 2
}
return m
}
@ -139,6 +138,6 @@ func (f *Framebuffer) DrawFilledRects(c *opengl.Context, rects Rects) error {
func (f *Framebuffer) Pixels(c *opengl.Context) ([]uint8, error) {
w, h := f.Size()
w, h = internal.NextPowerOf2Int(w), internal.NextPowerOf2Int(h)
w, h = NextPowerOf2Int(w), NextPowerOf2Int(h)
return c.FramebufferPixels(f.native, w, h)
}

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package internal
package graphics
func NextPowerOf2Int(x int) int {
x -= 1

View File

@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package internal_test
package graphics_test
import (
. "github.com/hajimehoshi/ebiten/internal"
. "github.com/hajimehoshi/ebiten/internal/graphics"
"testing"
)

View File

@ -16,7 +16,6 @@ package graphics
import (
"errors"
"github.com/hajimehoshi/ebiten/internal"
"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
"image"
"image/draw"
@ -27,8 +26,8 @@ func adjustImageForTexture(img image.Image) *image.RGBA {
adjustedImageBounds := image.Rectangle{
image.ZP,
image.Point{
internal.NextPowerOf2Int(width),
internal.NextPowerOf2Int(height),
NextPowerOf2Int(width),
NextPowerOf2Int(height),
},
}
if adjustedImage, ok := img.(*image.RGBA); ok && img.Bounds() == adjustedImageBounds {
@ -55,8 +54,8 @@ func (t *Texture) Size() (width, height int) {
}
func NewTexture(c *opengl.Context, width, height int, filter opengl.Filter) (*Texture, error) {
w := internal.NextPowerOf2Int(width)
h := internal.NextPowerOf2Int(height)
w := NextPowerOf2Int(width)
h := NextPowerOf2Int(height)
if w < 4 {
return nil, errors.New("width must be equal or more than 4.")
}