Add ground.

Author: demouth

cmd/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/gdamore/tcell"
 	"fmt"
-	"os"
-	"github.com/gdamore/tcell/encoding"
 	"github.com/demouth/mario-go"
+	"github.com/gdamore/tcell"
+	"github.com/gdamore/tcell/encoding"
+	"os"
 	"time"
 )
 
@@ -35,9 +35,31 @@ func main() {
 	world := mario_go.NewWorld(s)
 	world.Width = w
 	world.Height = h
-	world.Draw()
 	sp := mario_go.NewMario()
-	world.AddChild(sp)
+	sp.SetX(10)
+	sp.SetY(50)
+	world.SetMario(sp)
+	ground := mario_go.NewGround()
+	ground.SetX(0)
+	ground.SetY(0)
+	ground2 := mario_go.NewGround()
+	ground2.SetX(16)
+	ground2.SetY(0)
+	ground3 := mario_go.NewGround()
+	ground3.SetX(32)
+	ground3.SetY(0)
+	ground4 := mario_go.NewGround()
+	ground4.SetX(60)
+	ground4.SetY(10)
+	ground5 := mario_go.NewGround()
+	ground5.SetX(100)
+	ground5.SetY(24)
+	world.AddObject(ground)
+	world.AddObject(ground2)
+	world.AddObject(ground3)
+	world.AddObject(ground4)
+	world.AddObject(ground5)
+	world.Draw()
 
 	quit := make(chan struct{})
 
@@ -57,7 +79,7 @@ func main() {
 				} else if ev.Key() == tcell.KeyUp {
 					sp.Jump()
 				} else if ev.Key() == tcell.KeyDown {
-					sp.SetY(sp.Y()-1)
+					sp.SetY(sp.Y() - 1)
 				}
 			case *tcell.EventResize:
 				w, h = s.Size()
@@ -69,17 +91,24 @@ func main() {
 		}
 	}()
 
-	loop:
+loop:
 	for {
 		select {
 		case <-quit:
 			break loop
-		case <-time.After(time.Millisecond * 20):
+		case <-time.After(time.Millisecond * 25):
 		}
+		st := tcell.StyleDefault.Background(tcell.NewHexColor(0x6AADFD))
+		s.Fill(' ', st)
+		//s.Clear()
 		sp.Move()
+		world.HitTest()
+		world.CameraX = -sp.X() + 30
+		if world.CameraX > 0 {
+			world.CameraX = 0
+		}
 		world.Draw()
 		s.Show()
-		s.Clear()
 	}
 
 	s.Fini()

docs/static/screen_capture.gif

@@ -1,22 +1,22 @@
 package mario_go
 
 type Dot struct {
-	X int
-	Y int
+	X     int
+	Y     int
 	Color int32
 }
 
 type Dots []Dot
 
