Fix the placeholder normal map texture having incorrect content

OverlordsIII · Mar 23, 2021 · b2ffbe1 · b2ffbe1
1 parent 306b490
commit b2ffbe1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java
@@ -126,8 +126,8 @@ public DeferredWorldRenderingPipeline(ProgramSet programs) {
 		GlStateManager.pixelStore(GL20C.GL_UNPACK_ALIGNMENT, 4);
 
 		// Create some placeholder PBR textures for now
-		normals = new SingleColorTexture(0xFF7F7FFF);
-		specular = new SingleColorTexture(0);
+		normals = new SingleColorTexture(127, 127, 255, 255);
+		specular = new SingleColorTexture(0, 0, 0, 0);
 		GlStateManager.activeTexture(GL20C.GL_TEXTURE0);
 
 		this.shadowMapRenderer = new EmptyShadowMapRenderer(2048);

diff --git a/src/main/java/net/coderbot/iris/rendertarget/SingleColorTexture.java b/src/main/java/net/coderbot/iris/rendertarget/SingleColorTexture.java
@@ -6,14 +6,19 @@
 import org.lwjgl.opengl.GL11C;
 import org.lwjgl.opengl.GL13C;
 
-import java.nio.IntBuffer;
+import java.nio.ByteBuffer;
 
 public class SingleColorTexture extends GlResource {
-	public SingleColorTexture(int color) {
+	public SingleColorTexture(int red, int green, int blue, int alpha) {
 		super(GL11C.glGenTextures());
 		GlStateManager.bindTexture(getGlId());
 
-		IntBuffer pixel = createBuffer(color);
+		ByteBuffer pixel = BufferUtils.createByteBuffer(4);
+		pixel.put((byte) red);
+		pixel.put((byte) green);
+		pixel.put((byte) blue);
+		pixel.put((byte) alpha);
+		pixel.position(0);
 
 		GL11C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MIN_FILTER, GL11C.GL_LINEAR);
 		GL11C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MAG_FILTER, GL11C.GL_LINEAR);
@@ -24,14 +29,6 @@ public SingleColorTexture(int color) {
 		GlStateManager.bindTexture(0);
 	}
 
-	private IntBuffer createBuffer(int color) {
-		IntBuffer pixel = BufferUtils.createIntBuffer(1);
-		pixel.put(color);
-		pixel.position(0);
-
-		return pixel;
-	}
-
 	public int getTextureId() {
 		return getGlId();
 	}