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

Planet render cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-18 13:32:23 -04:00
parent 436c76fd2f
commit 6bf031d0f5
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -151,16 +151,20 @@ public class PlanetDialog extends FloatingDialog{
renderSectors(planet);
}
if(false)
Draw.batch(projector, () -> {
if(selected != null){
setPlane(selected);
stable.draw();
}
});
bloom.render();
Gl.enable(Gl.blend);
if(hovered != null){
Draw.batch(projector, () -> {
setPlane(hovered);
if(false){ //TODO locked check
Draw.rect(Icon.lock.getRegion(), 0, 0);
}
});
}
Gl.disable(Gl.cullFace);
Gl.disable(Gl.depthTest);
@@ -179,20 +183,8 @@ public class PlanetDialog extends FloatingDialog{
private void renderPlanet(Planet planet){
//render planet at offsetted position in the world
if(false){
bloom.capture();
}
planet.mesh.render(cam.combined(), planet.getTransform(mat));
if(false){
bloom.render();
Gl.enable(Gl.depthTest);
Gl.enable(Gl.blend);
Gl.depthMask(true);
}
renderOrbit(planet);
for(Planet child : planet.children){
@@ -314,15 +306,16 @@ public class PlanetDialog extends FloatingDialog{
}
private void setPlane(Sector sector){
float rotation = planet.getRotation();
float rotation = -planet.getRotation();
float length = 0.01f;
projector.setPlane(
//origin on sector position
Tmp.v33.set(sector.tile.v).setLength(outlineRad + 0.1f),
Tmp.v33.set(sector.tile.v).setLength(outlineRad + length).rotate(Vec3.Y, rotation).add(planet.position),
//face up
sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v).nor(),
sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor(),
//right vector
Tmp.v31.set(Tmp.v32).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).nor()
Tmp.v31.set(Tmp.v32).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor()
);
}