mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small refactor in GetObject

Browse source
This commit is contained in:
Marc Di Luzio 2020-07-19 18:27:58 +01:00
parent ddbbdce1f8
commit c48274eb23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/atlas/worldgen.go
View file

@ -48,23 +48,22 @@ func (g *NoiseWorldGen) GetTile(v maths.Vector) roveapi.Tile {
} }
// GetObject returns the chosen object at a location // GetObject returns the chosen object at a location
func (g *NoiseWorldGen) GetObject(v maths.Vector) Object { func (g *NoiseWorldGen) GetObject(v maths.Vector) (obj Object) {
o := g.noise.Eval2(float64(v.X)/rockNoiseScale, float64(v.Y)/rockNoiseScale) o := g.noise.Eval2(float64(v.X)/rockNoiseScale, float64(v.Y)/rockNoiseScale)
var obj = roveapi.Object_ObjectUnknown
switch { switch {
case o > 0.6: case o > 0.6:
obj = roveapi.Object_RockLarge obj.Type = roveapi.Object_RockLarge
case o > 0.5: case o > 0.5:
obj = roveapi.Object_RockSmall obj.Type = roveapi.Object_RockSmall
} }
// Very rarely spawn a dormant rover // Very rarely spawn a dormant rover
if obj == roveapi.Object_ObjectUnknown { if obj.Type == roveapi.Object_ObjectUnknown {
o = g.noise.Eval2(float64(v.X)/dormantRoverScale, float64(v.Y)/dormantRoverScale) o = g.noise.Eval2(float64(v.X)/dormantRoverScale, float64(v.Y)/dormantRoverScale)
if o > 0.8 { if o > 0.8 {
obj = roveapi.Object_RoverDormant obj.Type = roveapi.Object_RoverDormant
} }
} }
return Object{Type: roveapi.Object(obj)} return obj
} }