Merge pull request #346 from markus-wa/examples-use-radar-overviews.csgo.saiko.tech

examples: use radar-overviews.csgo.saiko.tech for radar images and offsets

Author: markus-wa

examples/README.md

@@ -2,6 +2,8 @@
 
 Here you can find a overview of examples on how to use demoinfocs-golang.
 
+:information_source: Example code may not be production ready - specifically error handling and such is done in a simplified way and should not be used in critical systems as-is.
+
 |Example|Description
 |-|-|
 |[heatmap](heatmap)|Creating a heatmap from positions where players fired shots from|

examples/common.go

@@ -1,10 +1,17 @@
 package examples
 
 import (
+	"encoding/json"
 	"flag"
+	"fmt"
+	"image"
 	"io"
 	"io/ioutil"
+	"net/http"
 	"os"
+
+	"github.com/golang/geo/r2"
+	"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/metadata"
 )
 
 // DemoPathFromArgs returns the value of the -demo command line flag.
@@ -24,15 +31,20 @@ func DemoPathFromArgs() string {
 	return demPath
 }
 
+func checkError(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
 // RedirectStdout redirects standard output to dev null.
 // Panics if an error occurs.
 func RedirectStdout(f func()) {
 	// Redirect stdout, the resulting image is written to this
 	old := os.Stdout
+
 	r, w, err := os.Pipe()
-	if err != nil {
-		panic(err)
-	}
+	checkError(err)
 
 	os.Stdout = w
 
@@ -46,3 +58,57 @@ func RedirectStdout(f func()) {
 
 	os.Stdout = old
 }
+
+type mapMetadata struct {
+	PosX  float64 `json:"pos_x,string"`
+	PosY  float64 `json:"pos_y,string"`
+	Scale float64 `json:"scale,string"`
+}
+
+// GetMapMetadata fetches metadata for a specific map version from
+// `https://radar-overviews.csgo.saiko.tech/<map>/<crc>/info.json`.
+// Panics if any error occurs.
+func GetMapMetadata(name string, crc uint32) metadata.Map {
+	url := fmt.Sprintf("https://radar-overviews.csgo.saiko.tech/%s/%d/info.json", name, crc)
+
+	resp, err := http.Get(url)
+	checkError(err)
+
+	defer resp.Body.Close()
+
+	var data map[string]mapMetadata
+
+	err = json.NewDecoder(resp.Body).Decode(&data)
+	checkError(err)
+
+	mapInfo, ok := data[name]
+	if !ok {
+		panic(fmt.Sprintf("failed to get map info.json entry for %q", name))
+	}
+
+	return metadata.Map{
+		Name: name,
+		PZero: r2.Point{
+			X: mapInfo.PosX,
+			Y: mapInfo.PosY,
+		},
+		Scale: mapInfo.Scale,
+	}
+}
+
+// GetMapMetadata fetches metadata for a specific map version from
+// `https://radar-overviews.csgo.saiko.tech/<map>/<crc>/info.json`.
+// Panics if any error occurs.
+func GetMapRadar(name string, crc uint32) image.Image {
+	url := fmt.Sprintf("https://radar-overviews.csgo.saiko.tech/%s/%d/radar.png", name, crc)
+
+	resp, err := http.Get(url)
+	checkError(err)
+
+	defer resp.Body.Close()
+
+	img, _, err := image.Decode(resp.Body)
+	checkError(err)
+
+	return img
+}

examples/heatmap/README.md

@@ -2,6 +2,8 @@
 
 This example shows how to create a heatmap from positions where players fired their weapons from.
 
+:information_source: Uses radar images from `https://radar-overviews.csgo.saiko.tech/<map>/<crc>/radar.png` - see https://github.com/saiko-tech/csgo-centrifuge for more info.
+
 See `heatmap.go` for the source code.
 
 ## Running the example

examples/heatmap/heatmap.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"image"
 	"image/draw"
 	"image/jpeg"
@@ -15,6 +14,7 @@ import (
 	demoinfocs "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs"
 	events "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/events"
 	metadata "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/metadata"
+	"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg"
 )
 
 const (
@@ -31,6 +31,7 @@ func main() {
 
 	f, err := os.Open(ex.DemoPathFromArgs())
 	checkError(err)
+
 	defer f.Close()
 
 	p := demoinfocs.NewParser(f)
@@ -40,11 +41,22 @@ func main() {
 	header, err := p.ParseHeader()
 	checkError(err)
 
-	// Get metadata for the map that the game was played on for coordinate translations
-	mapMetadata := metadata.MapNameToMap[header.MapName]
+	var (
+		mapMetadata metadata.Map
+		mapRadarImg image.Image
+	)
+
+	p.RegisterNetMessageHandler(func(msg *msg.CSVCMsg_ServerInfo) {
+		// Get metadata for the map that the game was played on for coordinate translations
+		mapMetadata = ex.GetMapMetadata(header.MapName, msg.MapCrc)
+
+		// Load map overview image
+		mapRadarImg = ex.GetMapRadar(header.MapName, msg.MapCrc)
+	})
 
 	// Register handler for WeaponFire, triggered every time a shot is fired
 	var points []r2.Point
+
 	p.RegisterEventHandler(func(e events.WeaponFire) {
 		// Translate positions from in-game coordinates to radar overview image pixels
 		x, y := mapMetadata.TranslateScale(e.Shooter.Position().X, e.Shooter.Position().Y)
@@ -69,7 +81,8 @@ func main() {
 	}
 
 	// Transform r2.Points into heatmap.DataPoints
-	var data []heatmap.DataPoint
+	data := make([]heatmap.DataPoint, 0, len(points))
+
 	for _, p := range points[1:] {
 		// Invert Y since go-heatmap expects data to be ordered from bottom to top
 		data = append(data, heatmap.P(p.X, p.Y*-1))
@@ -79,15 +92,9 @@ func main() {
 	// Drawing the image
 	//
 
-	// Load map overview image
-	fMap, err := os.Open(fmt.Sprintf("../../assets/maps/%s.jpg", header.MapName))
-	checkError(err)
-	imgMap, _, err := image.Decode(fMap)
-	checkError(err)
-
 	// Create output canvas and use map overview image as base
-	img := image.NewRGBA(imgMap.Bounds())
-	draw.Draw(img, imgMap.Bounds(), imgMap, image.Point{}, draw.Over)
+	img := image.NewRGBA(mapRadarImg.Bounds())
+	draw.Draw(img, mapRadarImg.Bounds(), mapRadarImg, image.Point{}, draw.Over)
 
 	// Generate and draw heatmap overlay on top of the overview
 	imgHeatmap := heatmap.Heatmap(image.Rect(0, 0, bounds.Dx(), bounds.Dy()), data, dotSize, opacity, schemes.AlphaFire)

examples/heatmap/heatmap_test.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 	"testing"
-	
+
 	"github.com/markus-wa/demoinfocs-golang/v2/examples"
 )
 

examples/nade-trajectories/README.md

@@ -2,6 +2,8 @@
 
 This example shows how to create a overview of grenade trajectories of a match.
 
+:information_source: Uses radar images from `https://radar-overviews.csgo.saiko.tech/<map>/<crc>/radar.png` - see https://github.com/saiko-tech/csgo-centrifuge for more info.
+
 ## Running the example
 
 `go run nade_trajectories.go -demo /path/to/demo > out.jpg`

examples/nade-trajectories/nade_trajectories.go

@@ -6,7 +6,6 @@ import (
 	"image/color"
 	"image/draw"
 	"image/jpeg"
-	_ "image/jpeg"
 	"os"
 
 	"github.com/golang/geo/r2"
@@ -18,6 +17,7 @@ import (
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
 	events "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/events"
 	metadata "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/metadata"
+	"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg"
 )
 
 type nadePath struct {
@@ -43,6 +43,7 @@ var curMap metadata.Map
 func main() {
 	f, err := os.Open(ex.DemoPathFromArgs())
 	checkError(err)
+
 	defer f.Close()
 
 	p := demoinfocs.NewParser(f)
@@ -51,7 +52,17 @@ func main() {
 	header, err := p.ParseHeader()
 	checkError(err)
 
-	curMap = metadata.MapNameToMap[header.MapName]
+	var (
+		mapRadarImg image.Image
+	)
+
+	p.RegisterNetMessageHandler(func(msg *msg.CSVCMsg_ServerInfo) {
+		// Get metadata for the map that the game was played on for coordinate translations
+		curMap = ex.GetMapMetadata(header.MapName, msg.MapCrc)
+
+		// Load map overview image
+		mapRadarImg = ex.GetMapRadar(header.MapName, msg.MapCrc)
+	})
 
 	nadeTrajectories := make(map[int64]*nadePath) // Trajectories of all destroyed nades
 
@@ -103,18 +114,11 @@ func main() {
 	err = p.ParseToEnd()
 	checkError(err)
 
-	// Use map overview as base image
-	fMap, err := os.Open(fmt.Sprintf("../../assets/maps/%s.jpg", header.MapName))
-	checkError(err)
-
-	imgMap, _, err := image.Decode(fMap)
-	checkError(err)
-
 	// Create output canvas
-	dest := image.NewRGBA(imgMap.Bounds())
+	dest := image.NewRGBA(mapRadarImg.Bounds())
 
 	// Draw image
-	draw.Draw(dest, dest.Bounds(), imgMap, image.ZP, draw.Src)
+	draw.Draw(dest, dest.Bounds(), mapRadarImg, image.Point{}, draw.Src)
 
 	// Initialize the graphic context
 	gc := draw2dimg.NewGraphicContext(dest)