mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-25 11:18:54 +01:00
Revert "internal/restorable: integrate Image functions into internal/atlas"
This reverts commit 59896e4447
.
Updates #3083
This commit is contained in:
parent
5a5feb0401
commit
54c117b0de
@ -136,7 +136,7 @@ func (b *backend) extendIfNeeded(width, height int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Assume that the screen image is never extended.
|
// Assume that the screen image is never extended.
|
||||||
newImg := newClearedImage(width, height, false)
|
newImg := restorable.NewImage(width, height, false)
|
||||||
|
|
||||||
// Use DrawTriangles instead of WritePixels because the image i might be stale and not have its pixels
|
// Use DrawTriangles instead of WritePixels because the image i might be stale and not have its pixels
|
||||||
// information.
|
// information.
|
||||||
@ -155,45 +155,6 @@ func (b *backend) extendIfNeeded(width, height int) {
|
|||||||
b.height = height
|
b.height = height
|
||||||
}
|
}
|
||||||
|
|
||||||
// newClearedImage creates an emtpy image with the given size.
|
|
||||||
//
|
|
||||||
// Note that Dispose is not called automatically.
|
|
||||||
func newClearedImage(width, height int, screen bool) *restorable.Image {
|
|
||||||
i := &restorable.Image{
|
|
||||||
Image: graphicscommand.NewImage(width, height, screen),
|
|
||||||
}
|
|
||||||
|
|
||||||
// This needs to use 'InternalSize' to render the whole region, or edges are unexpectedly cleared on some
|
|
||||||
// devices.
|
|
||||||
iw, ih := i.Image.InternalSize()
|
|
||||||
clearImage(i.Image, image.Rect(0, 0, iw, ih))
|
|
||||||
return i
|
|
||||||
}
|
|
||||||
|
|
||||||
func clearImage(i *graphicscommand.Image, region image.Rectangle) {
|
|
||||||
vs := make([]float32, 4*graphics.VertexFloatCount)
|
|
||||||
graphics.QuadVerticesFromDstAndSrc(vs, float32(region.Min.X), float32(region.Min.Y), float32(region.Max.X), float32(region.Max.Y), 0, 0, 0, 0, 0, 0, 0, 0)
|
|
||||||
is := graphics.QuadIndices()
|
|
||||||
i.DrawTriangles([graphics.ShaderSrcImageCount]*graphicscommand.Image{}, vs, is, graphicsdriver.BlendClear, region, [graphics.ShaderSrcImageCount]image.Rectangle{}, restorable.ClearShader.Shader, nil, graphicsdriver.FillRuleFillAll)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *backend) clearPixels(region image.Rectangle) {
|
|
||||||
if region.Dx() <= 0 || region.Dy() <= 0 {
|
|
||||||
panic("atlas: width/height must be positive")
|
|
||||||
}
|
|
||||||
clearImage(b.restorable.Image, region.Intersect(image.Rect(0, 0, b.width, b.height)))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *backend) writePixels(pixels *graphics.ManagedBytes, region image.Rectangle) {
|
|
||||||
if region.Dx() <= 0 || region.Dy() <= 0 {
|
|
||||||
panic("atlas: width/height must be positive")
|
|
||||||
}
|
|
||||||
if !region.In(image.Rect(0, 0, b.width, b.height)) {
|
|
||||||
panic(fmt.Sprintf("atlas: out of range %v", region))
|
|
||||||
}
|
|
||||||
b.restorable.Image.WritePixels(pixels, region)
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// backendsM is a mutex for critical sections of the backend and packing.Node objects.
|
// backendsM is a mutex for critical sections of the backend and packing.Node objects.
|
||||||
backendsM sync.Mutex
|
backendsM sync.Mutex
|
||||||
@ -578,7 +539,7 @@ func (i *Image) writePixels(pix []byte, region image.Rectangle) {
|
|||||||
region = region.Add(r.Min)
|
region = region.Add(r.Min)
|
||||||
|
|
||||||
if pix == nil {
|
if pix == nil {
|
||||||
i.backend.clearPixels(region)
|
i.backend.restorable.ClearPixels(region)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -618,6 +579,16 @@ func (i *Image) writePixels(pix []byte, region image.Rectangle) {
|
|||||||
i.backend.writePixels(pixb, r)
|
i.backend.writePixels(pixb, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *backend) writePixels(pixels *graphics.ManagedBytes, region image.Rectangle) {
|
||||||
|
if region.Dx() <= 0 || region.Dy() <= 0 {
|
||||||
|
panic("atlas: width/height must be positive")
|
||||||
|
}
|
||||||
|
if !region.In(image.Rect(0, 0, b.width, b.height)) {
|
||||||
|
panic(fmt.Sprintf("atlas: out of range %v", region))
|
||||||
|
}
|
||||||
|
b.restorable.Image.WritePixels(pixels, region)
|
||||||
|
}
|
||||||
|
|
||||||
func (i *Image) ReadPixels(graphicsDriver graphicsdriver.Graphics, pixels []byte, region image.Rectangle) (ok bool, err error) {
|
func (i *Image) ReadPixels(graphicsDriver graphicsdriver.Graphics, pixels []byte, region image.Rectangle) (ok bool, err error) {
|
||||||
backendsM.Lock()
|
backendsM.Lock()
|
||||||
defer backendsM.Unlock()
|
defer backendsM.Unlock()
|
||||||
@ -687,7 +658,7 @@ func (i *Image) deallocate() {
|
|||||||
if !i.backend.page.IsEmpty() {
|
if !i.backend.page.IsEmpty() {
|
||||||
// As this part can be reused, this should be cleared explicitly.
|
// As this part can be reused, this should be cleared explicitly.
|
||||||
r := i.regionWithPadding()
|
r := i.regionWithPadding()
|
||||||
i.backend.clearPixels(r)
|
i.backend.restorable.ClearPixels(r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -752,7 +723,7 @@ func (i *Image) allocate(forbiddenBackends []*backend, asSource bool) {
|
|||||||
}
|
}
|
||||||
// A screen image doesn't have a padding.
|
// A screen image doesn't have a padding.
|
||||||
i.backend = &backend{
|
i.backend = &backend{
|
||||||
restorable: newClearedImage(i.width, i.height, true),
|
restorable: restorable.NewImage(i.width, i.height, true),
|
||||||
width: i.width,
|
width: i.width,
|
||||||
height: i.height,
|
height: i.height,
|
||||||
}
|
}
|
||||||
@ -769,7 +740,7 @@ func (i *Image) allocate(forbiddenBackends []*backend, asSource bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
i.backend = &backend{
|
i.backend = &backend{
|
||||||
restorable: newClearedImage(wp, hp, false),
|
restorable: restorable.NewImage(wp, hp, false),
|
||||||
width: wp,
|
width: wp,
|
||||||
height: hp,
|
height: hp,
|
||||||
source: asSource && i.imageType == ImageTypeRegular,
|
source: asSource && i.imageType == ImageTypeRegular,
|
||||||
@ -817,7 +788,7 @@ loop:
|
|||||||
}
|
}
|
||||||
|
|
||||||
b := &backend{
|
b := &backend{
|
||||||
restorable: newClearedImage(width, height, false),
|
restorable: restorable.NewImage(width, height, false),
|
||||||
width: width,
|
width: width,
|
||||||
height: height,
|
height: height,
|
||||||
page: packing.NewPage(width, height, maxSize),
|
page: packing.NewPage(width, height, maxSize),
|
||||||
|
@ -15,7 +15,11 @@
|
|||||||
package restorable
|
package restorable
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"image"
|
||||||
|
|
||||||
|
"github.com/hajimehoshi/ebiten/v2/internal/graphics"
|
||||||
"github.com/hajimehoshi/ebiten/v2/internal/graphicscommand"
|
"github.com/hajimehoshi/ebiten/v2/internal/graphicscommand"
|
||||||
|
"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Image represents an image.
|
// Image represents an image.
|
||||||
@ -24,4 +28,41 @@ type Image struct {
|
|||||||
// This member is exported on purpose.
|
// This member is exported on purpose.
|
||||||
// TODO: Move the implementation to internal/atlas package (#805).
|
// TODO: Move the implementation to internal/atlas package (#805).
|
||||||
Image *graphicscommand.Image
|
Image *graphicscommand.Image
|
||||||
|
|
||||||
|
width int
|
||||||
|
height int
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewImage creates an emtpy image with the given size.
|
||||||
|
//
|
||||||
|
// The returned image is cleared.
|
||||||
|
//
|
||||||
|
// Note that Dispose is not called automatically.
|
||||||
|
func NewImage(width, height int, screen bool) *Image {
|
||||||
|
i := &Image{
|
||||||
|
Image: graphicscommand.NewImage(width, height, screen),
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
}
|
||||||
|
|
||||||
|
// This needs to use 'InternalSize' to render the whole region, or edges are unexpectedly cleared on some
|
||||||
|
// devices.
|
||||||
|
iw, ih := i.Image.InternalSize()
|
||||||
|
clearImage(i.Image, image.Rect(0, 0, iw, ih))
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
|
||||||
|
func clearImage(i *graphicscommand.Image, region image.Rectangle) {
|
||||||
|
vs := make([]float32, 4*graphics.VertexFloatCount)
|
||||||
|
graphics.QuadVerticesFromDstAndSrc(vs, float32(region.Min.X), float32(region.Min.Y), float32(region.Max.X), float32(region.Max.Y), 0, 0, 0, 0, 0, 0, 0, 0)
|
||||||
|
is := graphics.QuadIndices()
|
||||||
|
i.DrawTriangles([graphics.ShaderSrcImageCount]*graphicscommand.Image{}, vs, is, graphicsdriver.BlendClear, region, [graphics.ShaderSrcImageCount]image.Rectangle{}, clearShader.Shader, nil, graphicsdriver.FillRuleFillAll)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearPixels clears the specified region by WritePixels.
|
||||||
|
func (i *Image) ClearPixels(region image.Rectangle) {
|
||||||
|
if region.Dx() <= 0 || region.Dy() <= 0 {
|
||||||
|
panic("restorable: width/height must be positive")
|
||||||
|
}
|
||||||
|
clearImage(i.Image, region.Intersect(image.Rect(0, 0, i.width, i.height)))
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ var (
|
|||||||
NearestFilterShaderIR *shaderir.Program
|
NearestFilterShaderIR *shaderir.Program
|
||||||
LinearFilterShader *Shader
|
LinearFilterShader *Shader
|
||||||
LinearFilterShaderIR *shaderir.Program
|
LinearFilterShaderIR *shaderir.Program
|
||||||
ClearShader *Shader
|
clearShader *Shader
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -78,5 +78,5 @@ func init() {
|
|||||||
NearestFilterShader = NewShader(nearestIR)
|
NearestFilterShader = NewShader(nearestIR)
|
||||||
LinearFilterShaderIR = linearIR
|
LinearFilterShaderIR = linearIR
|
||||||
LinearFilterShader = NewShader(linearIR)
|
LinearFilterShader = NewShader(linearIR)
|
||||||
ClearShader = NewShader(clearIR)
|
clearShader = NewShader(clearIR)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user