diff --git a/map-generator/README.md b/map-generator/README.md index 90d5d2cc0..1ba6d42f2 100644 --- a/map-generator/README.md +++ b/map-generator/README.md @@ -17,6 +17,16 @@ This is a tool to generate map files for OpenFront. 5. Run the generator: `go run .` 6. Find the output folder at `../resources/maps/` +By default, this will process all defined maps. + +Use `--maps` to process a single map: + +`go run . --maps=fourislands` + +To process a subset of maps, pass a comma-separated list: + +`go run . --maps=northamerica,world` + ## Create image.png 1. [Download world map (warning very large file)](https://drive.google.com/file/d/1W2oMPj1L5zWRyPhh8LfmnY3_kve-FBR2/view?usp=sharing) diff --git a/map-generator/main.go b/map-generator/main.go index b465c024e..d9a0e7d76 100644 --- a/map-generator/main.go +++ b/map-generator/main.go @@ -2,13 +2,17 @@ package main import ( "encoding/json" + "flag" "fmt" "log" "os" "path/filepath" + "strings" "sync" ) +var mapsFlag string + var maps = []struct { Name string IsTest bool @@ -162,13 +166,41 @@ func processMap(name string, isTest bool) error { return nil } +func parseMapsFlag() (map[string]bool, error) { + if mapsFlag == "" { + return nil, nil + } + + validNames := make(map[string]bool, len(maps)) + for _, m := range maps { + validNames[m.Name] = true + } + + selected := make(map[string]bool) + for _, name := range strings.Split(mapsFlag, ",") { + if !validNames[name] { + return nil, fmt.Errorf("map %q is not defined", name) + } + selected[name] = true + } + return selected, nil +} + func loadTerrainMaps() error { + selectedMaps, err := parseMapsFlag() + if err != nil { + return err + } var wg sync.WaitGroup errChan := make(chan error, len(maps)) // Process maps concurrently for _, mapItem := range maps { + if selectedMaps != nil && !selectedMaps[mapItem.Name] { + continue + } wg.Add(1) + mapItem := mapItem go func() { defer wg.Done() if err := processMap(mapItem.Name, mapItem.IsTest); err != nil { @@ -192,6 +224,9 @@ func loadTerrainMaps() error { } func main() { + flag.StringVar(&mapsFlag, "maps", "", "optional comma-separated list of maps to process. ex: --maps=world,eastasia,big_plains") + flag.Parse() + if err := loadTerrainMaps(); err != nil { log.Fatalf("Error generating terrain maps: %v", err) }