-func NewDot(x,y int,color int32) *Dot {
-	d := &Dot{x,y,color}
+func NewDot(x, y int, color int32) *Dot {
+	d := &Dot{x, y, color}
 	return d
 }
 
-func MakeDots(indices []int32) Dots{
+func MakeDots(indices []int32) Dots {
 	dots := Dots{}
-	for i:=0;i<len(indices);i+=3 {
-		dots = append(dots, *NewDot(int(indices[i]),int(indices[i+1]),indices[i+2]))
+	for i := 0; i < len(indices); i += 3 {
+		dots = append(dots, *NewDot(int(indices[i]), int(indices[i+1]), indices[i+2]))
 	}
 	return dots
-}
+}

dot.go

@@ -9,4 +9,6 @@ type Drawable interface {
 	Y() int
 	SetX(v int)
 	SetY(v int)
+	Width() int
+	Height() int
 }

drawable.go

@@ -0,0 +1,45 @@
+package mario_go
+
+type Ground struct {
+	Sprite
+	sx float32
+	sy float32
+}
+
+func NewGround() *Ground {
+	s := &Ground{}
+	return s
+}
+
+func (s Ground) Dots() Dots {
+	var m int32 = 0x9B4808
+	var l int32 = 0xFECDC6
+	var b int32 = 0x000000
+	indices := []int32{
+		0, 15, m, 1, 15, l, 2, 15, l, 3, 15, l, 4, 15, l, 5, 15, l, 6, 15, l, 7, 15, l, 8, 15, l, 9, 15, l, 10, 15, b, 11, 15, m, 12, 15, l, 13, 15, l, 14, 15, l, 15, 15, m,
+		0, 14, l, 1, 14, m, 2, 14, m, 3, 14, m, 4, 14, m, 5, 14, m, 6, 14, m, 7, 14, m, 8, 14, m, 9, 14, m, 10, 14, b, 11, 14, l, 12, 14, m, 13, 14, m, 14, 14, m, 15, 14, b,
+		0, 13, l, 1, 13, m, 2, 13, m, 3, 13, m, 4, 13, m, 5, 13, m, 6, 13, m, 7, 13, m, 8, 13, m, 9, 13, m, 10, 13, b, 11, 13, l, 12, 13, m, 13, 13, m, 14, 13, m, 15, 13, b,
+		0, 12, l, 1, 12, m, 2, 12, m, 3, 12, m, 4, 12, m, 5, 12, m, 6, 12, m, 7, 12, m, 8, 12, m, 9, 12, m, 10, 12, b, 11, 12, l, 12, 12, m, 13, 12, m, 14, 12, m, 15, 12, b,
+		0, 11, l, 1, 11, m, 2, 11, m, 3, 11, m, 4, 11, m, 5, 11, m, 6, 11, m, 7, 11, m, 8, 11, m, 9, 11, m, 10, 11, b, 11, 11, l, 12, 11, b, 13, 11, m, 14, 11, m, 15, 11, b,
+		0, 10, l, 1, 10, m, 2, 10, m, 3, 10, m, 4, 10, m, 5, 10, m, 6, 10, m, 7, 10, m, 8, 10, m, 9, 10, m, 10, 10, b, 11, 10, m, 12, 10, b, 13, 10, b, 14, 10, b, 15, 10, m,
+		0, 9, l, 1, 9, m, 2, 9, m, 3, 9, m, 4, 9, m, 5, 9, m, 6, 9, m, 7, 9, m, 8, 9, m, 9, 9, m, 10, 9, b, 11, 9, l, 12, 9, l, 13, 9, l, 14, 9, l, 15, 9, b,
+		0, 8, l, 1, 8, m, 2, 8, m, 3, 8, m, 4, 8, m, 5, 8, m, 6, 8, m, 7, 8, m, 8, 8, m, 9, 8, m, 10, 8, b, 11, 8, l, 12, 8, m, 13, 8, m, 14, 8, m, 15, 8, b,
+		0, 7, l, 1, 7, m, 2, 7, m, 3, 7, m, 4, 7, m, 5, 7, m, 6, 7, m, 7, 7, m, 8, 7, m, 9, 7, m, 10, 7, b, 11, 7, l, 12, 7, m, 13, 7, m, 14, 7, m, 15, 7, b,
+		0, 6, l, 1, 6, m, 2, 6, m, 3, 6, m, 4, 6, m, 5, 6, m, 6, 6, m, 7, 6, m, 8, 6, m, 9, 6, m, 10, 6, b, 11, 6, l, 12, 6, m, 13, 6, m, 14, 6, m, 15, 6, b,
+		0, 5, b, 1, 5, b, 2, 5, m, 3, 5, m, 4, 5, m, 5, 5, m, 6, 5, m, 7, 5, m, 8, 5, m, 9, 5, b, 10, 5, l, 11, 5, m, 12, 5, m, 13, 5, m, 14, 5, m, 15, 5, b,
+		0, 4, l, 1, 4, l, 2, 4, b, 3, 4, b, 4, 4, m, 5, 4, m, 6, 4, m, 7, 4, m, 8, 4, m, 9, 4, b, 10, 4, l, 11, 4, m, 12, 4, m, 13, 4, m, 14, 4, m, 15, 4, b,
+		0, 3, l, 1, 3, m, 2, 3, l, 3, 3, l, 4, 3, b, 5, 3, b, 6, 3, b, 7, 3, b, 8, 3, l, 9, 3, m, 10, 3, m, 11, 3, m, 12, 3, m, 13, 3, m, 14, 3, m, 15, 3, b,
+		0, 2, l, 1, 2, m, 2, 2, m, 3, 2, m, 4, 2, l, 5, 2, l, 6, 2, l, 7, 2, b, 8, 2, l, 9, 2, m, 10, 2, m, 11, 2, m, 12, 2, m, 13, 2, m, 14, 2, m, 15, 2, b,
+		0, 1, l, 1, 1, m, 2, 1, m, 3, 1, m, 4, 1, m, 5, 1, m, 6, 1, m, 7, 1, b, 8, 1, l, 9, 1, m, 10, 1, m, 11, 1, m, 12, 1, m, 13, 1, m, 14, 1, b, 15, 1, b,
+		0, 0, m, 1, 0, b, 2, 0, b, 3, 0, b, 4, 0, b, 5, 0, b, 6, 0, b, 7, 0, m, 8, 0, l, 9, 0, b, 10, 0, b, 11, 0, b, 12, 0, b, 13, 0, b, 14, 0, b, 15, 0, m,
+	}
+	return MakeDots(indices)
+}
+
+func (s Ground) Width() int {
+	return 16
+}
+
+func (s Ground) Height() int {
+	return 16
+}

ground.go

@@ -7,6 +7,7 @@ type Mario struct {
 	sx      float32
 	sy      float32
 	reverse bool
+	landing bool
 }
 
 func NewMario() *Mario {
@@ -24,16 +25,37 @@ func (m *Mario) Move() {
 	if math.Absf(m.sx) < 0.1 {
 		m.sx = 0
 	}
+	if m.x < 0 {
+		m.x = 0
+		m.StopX()
+	}
 	if m.y < 0 {
 		m.y = 0
-		m.sy = 0
+		m.Land()
 	}
 }
 
+func (m *Mario) StopX() {
+	m.sx = 0
+}
+
+func (m *Mario) StopY() {
+	m.sy = 0
+}
+
+func (m *Mario) Land() {
+	m.sy = 0
+	m.landing = true
+}
+
+func (m *Mario) Fall() {
+	m.sy = 0
+}
+
 func (m *Mario) Left() {
 	if math.Absf(m.sx) < 0.6 {
 		m.sx -= 0.4
-	}else {
+	} else {
 		m.sx -= 1.0
 	}
 	m.reverse = true
@@ -42,23 +64,31 @@ func (m *Mario) Left() {
 func (m *Mario) Right() {
 	if math.Absf(m.sx) < 0.6 {
 		m.sx += 0.4
-	}else{
+	} else {
 		m.sx += 1.0
 	}
 	m.reverse = false
 }
 
 func (m *Mario) Jump() {
 	if !m.Jumping() {
-		m.sy += 4.0
+		m.sy += 5.0
+		m.landing = false
 	}
 }
 
 func (m *Mario) Jumping() bool {
-	if m.y == 0 {
+	return !m.landing
+}
+
+func (m Mario) Rising() bool {
+	if m.landing {
 		return false
 	}
-	return true
+	if 0 < m.sy {
+		return true
+	}
+	return false
 }
 
 func (s Mario) Dots() Dots {
@@ -68,7 +98,7 @@ func (s Mario) Dots() Dots {
 	} else if math.Absf(s.sx) > 0 {
 		if s.sx < 0.0 && !s.reverse {
 			dots = s.stopDots()
-		} else if s.sx > 0.0 && s.reverse{
+		} else if s.sx > 0.0 && s.reverse {
 			dots = s.stopDots()
 		} else if int(s.x)%9 < 3 {
 			dots = s.run1Dots()
@@ -237,7 +267,15 @@ func (s Mario) jumpDots() Dots {
 
 func reverseDost(dots Dots) Dots {
 	for i, dot := range dots {
-		dots[i].X = 13 - dot.X
+		dots[i].X = 11 - dot.X
 	}
 	return dots
 }
+
+func (s Mario) Width() int {
+	return 12
+}
+
+func (s Mario) Height() int {
+	return 16
+}

mario.go

@@ -23,11 +23,11 @@ func (s Sprite) Y() int {
 	return int(s.y)
 }
 
-func (s *Sprite)SetX(v int){
+func (s *Sprite) SetX(v int) {
 	s.x = float32(v)
 }
 
-func (s *Sprite)SetY(v int){
+func (s *Sprite) SetY(v int) {
 	s.y = float32(v)
 }
 
@@ -42,8 +42,8 @@ func (s *Sprite) Draw() {
 
 func (s Sprite) Dots() Dots {
 	var dots Dots
-	d := NewDot(0,0,0x8A7301)
-	d2 := NewDot(2,1,0xFF0000)
+	d := NewDot(0, 0, 0x8A7301)
+	d2 := NewDot(2, 1, 0xFF0000)
 	dots = Dots{*d, *d2}
 	return dots
 }

sprite.go

@@ -5,41 +5,72 @@ import (
 )
 
 type World struct {
-	screen tcell.Screen
-	children []Drawable
-	Width int
-	Height int
+	screen  tcell.Screen
+	objects []Drawable
+	Width   int
+	Height  int
 	CameraX int
 	CameraY int
+	Mario   *Mario
 }
 
-
 func NewWorld(s tcell.Screen) *World {
 	w := &World{}
 	w.screen = s
-	w.children = []Drawable{}
-	w.CameraX=0
-	w.CameraY=0
+	w.objects = []Drawable{}
+	w.CameraX = 0
+	w.CameraY = 0
 	return w
 }
 
-func (world *World) AddChild(child Drawable) {
-	child.SetScreen(world.screen)
-	world.children = append(world.children,child)
+func (world *World) SetMario(mario *Mario) {
+	mario.SetScreen(world.screen)
+	world.Mario = mario
 }
 
-func (w *World) Draw() {
-	for _, child := range w.children {
-		w.DrawDots(child)
+func (world *World) AddObject(object Drawable) {
+	object.SetScreen(world.screen)
+	world.objects = append(world.objects, object)
+}
+
+func (w *World) HitTest() {
+	for _, child := range w.objects {
+		if child.X() < w.Mario.X()+w.Mario.Width() && w.Mario.X() < child.X()+child.Width() && child.Y() < w.Mario.Y()+w.Mario.Height() && w.Mario.Y() < child.Y()+child.Height() {
+			leftOverlap := w.Mario.X() - (child.X() + child.Width())
+			rightOverlap := child.X() - (w.Mario.X() + w.Mario.Width())
+			topOverlap := w.Mario.Y() - (child.Y() + child.Height())
+			bottomOverlap := child.Y() - (w.Mario.Y() + w.Mario.Height())
+			if rightOverlap < leftOverlap && topOverlap < leftOverlap && bottomOverlap < leftOverlap {
+				w.Mario.SetX(child.X() + child.Width())
+				w.Mario.StopX()
+			} else if leftOverlap < rightOverlap && topOverlap < rightOverlap && bottomOverlap < rightOverlap {
+				w.Mario.SetX(child.X() - w.Mario.Width())
+				w.Mario.StopX()
+			} else if leftOverlap < topOverlap && rightOverlap < topOverlap && bottomOverlap < topOverlap {
+				w.Mario.SetY(child.Y() + child.Height())
+				if !w.Mario.Rising() {
+					w.Mario.Land()
+				}
+			} else if leftOverlap < bottomOverlap && rightOverlap < bottomOverlap && topOverlap < bottomOverlap {
+				w.Mario.SetY(child.Y() - w.Mario.Height())
+				w.Mario.Fall()
+			}
+		}
 	}
 }
 
+func (w *World) Draw() {
+	for _, object := range w.objects {
+		w.DrawDots(object)
+	}
+	w.DrawDots(w.Mario)
+}
 
 func (w World) DrawDots(child Drawable) {
 	dots := child.Dots()
-	for _,dot := range dots {
+	for _, dot := range dots {
 		st := tcell.StyleDefault.Background(tcell.NewHexColor(dot.Color))
-		w.screen.SetContent(w.CameraX+child.X()*2+dot.X*2,  w.Height-w.CameraY-child.Y()-dot.Y-1,' ',nil,st)
-		w.screen.SetContent(w.CameraX+child.X()*2+dot.X*2+1,w.Height-w.CameraY-child.Y()-dot.Y-1,' ',nil,st)
+		w.screen.SetContent(w.CameraX*2+child.X()*2+dot.X*2, w.Height-w.CameraY-child.Y()-dot.Y-1, ' ', nil, st)
+		w.screen.SetContent(w.CameraX*2+child.X()*2+dot.X*2+1, w.Height-w.CameraY-child.Y()-dot.Y-1, ' ', nil, st)
 	}
-}
+}