WIP initial cmd removal + drivers

Author: tinogoehlert

README.md

@@ -1,7 +1,7 @@
 # GOOM
 DOOM engine written in Go
 
-![GOOM](/misc/goom.png?raw=true "GOOM")
+![GOOM](/resources/press/goom.png?raw=true "GOOM")
 
 Make sure you have `DOOM1.WAD` in the root dir. Then type `make run` to run GOOM.
 
@@ -10,7 +10,7 @@ Make sure you have `DOOM1.WAD` in the root dir. Then type `make run` to run GOOM
 The project is an experiment and is still lacking a lot of
 features, such as shooting, enemy behavior, sound, menus, and more.
 
-![DEMO](/misc/goom-preview.gif?raw=true "DEMO")
+![DEMO](/resources/press/goom-preview.gif?raw=true "DEMO")
 
 # Development Setup
 

cmd/doom/internal/game/world.go

@@ -8,16 +8,16 @@ import (
 	"github.com/go-gl/mathgl/mgl32"
 
 	"github.com/tinogoehlert/goom"
-	"github.com/tinogoehlert/goom/geometry"
+	"github.com/tinogoehlert/goom/utils"
 	"github.com/tinogoehlert/goom/level"
 )
 
 // Wall a DOOM Wall
 type Wall struct {
-	Start   geometry.Vec2
-	End     geometry.Vec2
-	Normal  geometry.Vec2
-	Tangent geometry.Vec2
+	Start   utils.Vec2
+	End     utils.Vec2
+	Normal  utils.Vec2
+	Tangent utils.Vec2
 	Length  float32
 	Sides   struct {
 		Right *level.SideDef
@@ -149,7 +149,7 @@ func (w *World) SetPlayer(num int) error {
 
 // Update updates the world (monster think and player position)
 func (w *World) Update(t float32) {
-	ppos := geometry.V2(w.me.position[0], w.me.position[1])
+	ppos := utils.V2(w.me.position[0], w.me.position[1])
 	for _, m := range w.monsters {
 		if !m.IsCorpse() {
 			m.Update()
@@ -160,14 +160,14 @@ func (w *World) Update(t float32) {
 	for e := w.projectiles.Front(); e != nil; e = e.Next() {
 		var (
 			p       = e.Value.(*Projectile)
-			projPos = geometry.V2(p.position[0], p.position[1])
+			projPos = utils.V2(p.position[0], p.position[1])
 		)
 		for _, m := range w.monsters {
 			if m.IsCorpse() {
 				continue
 			}
 			if w.hitThing(m, p, m.sizeX, m.sizeY) {
-				mpos := geometry.V2(m.position[0], m.position[1])
+				mpos := utils.V2(m.position[0], m.position[1])
 				dist := ppos.DistanceTo(mpos)
 				w.projectiles.Remove(e)
 				m.Hit(p.damage, dist)

cmd/doom/internal/opengl/geometry.go

@@ -17,14 +17,14 @@ type glWorldGeometry struct {
 	seqTime  time.Time
 }
 
-func addGlWorldGeometry(dst []*glWorldGeometry, src *glWorldGeometry) []*glWorldGeometry {
+func addGlWorldutils(dst []*glWorldGeometry, src *glWorldGeometry) []*glWorldGeometry {
 	if src == nil {
 		return dst
 	}
 	return append(dst, src)
 }
 
-func newGlWorldGeometry(data []float32, light float32, texture []*glTexture) *glWorldGeometry {
+func newGlWorldutils(data []float32, light float32, texture []*glTexture) *glWorldGeometry {
 	m := &glWorldGeometry{
 		data:    data,
 		light:   light,

cmd/doom/internal/opengl/level.go

@@ -2,7 +2,7 @@ package opengl
 
 import (
 	"github.com/go-gl/gl/v2.1/gl"
-	"github.com/tinogoehlert/goom"
+	"github.com/tinogoehlert/goom/goom"
 	"github.com/tinogoehlert/goom/level"
 )
 
@@ -73,12 +73,12 @@ func (s *subSector) addFlats(md *level.Level, gd *goom.GameData, ts glTextureSto
 
 	s.sector = sector
 	if len(gd.Flat(sector.FloorTexture())) > 0 {
-		fm := newGlWorldGeometry(floorData, sector.LightLevel(), ts[sector.FloorTexture()])
-		s.floors = addGlWorldGeometry(s.floors, fm)
+		fm := newGlWorldutils(floorData, sector.LightLevel(), ts[sector.FloorTexture()])
+		s.floors = addGlWorldutils(s.floors, fm)
 	}
 	if len(gd.Flat(sector.CeilTexture())) > 0 {
-		cm := newGlWorldGeometry(ceilData, md.Sectors[side.Sector].LightLevel(), ts[sector.CeilTexture()])
-		s.ceilings = addGlWorldGeometry(s.ceilings, cm)
+		cm := newGlWorldutils(ceilData, md.Sectors[side.Sector].LightLevel(), ts[sector.CeilTexture()])
+		s.ceilings = addGlWorldutils(s.ceilings, cm)
 	}
 }
 
@@ -135,8 +135,8 @@ func (s *subSector) addWalls(md *level.Level, gd *goom.GameData, ts glTextureSto
 				-start.X(), sector.CeilHeight(), start.Y(), -sLen / tw, height / th,
 			}
 			if gd.Texture(side.Upper()) != nil {
-				wm := newGlWorldGeometry(wallData, sector.LightLevel(), ts[side.Upper()])
-				s.walls = addGlWorldGeometry(s.walls, wm)
+				wm := newGlWorldutils(wallData, sector.LightLevel(), ts[side.Upper()])
+				s.walls = addGlWorldutils(s.walls, wm)
 			}
 		}
 
@@ -159,8 +159,8 @@ func (s *subSector) addWalls(md *level.Level, gd *goom.GameData, ts glTextureSto
 				-start.X(), sector.FloorHeight(), start.Y(), -sLen / tw, height / th,
 			}
 			if gd.Texture(side.Lower()) != nil {
-				wm := newGlWorldGeometry(wallData, sector.LightLevel(), ts[side.Lower()])
-				s.walls = addGlWorldGeometry(s.walls, wm)
+				wm := newGlWorldutils(wallData, sector.LightLevel(), ts[side.Lower()])
+				s.walls = addGlWorldutils(s.walls, wm)
 			}
 		}
 
@@ -181,8 +181,8 @@ func (s *subSector) addWalls(md *level.Level, gd *goom.GameData, ts glTextureSto
 				-end.X(), sector.FloorHeight(), end.Y(), -eLen / tw, height / th,
 				-start.X(), sector.FloorHeight(), start.Y(), -sLen / tw, height / th,
 			}
-			wm := newGlWorldGeometry(wallData, sector.LightLevel(), ts[side.Middle()])
-			s.walls = addGlWorldGeometry(s.walls, wm)
+			wm := newGlWorldutils(wallData, sector.LightLevel(), ts[side.Middle()])
+			s.walls = addGlWorldutils(s.walls, wm)
 		}
 	}
 }

cmd/doom/internal/opengl/renderer.go

@@ -9,8 +9,8 @@ import (
 	"github.com/go-gl/glfw/v3.2/glfw"
 	"github.com/go-gl/mathgl/mgl32"
 
-	"github.com/tinogoehlert/goom"
-	"github.com/tinogoehlert/goom/cmd/doom/internal/game"
+	"github.com/tinogoehlert/goom/game"
+	"github.com/tinogoehlert/goom/goom"
 	"github.com/tinogoehlert/goom/graphics"
 	"github.com/tinogoehlert/goom/level"
 )
@@ -285,8 +285,9 @@ func (gr *GLRenderer) Loop(drawCB func(), inputCB func(win *glfw.Window, frameti
 	targetFrameTime := time.Second / time.Duration(gr.fpsCap)
 	for !gr.window.ShouldClose() {
 		t0 := time.Now()
-		gr.fbWidth, gr.fbHeight = gr.window.GetFramebufferSize()
-		gl.Viewport(0, 0, int32(gr.fbWidth), int32(gr.fbHeight))
+		gr.fbWidth = 1024
+		gr.fbHeight = 768
+		gl.Viewport(0, 0, 1024, 768)
 		// Do OpenGL stuff.
 		gl.Enable(gl.DEPTH_TEST)
 		gl.Clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)

cmd/doom/main.go

@@ -9,17 +9,18 @@ import (
 
 	"github.com/go-gl/glfw/v3.2/glfw"
 
-	"github.com/tinogoehlert/goom"
+	"github.com/tinogoehlert/goom/goom"
 	"github.com/tinogoehlert/goom/audio/midi"
-	"github.com/tinogoehlert/goom/cmd/doom/internal/game"
+	"github.com/tinogoehlert/goom/game"
 	"github.com/tinogoehlert/goom/cmd/doom/internal/opengl"
 	"github.com/tinogoehlert/goom/graphics"
 	"github.com/tinogoehlert/goom/level"
+	"github.com/tinogoehlert/goom/utils"
 )
 
 var (
 	shaderDir = "resources/shaders"
-	log       = goom.GoomConsole
+	log       = utils.GoomConsole
 )
 
 type renderStats struct {

cmd/maptest/main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/faiface/pixel/imdraw"
 	"github.com/faiface/pixel/pixelgl"
 	"github.com/tinogoehlert/goom"
-	"github.com/tinogoehlert/goom/geometry"
+	"github.com/tinogoehlert/goom/utils"
 	"github.com/ttacon/chalk"
 	"golang.org/x/image/colornames"
 )
@@ -133,7 +133,7 @@ func run() {
 			var (
 				ls  = e1m1.Vert(uint32(line.Start)).DivScalar(down)
 				le  = e1m1.Vert(uint32(line.End)).DivScalar(down)
-				mid = geometry.V2((ls.X()+le.X())/2, (ls.Y()+le.Y())/2)
+				mid = utils.V2((ls.X()+le.X())/2, (ls.Y()+le.Y())/2)
 			)
 
 			tangent := le.Sub(ls).Normalize()

drivers/audio.go

@@ -0,0 +1,4 @@
+package drivers
+
+type AudioDriver interface {
+}

drivers/glfw/glfw.go

@@ -0,0 +1,23 @@
+package glfw
+
+import (
+	"fmt"
+	"runtime"
+
+	"github.com/go-gl/glfw/v3.2/glfw"
+)
+
+// Init initialize glfw
+func Init() error {
+	runtime.LockOSThread()
+
+	if err := glfw.Init(); err != nil {
+		return fmt.Errorf("could not initialize GLFW: %s", err.Error())
+	}
+	return nil
+}
+
+// Destroy terminates the GLFW Driver
+func Destroy() {
+	glfw.Terminate()
+}

drivers/glfw/input.go

@@ -0,0 +1,45 @@
+package glfw
+
+import (
+	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/tinogoehlert/goom/drivers"
+)
+
+type Keycode int
+
+// InputDriver handles GLFW Input Events
+type InputDriver struct {
+	keyStates chan drivers.Key
+}
+
+// NewInputDriver creates a new GLFW Input Driver
+func NewInputDriver() *InputDriver {
+	return &InputDriver{
+		keyStates: make(chan drivers.Key, 2),
+	}
+}
+
+// Poll polls for events
+func (id *InputDriver) poll(win *Window) {
+	glfw.PollEvents()
+}
+
+// KeyStates returns a channel where key state changes will be published
+func (id *InputDriver) KeyStates() chan drivers.Key {
+	return id.keyStates
+}
+
+func (id *InputDriver) NormalizeKeyCode(key glfw.Key) drivers.Keycode {
+	switch key {
+	case glfw.KeyUp:
+		return drivers.KeyUp
+	case glfw.KeyDown:
+		return drivers.KeyDown
+	case glfw.KeyLeft:
+		return drivers.KeyLeft
+	case glfw.KeyRight:
+		return drivers.KeyRight
+	default:
+		return 0
+	}
+}

drivers/glfw/window.go

@@ -0,0 +1,108 @@
+package glfw
+
+import (
+	"fmt"
+
+	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/tinogoehlert/goom/drivers"
+)
+
+// Window GLFW implementation for Window
+type Window struct {
+	window        *glfw.Window
+	width         int
+	height        int
+	fbWidth       int
+	fbHeight      int
+	secsPerUpdate float64
+	fbSizeChanged func(width int, height int)
+	inputDrv      *InputDriver
+}
+
+// NewWindow creates a new GLFW Window
+func NewWindow(title string, width, height int) (*Window, error) {
+	glfw.WindowHint(glfw.Resizable, glfw.True)
+	glfw.WindowHint(glfw.ContextVersionMajor, 3)
+	glfw.WindowHint(glfw.ContextVersionMinor, 2)
+	glfw.WindowHint(glfw.OpenGLProfile, glfw.OpenGLCoreProfile)
+	glfw.WindowHint(glfw.OpenGLForwardCompatible, glfw.True)
+	glfwWin, err := glfw.CreateWindow(width, height, title, nil, nil)
+	if err != nil {
+		return nil, fmt.Errorf("could not create GLFW Window: %s", err.Error())
+	}
+	glfwWin.MakeContextCurrent()
+	win := &Window{
+		window:        glfwWin,
+		width:         width,
+		height:        height,
+		secsPerUpdate: 1.0 / 120.0,
+		inputDrv:      NewInputDriver(),
+	}
+
+	win.fbWidth, win.fbHeight = glfwWin.GetFramebufferSize()
+
+	glfwWin.SetFramebufferSizeCallback(func(w *glfw.Window, width int, height int) {
+		win.fbWidth = width
+		win.fbHeight = height
+		if win.fbSizeChanged != nil {
+			win.fbSizeChanged(width, height)
+		}
+	})
+
+	glfwWin.SetSizeCallback(func(w *glfw.Window, width int, height int) {
+		win.width = width
+		win.height = height
+	})
+
+	return win, nil
+}
+
+func (w *Window) Input() drivers.InputDriver {
+	return w.inputDrv
+}
+
+// Size Returns the current size of the Window
+func (w *Window) Size() (int, int) {
+	return w.width, w.height
+}
+
+// Size Returns the current size of the Window
+func (w *Window) FrameBufferSize() (int, int) {
+	return w.fbWidth, w.fbHeight
+}
+
+func (w *Window) onKeyCallback(win *glfw.Window, key glfw.Key, scancode int, action glfw.Action, mods glfw.ModifierKey) {
+	w.inputDrv.keyStates <- drivers.Key{
+		Keycode: w.inputDrv.NormalizeKeyCode(key),
+		State:   drivers.KeyState(action),
+	}
+}
+
+// Run runs the window loop
+func (w *Window) Run(loop func(elapsed float32)) {
+	var (
+		previous = glfw.GetTime()
+	)
+
+	w.window.SetKeyCallback(w.onKeyCallback)
+
+	for !w.window.ShouldClose() {
+		var (
+			frameTime = glfw.GetTime() - previous
+			waitTime  = w.secsPerUpdate - frameTime
+		)
+		loop(float32(waitTime))
+		if waitTime > 0 {
+			glfw.WaitEventsTimeout(waitTime)
+		}
+
+		w.window.SwapBuffers()
+		glfw.PollEvents()
+		previous = glfw.GetTime()
+	}
+}
+
+// Close closes the window
+func (w *Window) Close() {
+	w.window.Destroy()
+}