Removed calls to slick2d color binding.

WhyAreAllTheseTaken · Dec 9, 2019 · 60610f9 · 60610f9
1 parent 08cd703
commit 60610f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/RPGOnline2/src/io/github/tomaso2468/rpgonline/bullet/BulletState.java b/RPGOnline2/src/io/github/tomaso2468/rpgonline/bullet/BulletState.java
@@ -298,7 +298,7 @@ public void render2(Game game, Renderer renderer) throws RenderException {
 							current = game.getTextures().getSheet(img);
 							renderer.startUse(current);
 						}
-						new Color(1, 1, 1, particle.getAlpha()).bind();
+						renderer.bindColor(new Color(1, 1, 1, particle.getAlpha()));
 						renderer.renderEmbedded(img, particle.getX() * RPGConfig.getTileSize() - sx, particle.getY() * RPGConfig.getTileSize() - sy, img.getWidth(), img.getHeight());
 					}
 				}

diff --git a/RPGOnline2/src/io/github/tomaso2468/rpgonline/render/Renderer.java b/RPGOnline2/src/io/github/tomaso2468/rpgonline/render/Renderer.java
@@ -244,4 +244,6 @@ public default boolean isBuiltInTonemapping() {
 	public LUT loadLUT(URL loc) throws IOException, RenderException;
 	public void setLUT(LUT lut);
 	public String getGPU();
+
+	public void bindColor(Color c);
 }
diff --git a/RPGOnline2/src/io/github/tomaso2468/rpgonline/render/opengl/GL11Renderer.java b/RPGOnline2/src/io/github/tomaso2468/rpgonline/render/opengl/GL11Renderer.java
@@ -564,4 +564,9 @@ public void deleteShader(Shader shader) throws RenderException {
 	public void drawFont(Font font, float x, float y, String str) {
 		((SlickFont) font).font.drawString(x, y, str);
 	}
+
+	@Override
+	public void bindColor(Color c) {
+		c.bind();
+	}
 }
diff --git a/RPGOnline2/src/io/github/tomaso2468/rpgonline/sky/ImageMeshLayer.java b/RPGOnline2/src/io/github/tomaso2468/rpgonline/sky/ImageMeshLayer.java
@@ -87,7 +87,7 @@ public void render(Renderer renderer, Game game, double x, double y, double z, W
 						current = game.getTextures().getSheet(img);
 						renderer.startUse(img);
 					}
-					light.bind();
+					renderer.bindColor(light);
 					renderer.renderEmbedded(img, tx * imageWidth, ty * imageHeight, imageWidth, imageHeight);
 				}
 			}

diff --git a/RPGOnline2/src/io/github/tomaso2468/rpgonline/world2d/WorldState.java b/RPGOnline2/src/io/github/tomaso2468/rpgonline/world2d/WorldState.java
@@ -563,7 +563,7 @@ protected Image renderParticles(Game game, Renderer renderer, List<Particle> par
 							current = game.getTextures().getSheet(img);
 							renderer.startUse(current);
 						}
-						new Color(1, 1, 1, particle.getAlpha()).bind();
+						renderer.bindColor(new Color(1, 1, 1, particle.getAlpha()));
 						renderer.renderEmbedded(img, particle.getX() * RPGConfig.getTileSize() - sx,
 								particle.getY() * RPGConfig.getTileSize() - sy, img.getWidth(), img.getHeight());
 					}