From 97b0461d7ff8b05afb459cc508f7149b65d8062a Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Fri, 16 Oct 2020 23:00:06 +0100 Subject: [PATCH 1/4] allow modded planets to customize drawing --- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 4 +++- core/src/mindustry/type/Planet.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index e3eb74a7b5..75e9989232 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -110,8 +110,10 @@ public class PlanetRenderer implements Disposable{ } private void renderPlanet(Planet planet){ + if(!planet.visible()) return; + //render planet at offsetted position in the world - planet.mesh.render(cam.combined, planet.getTransform(mat)); + planet.render(cam.combined, planet.getTransform(mat)); renderOrbit(planet); diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 6153aa4721..47c8bc1750 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -264,4 +264,12 @@ public class Planet extends UnlockableContent{ public ContentType getContentType(){ return ContentType.planet; } + + public boolean visible(){ + return true; + } + + public void draw(Mat3D projection, Mat3d Transform){ + mesh.render(projection, transform); + } } From 05b77d787e109c38cd2f9a714b71abb80bd151aa Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 17 Oct 2020 12:10:52 +0100 Subject: [PATCH 2/4] hide orbits of hidden planets --- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 75e9989232..734a3efbdf 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -140,7 +140,7 @@ public class PlanetRenderer implements Disposable{ } private void renderOrbit(Planet planet){ - if(planet.parent == null) return; + if(planet.parent == null || !planet.visible()) return; Vec3 center = planet.parent.position; float radius = planet.orbitRadius; From 54b0d308bed46dab324f9be9eb3d6ea84e2235c3 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 17 Oct 2020 12:16:47 +0100 Subject: [PATCH 3/4] h --- core/src/mindustry/type/Planet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 47c8bc1750..07147b5cd9 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -269,7 +269,7 @@ public class Planet extends UnlockableContent{ return true; } - public void draw(Mat3D projection, Mat3d Transform){ + public void draw(Mat3D projection, Mat3D Transform){ mesh.render(projection, transform); } } From 8e0c5023c934cc1d8823c01b2c77783b30c9b67b Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 17 Oct 2020 12:28:46 +0100 Subject: [PATCH 4/4] hh --- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 2 +- core/src/mindustry/type/Planet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 734a3efbdf..33176408c8 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -113,7 +113,7 @@ public class PlanetRenderer implements Disposable{ if(!planet.visible()) return; //render planet at offsetted position in the world - planet.render(cam.combined, planet.getTransform(mat)); + planet.draw(cam.combined, planet.getTransform(mat)); renderOrbit(planet); diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 07147b5cd9..e67a4a493f 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -269,7 +269,7 @@ public class Planet extends UnlockableContent{ return true; } - public void draw(Mat3D projection, Mat3D Transform){ + public void draw(Mat3D projection, Mat3D transform){ mesh.render(projection, transform); } }