diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 6bcb885582..d8ba019996 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -7,6 +7,7 @@ import arc.audio.*; import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*; +import arc.graphics.gl.*; import arc.math.*; import arc.util.*; import arc.util.io.*; @@ -15,8 +16,8 @@ import mindustry.audio.*; import mindustry.core.*; import mindustry.ctype.*; import mindustry.game.EventType.*; -import mindustry.game.*; import mindustry.game.Saves.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.io.*; @@ -55,7 +56,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform loadFileLogger(); platform = this; - maxTextureSize = Gl.getInt(Gl.maxTextureSize); + maxTextureSize = arc.graphics.gl.Gl.getInt(Gl.maxTextureSize); beginTime = Time.millis(); //debug GL information diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index f7e2193588..c20973e250 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -5,7 +5,6 @@ import arc.assets.*; import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; @@ -22,8 +21,8 @@ import mindustry.entities.units.*; import mindustry.game.EventType.*; import mindustry.game.Schematic.*; import mindustry.gen.*; -import mindustry.input.*; import mindustry.input.InputHandler.*; +import mindustry.input.*; import mindustry.input.Placement.*; import mindustry.io.*; import mindustry.io.TypeIO.*; diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index f8250ef211..52889a0e8f 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -3,7 +3,6 @@ package mindustry.graphics; import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.input.*; import arc.math.*; import arc.math.geom.*; diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index 83e5e76651..9c9b50f6ee 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -1,7 +1,6 @@ package mindustry.graphics; import arc.graphics.*; -import arc.graphics.gl.*; import arc.math.*; import arc.util.*; diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java index 497b88a4ed..7a385b0031 100644 --- a/core/src/mindustry/graphics/FogRenderer.java +++ b/core/src/mindustry/graphics/FogRenderer.java @@ -3,7 +3,6 @@ package mindustry.graphics; import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.geom.*; import arc.struct.*; import arc.util.*; diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java index c20e841ab3..4f8eb7df65 100644 --- a/core/src/mindustry/graphics/LightRenderer.java +++ b/core/src/mindustry/graphics/LightRenderer.java @@ -44,7 +44,7 @@ public class LightRenderer{ circleIndex ++; } - + public void add(float x, float y, TextureRegion region, Color color, float opacity){ add(x, y, region, 0f, color, opacity); } diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 38de6cce3c..dc95f4be73 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -9,6 +9,7 @@ import arc.graphics.Pixmap.*; import arc.graphics.g2d.*; import arc.graphics.g3d.*; import arc.graphics.gl.GLVersion.*; +import arc.graphics.gl.*; import arc.input.*; import arc.math.*; import arc.math.geom.*; @@ -166,7 +167,7 @@ public class LoadRenderer implements Disposable{ w = viewportWidth; h = viewportHeight; - Gl.viewport(viewportX, viewportY, viewportWidth, viewportHeight); + arc.graphics.gl.Gl.viewport(viewportX, viewportY, viewportWidth, viewportHeight); Draw.proj().setOrtho(0, 0, viewportWidth, viewportHeight); //background text and indicator @@ -224,7 +225,7 @@ public class LoadRenderer implements Disposable{ } Draw.flush(); - Gl.clear(Gl.stencilBufferBit); + arc.graphics.gl.Gl.clear(arc.graphics.gl.Gl.stencilBufferBit); Draw.beginStencil(); Fill.poly(floats); @@ -329,7 +330,7 @@ public class LoadRenderer implements Disposable{ Lines.circle(cx, cy, vsize/2f); if(rw > 0 && rh > 0){ - Gl.viewport(viewportX + rx, viewportY + ry, rw, rh); + arc.graphics.gl.Gl.viewport(viewportX + rx, viewportY + ry, rw, rh); cam.position.set(2, 0, 2); cam.resize(rw, rh); @@ -338,10 +339,10 @@ public class LoadRenderer implements Disposable{ cam.update(); Shaders.mesh.bind(); Shaders.mesh.setUniformMatrix4("u_proj", cam.combined.val); - mesh.render(Shaders.mesh, Gl.lines); + mesh.render(Shaders.mesh, arc.graphics.gl.Gl.lines); //restore viewport - Gl.viewport(viewportX, viewportY, viewportWidth, viewportHeight); + arc.graphics.gl.Gl.viewport(viewportX, viewportY, viewportWidth, viewportHeight); } int points = 4; diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index ad32be8314..b460d2b9bb 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -4,7 +4,6 @@ import arc.*; import arc.func.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.*; import arc.scene.ui.layout.*; import arc.struct.*; diff --git a/core/src/mindustry/graphics/NvGpuInfo.java b/core/src/mindustry/graphics/NvGpuInfo.java index f620680b03..3a764e6804 100644 --- a/core/src/mindustry/graphics/NvGpuInfo.java +++ b/core/src/mindustry/graphics/NvGpuInfo.java @@ -1,7 +1,7 @@ package mindustry.graphics; import arc.*; -import arc.graphics.*; +import arc.graphics.gl.*; /** Nvidia-specific utility class for querying GPU VRAM information. */ public class NvGpuInfo{ @@ -11,7 +11,7 @@ public class NvGpuInfo{ private static boolean supported, initialized; public static int getMaxMemoryKB(){ - return hasMemoryInfo() ? Gl.getInt(GL_GPU_MEM_INFO_TOTAL_AVAILABLE_MEM_NVX) : 0; + return hasMemoryInfo() ? arc.graphics.gl.Gl.getInt(GL_GPU_MEM_INFO_TOTAL_AVAILABLE_MEM_NVX) : 0; } public static int getAvailableMemoryKB(){ diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index ec72c39b68..8e09320afb 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -3,7 +3,6 @@ package mindustry.graphics; import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.*; import arc.util.*; diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 8aaac3917a..78d23f8c15 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -6,7 +6,6 @@ import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g3d.*; -import arc.graphics.gl.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.*; diff --git a/core/src/mindustry/graphics/g3d/HexMesh.java b/core/src/mindustry/graphics/g3d/HexMesh.java index 02a35973f0..3c7d77f332 100644 --- a/core/src/mindustry/graphics/g3d/HexMesh.java +++ b/core/src/mindustry/graphics/g3d/HexMesh.java @@ -1,6 +1,6 @@ package mindustry.graphics.g3d; -import arc.graphics.gl.*; +import arc.graphics.*; import arc.math.geom.*; import mindustry.graphics.*; import mindustry.type.*; diff --git a/core/src/mindustry/graphics/g3d/HexSkyMesh.java b/core/src/mindustry/graphics/g3d/HexSkyMesh.java index b2a3e0ac80..6a1aabfcaa 100644 --- a/core/src/mindustry/graphics/g3d/HexSkyMesh.java +++ b/core/src/mindustry/graphics/g3d/HexSkyMesh.java @@ -1,6 +1,7 @@ package mindustry.graphics.g3d; import arc.graphics.*; +import arc.graphics.gl.*; import arc.math.*; import arc.math.geom.*; import arc.util.*; diff --git a/core/src/mindustry/graphics/g3d/MeshBuilder.java b/core/src/mindustry/graphics/g3d/MeshBuilder.java index 7984b084f5..99005bd1f0 100644 --- a/core/src/mindustry/graphics/g3d/MeshBuilder.java +++ b/core/src/mindustry/graphics/g3d/MeshBuilder.java @@ -2,6 +2,7 @@ package mindustry.graphics.g3d; import arc.*; import arc.graphics.*; +import arc.graphics.gl.*; import arc.math.geom.*; import arc.struct.*; import mindustry.graphics.g3d.PlanetGrid.*; diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 138fb4c917..2f32105b6a 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -4,6 +4,7 @@ import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g3d.*; +import arc.graphics.gl.*; import arc.math.*; import arc.math.geom.*; import arc.util.*; @@ -46,12 +47,12 @@ public class PlanetRenderer implements Disposable{ /** Render the entire planet scene to the screen. */ public void render(PlanetParams params){ Draw.flush(); - Gl.clear(Gl.depthBufferBit); - Gl.enable(Gl.depthTest); - Gl.depthMask(true); + arc.graphics.gl.Gl.clear(arc.graphics.gl.Gl.depthBufferBit); + arc.graphics.gl.Gl.enable(arc.graphics.gl.Gl.depthTest); + arc.graphics.gl.Gl.depthMask(true); - Gl.enable(Gl.cullFace); - Gl.cullFace(Gl.back); + arc.graphics.gl.Gl.enable(arc.graphics.gl.Gl.cullFace); + arc.graphics.gl.Gl.cullFace(arc.graphics.gl.Gl.back); int w = params.viewW <= 0 ? Core.graphics.getWidth() : params.viewW; int h = params.viewH <= 0 ? Core.graphics.getHeight() : params.viewH; @@ -91,11 +92,11 @@ public class PlanetRenderer implements Disposable{ cam.position.setZero(); cam.update(); - Gl.depthMask(false); + arc.graphics.gl.Gl.depthMask(false); skybox.render(cam.combined); - Gl.depthMask(true); + arc.graphics.gl.Gl.depthMask(true); cam.position.set(lastPos); cam.update(); @@ -117,14 +118,14 @@ public class PlanetRenderer implements Disposable{ Events.fire(Trigger.universeDrawEnd); - Gl.enable(Gl.blend); + arc.graphics.gl.Gl.enable(arc.graphics.gl.Gl.blend); if(params.renderer != null){ params.renderer.renderProjections(params.planet); } - Gl.disable(Gl.cullFace); - Gl.disable(Gl.depthTest); + arc.graphics.gl.Gl.disable(arc.graphics.gl.Gl.cullFace); + arc.graphics.gl.Gl.disable(arc.graphics.gl.Gl.depthTest); cam.update(); } @@ -175,7 +176,7 @@ public class PlanetRenderer implements Disposable{ float radius = planet.orbitRadius; int points = (int)(radius * 10); Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(params.uiAlpha))); - batch.flush(Gl.lineLoop); + batch.flush(arc.graphics.gl.Gl.lineLoop); } public void renderSectors(Planet planet, PlanetParams params){ @@ -206,7 +207,7 @@ public class PlanetRenderer implements Disposable{ public void drawBorders(Sector sector, Color base, float alpha){ sector.planet.drawBorders(batch, sector, base, alpha); if(batch.getNumVertices() >= batch.getMaxVertices() - 6 * 6){ - batch.flush(Gl.triangles); + batch.flush(arc.graphics.gl.Gl.triangles); } } diff --git a/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java b/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java index b7529229f6..127ed71e81 100644 --- a/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java +++ b/core/src/mindustry/graphics/g3d/ShaderSphereMesh.java @@ -1,6 +1,6 @@ package mindustry.graphics.g3d; -import arc.graphics.gl.*; +import arc.graphics.*; import mindustry.type.*; public class ShaderSphereMesh extends PlanetMesh{ diff --git a/core/src/mindustry/mod/DataImagePacker.java b/core/src/mindustry/mod/DataImagePacker.java index bb1264a995..aeddc5aca5 100644 --- a/core/src/mindustry/mod/DataImagePacker.java +++ b/core/src/mindustry/mod/DataImagePacker.java @@ -5,7 +5,6 @@ import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; -import arc.graphics.gl.*; import arc.math.*; import arc.struct.*; import arc.util.*; diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 91375ab409..743a19a4e4 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -7,7 +7,6 @@ import arc.func.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; -import arc.graphics.gl.*; import arc.scene.ui.*; import arc.struct.*; import arc.util.*; diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java index 2f4c404f13..6c21f40026 100644 --- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java +++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java @@ -3,7 +3,6 @@ package mindustry.world.blocks.logic; import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.*; import arc.struct.*; import arc.util.*; diff --git a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java index b18717365d..f17afd3168 100644 --- a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java +++ b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java @@ -3,7 +3,6 @@ package mindustry.world.blocks.logic; import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.graphics.gl.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.*; diff --git a/gradle.properties b/gradle.properties index 98b5404d27..f7445de7c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=445835027a +archash=28840f196d diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 970ae2aad5..2d0bd12630 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -6,7 +6,6 @@ import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; -import arc.graphics.gl.*; import arc.math.*; import arc.struct.*; import arc.util.*;