Merge pull request #9536 from trimbe/camera-effects-gpu

gpu plugin: fix camera effects used for drunkeness and fishing trawler
This commit is contained in:
Adam
2019-08-06 09:25:17 -04:00
committed by GitHub

View File

@@ -207,6 +207,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int centerX; private int centerX;
private int centerY; private int centerY;
private int yaw;
private int pitch;
// Uniforms // Uniforms
private int uniUseFog; private int uniUseFog;
@@ -719,6 +721,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
{ {
centerX = client.getCenterX(); centerX = client.getCenterX();
centerY = client.getCenterY(); centerY = client.getCenterY();
yaw = client.getCameraYaw();
pitch = client.getCameraPitch();
final Scene scene = client.getScene(); final Scene scene = client.getScene();
final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance())); final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance()));
@@ -911,8 +915,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glBindBuffer(gl.GL_UNIFORM_BUFFER, uniformBufferId); gl.glBindBuffer(gl.GL_UNIFORM_BUFFER, uniformBufferId);
uniformBuffer.clear(); uniformBuffer.clear();
uniformBuffer uniformBuffer
.put(client.getCameraYaw()) .put(yaw)
.put(client.getCameraPitch()) .put(pitch)
.put(centerX) .put(centerX)
.put(centerY) .put(centerY)
.put(client.getScale()) .put(client.getScale())