lupine/ordoor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UNTESTED: ebiten v2

Browse Source
This commit is contained in:
Nick Thomas
2020-11-21 19:27:09 +00:00
parent c5e6abb798
commit 92fa0fc5d6
22 changed files with 92 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/view-ani/main.go
View File

@@ -7,7 +7,7 @@ import (
"math"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"golang.org/x/image/colornames"
"code.ur.gs/lupine/ordoor/internal/assetstore"
@@ -100,7 +100,7 @@ func main() {
func (e *env) Update(screenX, screenY int) error {
if e.step == 0 || e.lastState != e.state {
ani, err := e.assets.Animation(e.state.groupIdx, e.state.recIdx)
ani, err := e.assets.Animation(e.state.groupIdx, e.state.recIdx, 0) // FIXME: why 0?
if err != nil {
return err
}
@@ -131,7 +131,7 @@ func (e *env) Draw(screen *ebiten.Image) error {
if len(e.ani.Frames) > 0 {
sprite := e.ani.Frames[e.step/4%len(e.ani.Frames)]
return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
}
return nil

6
cmd/view-font/main.go
View File

@@ -7,7 +7,7 @@ import (
"math"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/assetstore"
"code.ur.gs/lupine/ordoor/internal/config"
@@ -103,9 +103,7 @@ func (e *env) Draw(screen *ebiten.Image) error {
op.GeoM.Translate(float64(xOff), 0)
op.GeoM.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor
if err := screen.DrawImage(glyph.Image, op); err != nil {
return err
}
screen.DrawImage(glyph.Image, op)
xOff += glyph.Rect.Dx()
}

2
cmd/view-map/main.go
View File

@@ -6,7 +6,7 @@ import (
"math"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/assetstore"
"code.ur.gs/lupine/ordoor/internal/config"

2
cmd/view-menu/main.go
View File

@@ -5,7 +5,7 @@ import (
"log"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/assetstore"
"code.ur.gs/lupine/ordoor/internal/config"

12
cmd/view-minimap/main.go
View File

@@ -10,7 +10,7 @@ import (
"path/filepath"
"time"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/maps"
"code.ur.gs/lupine/ordoor/internal/sets"
@@ -173,11 +173,7 @@ func (e *env) Update(screenX, screenY int) error {
func (e *env) Draw(screen *ebiten.Image) error {
gameMap := e.gameMap
rect := gameMap.Rect()
imd, err := ebiten.NewImage(rect.Dx(), rect.Dy(), ebiten.FilterDefault)
if err != nil {
return err
}
imd := ebiten.NewImage(rect.Dx(), rect.Dy())
for y := int(rect.Min.Y); y < int(rect.Max.Y); y++ {
for x := int(rect.Min.X); x < int(rect.Max.X); x++ {
@@ -193,7 +189,9 @@ func (e *env) Draw(screen *ebiten.Image) error {
cam.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor
cam.Rotate(0.785) // Apply isometric angle
return screen.DrawImage(imd, &ebiten.DrawImageOptions{GeoM: cam})
screen.DrawImage(imd, &ebiten.DrawImageOptions{GeoM: cam})
return nil
}
// Converts pixel coordinates to cell coordinates

6
cmd/view-obj/main.go
View File

@@ -7,7 +7,7 @@ import (
"math"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/assetstore"
"code.ur.gs/lupine/ordoor/internal/config"
@@ -136,7 +136,9 @@ func (e *env) Draw(screen *ebiten.Image) error {
cam.Translate(float64(e.state.origin.X), float64(e.state.origin.Y)) // Move to origin
cam.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor
return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
return nil
}
func (e *env) changeSprite(by int) func() {

6
cmd/view-set/main.go
View File

@@ -7,7 +7,7 @@ import (
"math"
"os"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/v2"
"code.ur.gs/lupine/ordoor/internal/assetstore"
"code.ur.gs/lupine/ordoor/internal/config"
@@ -123,7 +123,9 @@ func (e *env) Draw(screen *ebiten.Image) error {
// TODO: centre the image
return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
return nil
}
func (e *env) changeObjIdx(by int) func() {