Planet render cleanup
This commit is contained in:
@@ -151,16 +151,20 @@ public class PlanetDialog extends FloatingDialog{
|
|||||||
renderSectors(planet);
|
renderSectors(planet);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(false)
|
|
||||||
Draw.batch(projector, () -> {
|
|
||||||
if(selected != null){
|
|
||||||
setPlane(selected);
|
|
||||||
stable.draw();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
bloom.render();
|
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.cullFace);
|
||||||
Gl.disable(Gl.depthTest);
|
Gl.disable(Gl.depthTest);
|
||||||
|
|
||||||
@@ -179,20 +183,8 @@ public class PlanetDialog extends FloatingDialog{
|
|||||||
private void renderPlanet(Planet planet){
|
private void renderPlanet(Planet planet){
|
||||||
//render planet at offsetted position in the world
|
//render planet at offsetted position in the world
|
||||||
|
|
||||||
if(false){
|
|
||||||
bloom.capture();
|
|
||||||
}
|
|
||||||
|
|
||||||
planet.mesh.render(cam.combined(), planet.getTransform(mat));
|
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);
|
renderOrbit(planet);
|
||||||
|
|
||||||
for(Planet child : planet.children){
|
for(Planet child : planet.children){
|
||||||
@@ -314,15 +306,16 @@ public class PlanetDialog extends FloatingDialog{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void setPlane(Sector sector){
|
private void setPlane(Sector sector){
|
||||||
float rotation = planet.getRotation();
|
float rotation = -planet.getRotation();
|
||||||
|
float length = 0.01f;
|
||||||
|
|
||||||
projector.setPlane(
|
projector.setPlane(
|
||||||
//origin on sector position
|
//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
|
//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
|
//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()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user