Return time.Duration where applicable

FrameTime(), TickTime() + CurrentTime()
Also added DemoHeader.TickRate()

Author: markus-wa

common/structs.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"math/rand"
+	"time"
 
 	r3 "github.com/golang/geo/r3"
 	s2 "github.com/golang/geo/s2"
@@ -26,14 +27,24 @@ type DemoHeader struct {
 
 // FrameRate returns the frame rate of the demo (frames / demo-ticks per second).
 // Not necessarily the tick-rate the server ran on during the game.
-// VolvoPlx128TixKTnxBye
 func (h DemoHeader) FrameRate() float32 {
 	return float32(h.PlaybackFrames) / h.PlaybackTime
 }
 
 // FrameTime returns the time a frame / demo-tick takes in seconds.
-func (h DemoHeader) FrameTime() float32 {
-	return h.PlaybackTime / float32(h.PlaybackFrames)
+func (h DemoHeader) FrameTime() time.Duration {
+	return time.Duration(h.PlaybackTime / float32(h.PlaybackFrames) * float32(time.Second))
+}
+
+// TickRate returns the tick-rate the server ran on during the game.
+// VolvoPlx128TixKTnxBye
+func (h DemoHeader) TickRate() float32 {
+	return float32(h.PlaybackTicks) / h.PlaybackTime
+}
+
+// TickTime returns the time a single tick takes in seconds.
+func (h DemoHeader) TickTime() time.Duration {
+	return time.Duration(h.PlaybackTime / float32(h.PlaybackTicks) * float32(time.Second))
 }
 
 // Player contains mostly game-relevant player information.

demoinfocs_test.go

@@ -59,7 +59,7 @@ func TestDemoInfoCs(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	fmt.Printf("Header: %v - FrameRate()=%.2f frames/s ; FrameTime()=%.1fms\n", h, h.FrameRate(), h.FrameTime()*1000)
+	fmt.Printf("Header: %v - FrameRate()=%.2f frames/s ; FrameTime()=%s ; TickRate()=%.2f frames/s ; TickTime()=%s\n", h, h.FrameRate(), h.FrameTime(), h.TickRate(), h.TickTime())
 	h2 := p.Header()
 	if h != h2 {
 		t.Errorf("Headers returned by ParseHeader() & Header(), respectively, aren't equal; ParseHeader(): %v - Header(): %v", h, h2)
@@ -93,7 +93,7 @@ func TestDemoInfoCs(t *testing.T) {
 		ingameTick := gs.IngameTick()
 		currentFrame := p.CurrentFrame()
 		// Score + 1 for winner because it hasn't actually been updated yet
-		fmt.Printf("Round finished: score=%d:%d ; winnerSide=%s ; clanName=%q ; teamId=%d ; teamFlag=%s ; ingameTime=%.1fs ; progress=%.1f%% ; tick=%d ; frame=%d\n", winner.Score()+1, loser.Score(), winnerSide, winnerClan, winnerId, winnerFlag, ingameTime, progressPercent, ingameTick, currentFrame)
+		fmt.Printf("Round finished: score=%d:%d ; winnerSide=%s ; clanName=%q ; teamId=%d ; teamFlag=%s ; ingameTime=%s ; progress=%.1f%% ; tick=%d ; frame=%d\n", winner.Score()+1, loser.Score(), winnerSide, winnerClan, winnerId, winnerFlag, ingameTime, progressPercent, ingameTick, currentFrame)
 		if len(winnerClan) == 0 || winnerId == 0 || len(winnerFlag) == 0 || ingameTime == 0 || progressPercent == 0 || ingameTick == 0 || currentFrame == 0 {
 			t.Error("Unexprected default value, check output of last round")
 		}

parser.go

@@ -3,6 +3,7 @@ package demoinfocs
 import (
 	"io"
 	"sync"
+	"time"
 
 	r3 "github.com/golang/geo/r3"
 	dp "github.com/markus-wa/godispatch"
@@ -104,9 +105,9 @@ func (p *Parser) CurrentFrame() int {
 	return p.currentFrame
 }
 
-// CurrentTime returns the ingame time in seconds since the start of the demo.
-func (p *Parser) CurrentTime() float32 {
-	return float32(p.currentFrame) * p.header.FrameTime()
+// CurrentTime returns the time elapsed since the start of the demo
+func (p *Parser) CurrentTime() time.Duration {
+	return time.Duration(p.currentFrame) * p.header.FrameTime()
 }
 
 // Progress returns the parsing progress from 0 to 1.