Skip to content

Generalize reverse symmetry concept #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Sheikah45 wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

Generalize reverse symmetry concept #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e05f6d2
Move symmetry bound functions to dedicated util
Sheikah45 Jul 14, 2024
4d2a1d0
WIP
Sheikah45 Jul 15, 2024
152a19e
WIP
Sheikah45 Jul 15, 2024
6100ce0
Fix issue with quad symmetry
Sheikah45 Sep 13, 2024
4935b79
Fix issues with pathing
Sheikah45 Sep 15, 2024
4efaf9f
Fix issues with pathing
Sheikah45 Sep 15, 2024
364dc6e
Fix rebase issue
Sheikah45 Sep 18, 2024
a530777
Fix tests
Sheikah45 Sep 18, 2024
56678dc
WIP
Sheikah45 Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions generator/src/main/java/com/faforever/neroxis/generator/terrain/BasicTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import com.faforever.neroxis.brushes.Brushes;
import com.faforever.neroxis.generator.GeneratorParameters;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.map.SymmetrySettings;
import com.faforever.neroxis.mask.BooleanMask;
import com.faforever.neroxis.mask.FloatMask;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.vector.Vector2;
import com.faforever.neroxis.util.Pipeline;
import com.faforever.neroxis.util.vector.Vector3;

import java.util.List;

