Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erekir gen fix

Browse Source
This commit is contained in:
Anuken
2022-01-13 23:33:12 -05:00
parent cfbfa0844d
commit 580e830300
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/shaders/planet.vert
View File

@@ -20,7 +20,7 @@ void main(){
vec3 lightReflect = normalize(reflect(a_normal, u_lightdir)); vec3 lightReflect = normalize(reflect(a_normal, u_lightdir));
float specularFactor = dot(u_camdir, lightReflect); float specularFactor = dot(u_camdir, lightReflect);
if(specularFactor > 0.0){ if(specularFactor > 0.0){
specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a); //specular power = 32 specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a);
} }
vec3 norc = (u_ambientColor + specular) * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0))); vec3 norc = (u_ambientColor + specular) * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));

2
core/src/mindustry/content/Blocks.java
View File

@@ -633,7 +633,7 @@ public class Blocks{
yellowStoneBoulder = new Prop("yellow-stone-boulder"){{ yellowStoneBoulder = new Prop("yellow-stone-boulder"){{
variants = 2; variants = 2;
yellowStone.asFloor().decoration = this; yellowStone.asFloor().decoration = regolith.asFloor().decoration = this;
}}; }};
metalFloor = new Floor("metal-floor", 0); metalFloor = new Floor("metal-floor", 0);

4
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -132,8 +132,8 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
float maxd = Mathf.dst(width/2f, height/2f); float maxd = Mathf.dst(width/2f, height/2f);
erase(spawnX, spawnY, 15); erase(spawnX, spawnY, 15);
brush(pathfind(spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 300f : 0f) + maxd - tile.dst(width/2f, height/2f)/10f, Astar.manhattan), 7); brush(pathfind(spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 300f : 0f) + maxd - tile.dst(width/2f, height/2f)/10f, Astar.manhattan), 9);
erase(endX, endY, 12); erase(endX, endY, 15);
//arkycite //arkycite
pass((x, y) -> { pass((x, y) -> {