Compare commits

..

No commits in common. "main" and "v0.0.1" have entirely different histories.
main ... v0.0.1

21 changed files with 34 additions and 36 deletions

View file

@ -1,9 +1,9 @@
# ichigo 🍓 # ichigo 🍓
![Build status](https://drjosh.dev/ichigo/actions/workflows/go.yml/badge.svg) ![Build status](https://github.com/DrJosh9000/ichigo/actions/workflows/go.yml/badge.svg)
[![Go Reference](https://pkg.go.dev/badge/drjosh.dev/ichigo.svg)](https://pkg.go.dev/drjosh.dev/ichigo) [![Go Reference](https://pkg.go.dev/badge/github.com/DrJosh9000/ichigo.svg)](https://pkg.go.dev/github.com/DrJosh9000/ichigo)
[![Go Report Card](https://goreportcard.com/badge/drjosh.dev/ichigo)](https://goreportcard.com/report/drjosh.dev/ichigo) [![Go Report Card](https://goreportcard.com/badge/github.com/DrJosh9000/ichigo)](https://goreportcard.com/report/github.com/DrJosh9000/ichigo)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://gitea.drjosh.dev/josh/ichigo/blob/main/LICENSE) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/DrJosh9000/ichigo/blob/main/LICENSE)
Game engine development in progress. Game engine development in progress.

View file

@ -21,7 +21,7 @@ import (
"errors" "errors"
"log" "log"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
) )
// Ensure Actor satisfies interfaces. // Ensure Actor satisfies interfaces.

View file

@ -20,7 +20,7 @@ import (
"encoding/gob" "encoding/gob"
"fmt" "fmt"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -20,7 +20,7 @@ import (
"encoding/gob" "encoding/gob"
"image" "image"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -24,7 +24,7 @@ import (
"math" "math"
"strings" "strings"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )
@ -364,7 +364,6 @@ func (d dag) addEdge(u, v Drawer) {
} }
// removeEdge removes the edge (u -> v) in O(1). // removeEdge removes the edge (u -> v) in O(1).
//
//lint:ignore U1000 this exists for symmetry with addEdge //lint:ignore U1000 this exists for symmetry with addEdge
func (d dag) removeEdge(u, v Drawer) { func (d dag) removeEdge(u, v Drawer) {
delete(d[v].in, u) delete(d[v].in, u)

View file

@ -19,7 +19,7 @@ package engine
import ( import (
"testing" "testing"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -27,7 +27,7 @@ import (
"sync" "sync"
"time" "time"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )
@ -60,10 +60,10 @@ type Game struct {
VoxelScale geom.Float3 VoxelScale geom.Float3
dbmu sync.RWMutex dbmu sync.RWMutex
byID map[string]Identifier // Named components by ID byID map[string]Identifier // Named components by ID
byAB map[abKey]*Container // paths matching interface byAB map[abKey]*Container // paths matching interface
parent map[any]any // parent[x] is parent of x parent map[any]any // parent[x] is parent of x
children map[any]*Container // children[x] are children of x children map[any]*Container // children[x] are children of x
} }
// Draw draws everything. // Draw draws everything.

View file

@ -21,7 +21,7 @@ import (
"io/fs" "io/fs"
"reflect" "reflect"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -20,7 +20,7 @@ import (
"encoding/gob" "encoding/gob"
"fmt" "fmt"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"image" "image"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -19,7 +19,7 @@ package engine
import ( import (
"image" "image"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -19,7 +19,7 @@ package engine
import ( import (
"encoding/gob" "encoding/gob"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
) )
var _ Collider = SolidRect{} var _ Collider = SolidRect{}

View file

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"image" "image"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -22,7 +22,7 @@ import (
"image" "image"
"io/fs" "io/fs"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -19,7 +19,7 @@ package engine
import ( import (
"image" "image"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -18,8 +18,7 @@ limitations under the License.
*/ */
// This is an example game using the engine. Run it with: // This is an example game using the engine. Run it with:
// // go run -tags example example.go
// go run -tags example example.go
package main package main
import ( import (
@ -32,9 +31,9 @@ import (
"runtime" "runtime"
"runtime/pprof" "runtime/pprof"
"drjosh.dev/ichigo/engine" "github.com/DrJosh9000/ichigo/engine"
"drjosh.dev/ichigo/example" "github.com/DrJosh9000/ichigo/example"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
) )

View file

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"math" "math"
"drjosh.dev/ichigo/engine" "github.com/DrJosh9000/ichigo/engine"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
"github.com/hajimehoshi/ebiten/v2/inpututil" "github.com/hajimehoshi/ebiten/v2/inpututil"
) )

View file

@ -21,8 +21,8 @@ import (
"image" "image"
"math/rand" "math/rand"
"drjosh.dev/ichigo/engine" "github.com/DrJosh9000/ichigo/engine"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
) )
var _ interface { var _ interface {

View file

@ -20,8 +20,8 @@ import (
"image" "image"
"time" "time"
"drjosh.dev/ichigo/engine" "github.com/DrJosh9000/ichigo/engine"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
) )
// Level1 creates the level_1 scene. // Level1 creates the level_1 scene.

View file

@ -23,7 +23,7 @@ import (
"fmt" "fmt"
"log" "log"
"drjosh.dev/ichigo/geom" "github.com/DrJosh9000/ichigo/geom"
) )
func main() { func main() {

2
go.mod
View file

@ -1,4 +1,4 @@
module drjosh.dev/ichigo module github.com/DrJosh9000/ichigo
go 1.18 go 1.18