Changes from mobile

aehmttw · Jul 7, 2024 · 713bda6 · 713bda6
1 parent cf4ea5f
commit 713bda6
Show file tree

Hide file tree

Showing 175 changed files with 478 additions and 523 deletions.
diff --git a/src/main/java/basewindow/BaseShapeBatchRenderer.java b/src/main/java/basewindow/BaseShapeBatchRenderer.java
@@ -29,6 +29,9 @@ public BaseShapeBatchRenderer(boolean dynamic)
 
     public void setPosition(double x, double y, double z)
     {
+        if (Double.isNaN(x) || Double.isNaN(y) || Double.isNaN(z))
+            throw new RuntimeException("NaN renderer position!");
+
         this.posX = x;
         this.posY = y;
         this.posZ = z;

diff --git a/src/main/java/basewindow/BaseShapeRenderer.java b/src/main/java/basewindow/BaseShapeRenderer.java
@@ -11,8 +11,6 @@ public abstract class BaseShapeRenderer
     public static final byte hide_all_faces = 63;
     public static final byte hide_draw_on_top = 64;
 
-    public boolean supportsBatching = false;
-
     public abstract void fillOval(double x, double y, double sX, double sY);
 
     public abstract void fillOval(double x, double y, double z, double sX, double sY, boolean depthTest);

diff --git a/src/main/java/basewindow/BaseStaticBatchRenderer.java b/src/main/java/basewindow/BaseStaticBatchRenderer.java
diff --git a/src/main/java/basewindow/BaseWindow.java b/src/main/java/basewindow/BaseWindow.java
@@ -260,13 +260,17 @@ public void stopTiming()
 
     public abstract void setMatrixModelview();
 
+    public abstract float[] getTransformedMouse();
+
+    public abstract float[] getTransformedMouse(double x, double y);
+
     public abstract ModelPart createModelPart();
 
     public abstract ModelPart createModelPart(Model model, ArrayList<ModelPart.Shape> shapes, Model.Material material);
 
     public abstract PosedModel createPosedModel(Model m);
 
-    public abstract BaseStaticBatchRenderer createStaticBatchRenderer(ShaderGroup shader, boolean color, String texture, boolean normal, int vertices);
+    public abstract BaseShapeBatchRenderer createStaticBatchRenderer(ShaderGroup shader, boolean color, String texture, boolean normal, int vertices);
 
     public abstract BaseShapeBatchRenderer createShapeBatchRenderer();
 
@@ -280,9 +284,16 @@ public void setShader(ShaderBase s)
         if (this.currentShaderGroup != null)
             old = this.currentShaderGroup.shaderBase;
 
-        this.currentShaderGroup = s.group;
-        this.currentShader = s;
-        s.set();
+        try
+        {
+            s.set();
+            this.currentShaderGroup = s.group;
+            this.currentShader = s;
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
 
         if (old != null)
             s.copyUniformsFrom(old, ShaderBase.class);
@@ -294,9 +305,9 @@ public void setShader(ShaderShadowMap s)
         if (this.currentShaderGroup != null)
             old = this.currentShaderGroup.shaderShadowMap;
 
+        s.set();
         this.currentShaderGroup = s.group;
         this.currentShader = s;
-        s.set();
 
         if (old != null)
             s.copyUniformsFrom(old, ShaderShadowMap.class);

diff --git a/src/main/java/basewindow/ComputerFile.java b/src/main/java/basewindow/ComputerFile.java
@@ -6,7 +6,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Scanner;
 
 public class ComputerFile extends BaseFile
 {

diff --git a/src/main/java/basewindow/InputPoint.java b/src/main/java/basewindow/InputPoint.java
@@ -7,6 +7,7 @@ public class InputPoint
 
     public double x;
     public double y;
+
     public String tag = "";
     public boolean valid = true;
 

diff --git a/src/main/java/basewindow/ShaderBase.java b/src/main/java/basewindow/ShaderBase.java
@@ -38,6 +38,8 @@ public class ShaderBase extends ShaderProgram implements IBaseShader
     public Uniform1i lightsTexSize;
     public Uniform1i lightsTexture;
 
+    public Uniform1i tex;
+
 //    public Uniform1b useNormal;
 
     public BaseWindow window;
@@ -58,6 +60,7 @@ public ShaderBase(BaseWindow window)
     @Override
     public void initializeUniforms()
     {
+        this.tex.set(0);
         this.depthTexture.set(1);
         this.lightsTexture.set(2);
     }

diff --git a/src/main/java/basewindow/ShaderBones.java b/src/main/java/basewindow/ShaderBones.java
@@ -1,7 +1,5 @@
 package basewindow;
 
-import static basewindow.BaseShaderUtil.FLOAT;
-
 public class ShaderBones extends ShaderBase implements IBaseShader, IBoneShader
 {
     public Uniform1b bonesEnabled;

diff --git a/src/main/java/basewindow/ShaderShadowMapBones.java b/src/main/java/basewindow/ShaderShadowMapBones.java
@@ -1,14 +1,12 @@
 package basewindow;
 
-import lwjglwindow.LWJGLWindow;
-
 public class ShaderShadowMapBones extends ShaderShadowMap implements IBaseShader, IBoneShader
 {
     public Uniform1b bonesEnabled;
     public UniformMatrix4 boneMatrices;
     public Attribute bones;
 
-    public ShaderShadowMapBones(LWJGLWindow window)
+    public ShaderShadowMapBones(BaseWindow window)
     {
         super(window);
     }

diff --git a/src/main/java/lwjglwindow/ImmediateModeShapeRenderer.java b/src/main/java/lwjglwindow/ImmediateModeShapeRenderer.java
@@ -14,7 +14,6 @@ public class ImmediateModeShapeRenderer extends BaseShapeRenderer
     public ImmediateModeShapeRenderer(LWJGLWindow window)
     {
         this.window = window;
-        this.supportsBatching = true;
     }
 
     public void fillOval(double x, double y, double sX, double sY)

diff --git a/src/main/java/lwjglwindow/LWJGLWindow.java b/src/main/java/lwjglwindow/LWJGLWindow.java
@@ -1129,6 +1129,18 @@ public void setMatrixModelview()
 		glMatrixMode(GL_MODELVIEW);
 	}
 
+	@Override
+	public float[] getTransformedMouse()
+	{
+		return new float[0];
+	}
+
+	@Override
+	public float[] getTransformedMouse(double x, double y)
+	{
+		return new float[0];
+	}
+
 	@Override
 	public ModelPart createModelPart()
 	{
@@ -1254,7 +1266,7 @@ public BaseShapeBatchRenderer createShapeBatchRenderer(ShaderGroup shader)
 	}
 
 	@Override
-	public BaseStaticBatchRenderer createStaticBatchRenderer(ShaderGroup shader, boolean color, String texture, boolean normal, int vertices)
+	public BaseShapeBatchRenderer createStaticBatchRenderer(ShaderGroup shader, boolean color, String texture, boolean normal, int vertices)
 	{
 		return new VBOStaticBatchRenderer(this, shader, color, texture, normal, vertices);
 	}

diff --git a/src/main/java/lwjglwindow/VBOStaticBatchRenderer.java b/src/main/java/lwjglwindow/VBOStaticBatchRenderer.java
@@ -1,23 +1,20 @@
 package lwjglwindow;
 
-import basewindow.BaseStaticBatchRenderer;
+import basewindow.BaseShapeBatchRenderer;
+import basewindow.IBatchRenderableObject;
 import basewindow.ShaderGroup;
 import basewindow.transformation.Rotation;
 import basewindow.transformation.Scale;
 import basewindow.transformation.Translation;
 import org.lwjgl.BufferUtils;
-import tanks.rendering.StaticTerrainRenderer;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
 import java.util.HashMap;
 
-import static basewindow.BaseShaderUtil.FLOAT;
-import static basewindow.BaseShaderUtil.INT;
 import static org.lwjgl.opengl.GL11.*;
 
-public class VBOStaticBatchRenderer extends BaseStaticBatchRenderer
+public class VBOStaticBatchRenderer extends BaseShapeBatchRenderer
 {
     public LWJGLWindow window;
 
@@ -55,9 +52,12 @@ public class VBOStaticBatchRenderer extends BaseStaticBatchRenderer
     public boolean depthMask = false;
 
     protected HashMap<ShaderGroup.Attribute, float[]> floatAttributes = new HashMap<>();
+    public String texture;
 
     public VBOStaticBatchRenderer(LWJGLWindow window, ShaderGroup shader, boolean color, String texture, boolean normal, int vertices)
     {
+        super(false);
+
         this.window = window;
         this.vertexCount = vertices;
 
@@ -114,6 +114,18 @@ public void setNormal(float x, float y, float z)
         this.currentNormalZ = z;
     }
 
+    @Override
+    public void delete(IBatchRenderableObject o)
+    {
+
+    }
+
+    @Override
+    public void beginAdd(IBatchRenderableObject o)
+    {
+
+    }
+
     public void addPoint(float x, float y, float z)
     {
         if (staged)
@@ -156,7 +168,6 @@ public void addPoint(float x, float y, float z)
         }
     }
 
-    @Override
     public void setNormal(float[] n)
     {
         this.setNormal(n[0], n[1], n[2]);
@@ -178,6 +189,12 @@ public void setGlow(float g)
         this.colorGlow = g;
     }
 
+    @Override
+    public void addAttribute(ShaderGroup.Attribute attribute)
+    {
+
+    }
+
     public void stage()
     {
         if (this.staged)
@@ -262,6 +279,12 @@ public void draw()
         glPopMatrix();
     }
 
+    @Override
+    public void endModification()
+    {
+
+    }
+
     @Override
     public void free()
     {

diff --git a/src/main/java/tanks/AreaEffectFreeze.java b/src/main/java/tanks/AreaEffectFreeze.java
@@ -1,9 +1,9 @@
 package tanks;
 
 import tanks.AttributeModifier.Operation;
-import tanks.network.event.EventCreateFreezeEffect;
 import tanks.gui.screen.ScreenGame;
 import tanks.gui.screen.ScreenPartyLobby;
+import tanks.network.event.EventCreateFreezeEffect;
 
 public class AreaEffectFreeze extends AreaEffect
 {

diff --git a/src/main/java/tanks/Crusade.java b/src/main/java/tanks/Crusade.java
@@ -1,12 +1,13 @@
 package tanks;
+
 import basewindow.BaseFile;
-import tanks.hotbar.item.ItemBullet;
-import tanks.hotbar.item.ItemMine;
-import tanks.network.event.*;
 import tanks.gui.screen.ScreenGame;
 import tanks.gui.screen.ScreenPartyHost;
 import tanks.hotbar.ItemBar;
 import tanks.hotbar.item.Item;
+import tanks.hotbar.item.ItemBullet;
+import tanks.hotbar.item.ItemMine;
+import tanks.network.event.*;
 import tanks.tank.Tank;
 import tanks.tank.TankAIControlled;
 import tanks.tank.TankPlayer;

diff --git a/src/main/java/tanks/CrusadePlayer.java b/src/main/java/tanks/CrusadePlayer.java
@@ -2,14 +2,13 @@
 
 import basewindow.BaseFile;
 import tanks.bullet.Bullet;
-import tanks.gui.screen.ScreenCrashed;
 import tanks.gui.screen.ScreenGame;
-import tanks.gui.screen.ScreenOutOfMemory;
 import tanks.gui.screen.ScreenPartyLobby;
 import tanks.hotbar.ItemBar;
 import tanks.hotbar.item.Item;
-import tanks.tank.*;
+import tanks.tank.Explosion;
 import tanks.tank.Tank;
+import tanks.tank.TankPlayer;
 
 import java.util.HashMap;