public class BasicTerrainGenerator extends TerrainGenerator {
protected BooleanMask spawnLandMask;
protected BooleanMask spawnPlateauMask;
Expand Down Expand Up @@ -145,9 +149,18 @@ protected void teamConnectionsSetup() {
int numTeammateConnections = 1;
connections.setSize(map.getSize() + 1);

MapMaskMethods.connectTeamsAroundCenter(map, random.nextLong(), connections, minMiddlePoints, maxMiddlePoints,
List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.connectTeamsAroundCenter(team0SpawnLocations, random.nextLong(), connections, minMiddlePoints,
maxMiddlePoints,
numTeamConnections, maxStepSize, 32);
MapMaskMethods.connectTeammates(map, random.nextLong(), connections, maxMiddlePoints, numTeammateConnections,
MapMaskMethods.connectTeammates(team0SpawnLocations, random.nextLong(), connections, maxMiddlePoints,
numTeammateConnections,
maxStepSize);
}

Expand Down
15 changes: 14 additions & 1 deletion ...tor/src/main/java/com/faforever/neroxis/generator/terrain/BigIslandsTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
import com.faforever.neroxis.generator.ParameterConstraints;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.SymmetrySettings;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.mask.BooleanMask;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.Pipeline;
import com.faforever.neroxis.util.vector.Vector2;

import java.util.List;

public class BigIslandsTerrainGenerator extends PathedTerrainGenerator {

Expand Down Expand Up @@ -35,7 +39,16 @@ protected void landSetup() {
float maxStepSize = mapSize / 128f;

land.setSize(mapSize + 1);
MapMaskMethods.pathAroundSpawns(map, random.nextLong(), land, maxStepSize, numPaths, maxMiddlePoints, bound,

List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.pathAroundSpawns(team0SpawnLocations, random.nextLong(), land, maxStepSize, numPaths,
maxMiddlePoints, bound,
(float) StrictMath.PI / 2);
land.inflate(maxStepSize).setSize(mapSize / 4);

Expand Down
17 changes: 15 additions & 2 deletions ...or/src/main/java/com/faforever/neroxis/generator/terrain/DropPlateauTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

import com.faforever.neroxis.generator.GeneratorParameters;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.map.SymmetrySettings;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.Pipeline;
import com.faforever.neroxis.util.vector.Vector2;

import java.util.List;

public class DropPlateauTerrainGenerator extends PathedTerrainGenerator {

Expand Down Expand Up @@ -32,9 +36,18 @@ protected void teamConnectionsSetup() {

connections.setSize(mapSize + 1);

MapMaskMethods.connectTeamsAroundCenter(map, random.nextLong(), connections, minMiddlePoints, maxMiddlePoints,
List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.connectTeamsAroundCenter(team0SpawnLocations, random.nextLong(), connections, minMiddlePoints,
maxMiddlePoints,
numTeamConnections, maxStepSize, 32);
MapMaskMethods.connectTeammates(map, random.nextLong(), connections, maxMiddlePoints, numTeammateConnections,
MapMaskMethods.connectTeammates(team0SpawnLocations, random.nextLong(), connections, maxMiddlePoints,
numTeammateConnections,
maxStepSize);
}

Expand Down
19 changes: 16 additions & 3 deletions ...tor/src/main/java/com/faforever/neroxis/generator/terrain/LandBridgeTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.faforever.neroxis.generator.terrain;

import com.faforever.neroxis.generator.ParameterConstraints;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.vector.Vector2;

import java.util.List;

public class LandBridgeTerrainGenerator extends PathedTerrainGenerator {

Expand All @@ -20,9 +24,18 @@ protected void landSetup() {
int numPaths = 32 / generatorParameters.spawnCount();

land.setSize(mapSize + 1);
MapMaskMethods.connectTeammates(map, random.nextLong(), land, 8, 2, maxStepSize);
MapMaskMethods.connectTeams(map, random.nextLong(), land, 0, 2, 1, maxStepSize);
MapMaskMethods.pathAroundSpawns(map, random.nextLong(), land, maxStepSize, numPaths, 4, mapSize / 6,

List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.connectTeammates(team0SpawnLocations, random.nextLong(), land, 8, 2, maxStepSize);
MapMaskMethods.connectTeams(team0SpawnLocations, random.nextLong(), land, 0, 2, 1, maxStepSize);
MapMaskMethods.pathAroundSpawns(team0SpawnLocations, random.nextLong(), land, maxStepSize, numPaths, 4,
mapSize / 6,
(float) (StrictMath.PI / 2f));
land.inflate(maxStepSize);
land.setSize(mapSize / 8);
Expand Down
35 changes: 29 additions & 6 deletions ...ator/src/main/java/com/faforever/neroxis/generator/terrain/OneIslandTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import com.faforever.neroxis.generator.GeneratorParameters;
import com.faforever.neroxis.generator.ParameterConstraints;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.map.SymmetrySettings;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.Pipeline;
import com.faforever.neroxis.util.vector.Vector2;

import java.util.List;

public class OneIslandTerrainGenerator extends PathedTerrainGenerator {

Expand All @@ -32,9 +36,18 @@ protected void teamConnectionsSetup() {
int numTeammateConnections = 1;
connections.setSize(map.getSize() + 1);

MapMaskMethods.connectTeams(map, random.nextLong(), connections, minMiddlePoints, maxMiddlePoints,
List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.connectTeams(team0SpawnLocations, random.nextLong(), connections, minMiddlePoints,
maxMiddlePoints,
numTeamConnections, maxStepSize);
MapMaskMethods.connectTeammates(map, random.nextLong(), connections, maxMiddlePoints, numTeammateConnections,
MapMaskMethods.connectTeammates(team0SpawnLocations, random.nextLong(), connections, maxMiddlePoints,
numTeammateConnections,
maxStepSize);
}

Expand All @@ -44,9 +57,9 @@ protected void landSetup() {
int minMiddlePoints = 2;
int maxMiddlePoints = 4;
int numTeamConnections = (int) (4 * landDensity + 4) / symmetrySettings.spawnSymmetry()
.getNumSymPoints();
.getNumSymPoints();
int numTeammateConnections = (int) (2 * landDensity + 2) / symmetrySettings.spawnSymmetry()
.getNumSymPoints();
.getNumSymPoints();
int numWalkers = (int) (8 * landDensity + 8) / symmetrySettings.spawnSymmetry().getNumSymPoints();
int bound = (int) (mapSize / 64 * (16 * (random.nextFloat() * .25f + (1 - landDensity) * .75f)))
+ mapSize / 8;
Expand All @@ -59,9 +72,19 @@ protected void landSetup() {
.fillEdge((int) (mapSize / 8 * (1 - landDensity) + mapSize / 8), false)
.inflate(mapSize / 64f)
.blur(12, .125f));
MapMaskMethods.connectTeamsAroundCenter(map, random.nextLong(), land, minMiddlePoints, maxMiddlePoints,

List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.connectTeamsAroundCenter(team0SpawnLocations, random.nextLong(), land, minMiddlePoints,
maxMiddlePoints,
numTeamConnections, maxStepSize, 32);
MapMaskMethods.connectTeammates(map, random.nextLong(), land, maxMiddlePoints, numTeammateConnections,
MapMaskMethods.connectTeammates(team0SpawnLocations, random.nextLong(), land, maxMiddlePoints,
numTeammateConnections,
maxStepSize);
land.inflate(mapSize / 128f).setSize(mapSize / 8);
land.dilute(.5f, 8).erode(.5f, 6);
Expand Down
15 changes: 14 additions & 1 deletion ...r/src/main/java/com/faforever/neroxis/generator/terrain/SmallIslandsTerrainGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
import com.faforever.neroxis.generator.GeneratorParameters;
import com.faforever.neroxis.generator.ParameterConstraints;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.Spawn;
import com.faforever.neroxis.map.SymmetrySettings;
import com.faforever.neroxis.mask.BooleanMask;
import com.faforever.neroxis.mask.MapMaskMethods;
import com.faforever.neroxis.util.Pipeline;
import com.faforever.neroxis.util.vector.Vector2;

import java.util.List;

public class SmallIslandsTerrainGenerator extends PathedTerrainGenerator {

Expand Down Expand Up @@ -38,7 +42,16 @@ protected void landSetup() {


land.setSize(mapSize + 1);
MapMaskMethods.pathAroundSpawns(map, random.nextLong(), land, maxStepSize, numPaths, maxMiddlePoints, bound,

List<Vector2> team0SpawnLocations = map.getSpawns()
.stream()
.filter(spawn -> spawn.getTeamID() == 0)
.map(Spawn::getPosition)
.map(Vector2::new)
.toList();

MapMaskMethods.pathAroundSpawns(team0SpawnLocations, random.nextLong(), land, maxStepSize, numPaths,
maxMiddlePoints, bound,
(float) StrictMath.PI / 2);
land.inflate(maxStepSize).setSize(mapSize / 4);

Expand Down
15 changes: 15 additions & 0 deletions shared/src/main/java/com/faforever/neroxis/map/SymmetrySettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ public record SymmetrySettings(
Symmetry teamSymmetry,
Symmetry spawnSymmetry
) {

public SymmetrySettings {
if (terrainSymmetry.getNumSymPoints() % teamSymmetry.getNumSymPoints() != 0) {
throw new IllegalArgumentException("Team symmetry not a multiple of terrain symmetry");
}

if (terrainSymmetry.getNumSymPoints() % spawnSymmetry.getNumSymPoints() != 0) {
throw new IllegalArgumentException("Spawn symmetry not a multiple of terrain symmetry");
}

if (spawnSymmetry.getNumSymPoints() % teamSymmetry.getNumSymPoints() != 0) {
throw new IllegalArgumentException("Spawn symmetry not a multiple of team symmetry");
}
}

public SymmetrySettings(Symmetry symmetry) {
this(symmetry, symmetry, symmetry);
}
Expand Down
Loading
Loading