diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7869dcf8e3..1f558854f3 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -943,6 +943,7 @@ block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.grass.name = Grass block.slag.name = Slag +block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall block.pebbles.name = Pebbles diff --git a/core/assets/shaders/space.frag b/core/assets/shaders/space.frag index 0818522c47..1c13446c27 100755 --- a/core/assets/shaders/space.frag +++ b/core/assets/shaders/space.frag @@ -1,5 +1,5 @@ #define HIGHP -#define NSCALE 2000.0 +#define NSCALE 1800.0 #define CAMSCALE (NSCALE*1.1) uniform sampler2D u_texture; @@ -17,7 +17,7 @@ void main(){ vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y); vec4 color = texture2D(u_texture, c); - color.rgb = texture2D(u_stars, coords / NSCALE + vec2(0.5, 0.3) - u_ccampos / CAMSCALE); + color.rgb = texture2D(u_stars, coords / NSCALE + vec2(0.3, 0.3) - u_ccampos / CAMSCALE).rgb; gl_FragColor = color; } \ No newline at end of file diff --git a/core/assets/sprites/space.png b/core/assets/sprites/space.png new file mode 100644 index 0000000000..0099b68f39 Binary files /dev/null and b/core/assets/sprites/space.png differ diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index 9d17cfcfc5..920729e608 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -146,7 +146,7 @@ public class Effect{ if(headless || region == null || !Core.atlas.isFound(region)) return; Tile tile = world.tileWorld(x, y); - if(tile == null || tile.floor().isLiquid) return; + if(tile == null || !tile.floor().hasSurface()) return; Decal decal = Decal.create(); decal.set(x, y); diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index b82567209d..61506ba545 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -197,13 +197,14 @@ public class Shaders{ } } + //seed: 8kmfuix03fw public static class SpaceShader extends SurfaceShader{ Texture texture; public SpaceShader(String frag){ super(frag); - Core.assets.load("cubemaps/stars/bottom.png", Texture.class).loaded = t -> { + Core.assets.load("sprites/space.png", Texture.class).loaded = t -> { texture = (Texture)t; texture.setFilter(TextureFilter.linear); texture.setWrap(TextureWrap.mirroredRepeat); diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index e0e76c0cee..e3eb74a7b5 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -23,10 +23,6 @@ public class PlanetRenderer implements Disposable{ shadowColor = new Color(0, 0, 0, 0.7f); private static final Seq points = new Seq<>(); - private static final PlanetInterfaceRenderer emptyRenderer = new PlanetInterfaceRenderer(){ - @Override public void renderSectors(Planet planet){} - @Override public void renderProjections(){} - }; /** Camera direction relative to the planet. Length is determined by zoom. */ public final Vec3 camPos = new Vec3(); diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 4f3c548aea..a7b667dcd8 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -175,7 +175,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } } } - } if(launchSector != null){