Skip to content

Commit

Permalink
changed icon to guy in demos to not interfere with android default na…
Browse files Browse the repository at this point in the history
…me scheme (#808)

Co-authored-by: Jerry Caligiure <jerry@noof.biz>
  • Loading branch information
Noofbiz and Jerry Caligiure authored Jul 12, 2024
1 parent f90ab17 commit 89e0b0c
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 26 deletions.
File renamed without changes
7 changes: 4 additions & 3 deletions demos/entityscroller/entityscroller.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand Down Expand Up @@ -59,7 +60,7 @@ func (game *GameWorld) Preload() {
// When you add tilesets to the Tiled Editor, the location where you added them from is where the engo loader will look for them
// Tileset from : http://opengameart.org

if err := engo.Files.Load("example.tmx", "icon.png"); err != nil {
if err := engo.Files.Load("example.tmx", "guy.png"); err != nil {
panic(err)
}
}
Expand Down Expand Up @@ -133,7 +134,7 @@ func (game *GameWorld) Setup(u engo.Updater) {
}

character := Character{BasicEntity: ecs.NewBasic()}
characterTexture, err := common.LoadedSprite("icon.png")
characterTexture, err := common.LoadedSprite("guy.png")
if err != nil {
panic(err)
}
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions demos/falling/falling.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type Rock struct {
type DefaultScene struct{}

func (*DefaultScene) Preload() {
err := engo.Files.Load("icon.png", "rock.png", "rock2.png")
err := engo.Files.Load("guy.png", "rock.png", "rock2.png")
if err != nil {
log.Println(err)
}
Expand All @@ -46,7 +46,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&ControlSystem{})
w.AddSystem(&RockSpawnSystem{})

texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/hello-world/hello.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -21,7 +22,7 @@ type Guy struct {
}

func (*DefaultScene) Preload() {
engo.Files.Load("icon.png")
engo.Files.Load("guy.png")
}

func (*DefaultScene) Setup(u engo.Updater) {
Expand All @@ -32,7 +33,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&common.RenderSystem{})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/mouse-drag/mouse.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -25,7 +26,7 @@ func (*DefaultScene) Type() string {
}

func (*DefaultScene) Preload() {
engo.Files.Load("icon.png")
engo.Files.Load("guy.png")
engo.Files.Load("banana.png")
engo.Files.Load("red-cherry.png")
engo.Files.Load("watermelon.png")
Expand All @@ -40,7 +41,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&common.MouseSystem{})
w.AddSystem(&DragSystem{})

guyTexture, _ := common.LoadedSprite("icon.png")
guyTexture, _ := common.LoadedSprite("guy.png")
guy := Guy{BasicEntity: ecs.NewBasic()}
guy.RenderComponent = common.RenderComponent{
Drawable: guyTexture,
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/mouse-follow/follow.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -20,7 +21,7 @@ type Player struct {
}

func (*DefaultScene) Preload() {
engo.Files.Load("icon.png")
engo.Files.Load("guy.png")
}

func (*DefaultScene) Setup(u engo.Updater) {
Expand All @@ -32,7 +33,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&FollowSystem{})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/mouse/mouse.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -21,7 +22,7 @@ type Guy struct {
}

func (*DefaultScene) Preload() {
err := engo.Files.Load("icon.png")
err := engo.Files.Load("guy.png")
if err != nil {
log.Println(err)
}
Expand All @@ -42,7 +43,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&common.MouseRotator{RotationSpeed: 0.125})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/rotation/rotation.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -21,7 +22,7 @@ type Guy struct {
type DefaultScene struct{}

func (game *DefaultScene) Preload() {
err := engo.Files.Load("icon.png")
err := engo.Files.Load("guy.png")
if err != nil {
log.Println(err)
}
Expand All @@ -36,7 +37,7 @@ func (game *DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&common.RenderSystem{})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/scale/scale.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand All @@ -21,7 +22,7 @@ type Guy struct {
}

func (*DefaultScene) Preload() {
err := engo.Files.Load("icon.png", "rock.png")
err := engo.Files.Load("guy.png", "rock.png")
if err != nil {
log.Println(err)
}
Expand All @@ -36,7 +37,7 @@ func (*DefaultScene) Setup(u engo.Updater) {
w.AddSystem(&ScaleSystem{})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down
File renamed without changes
7 changes: 4 additions & 3 deletions demos/scenes/scenes.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//+build demo
//go:build demo
// +build demo

package main

Expand Down Expand Up @@ -34,7 +35,7 @@ type Rock struct {
type IconScene struct{}

func (*IconScene) Preload() {
err := engo.Files.Load("icon.png")
err := engo.Files.Load("guy.png")
if err != nil {
log.Println(err)
}
Expand All @@ -50,7 +51,7 @@ func (*IconScene) Setup(u engo.Updater) {
w.AddSystem(&SceneSwitcherSystem{NextScene: "RockScene", WaitTime: time.Second * 3})

// Retrieve a texture
texture, err := common.LoadedSprite("icon.png")
texture, err := common.LoadedSprite("guy.png")
if err != nil {
log.Println(err)
}
Expand Down

0 comments on commit 89e0b0c

Please sign in to comment.