Make render interfaces consistent
This commit is contained in:
@@ -633,7 +633,7 @@ public class ClientApi
|
|||||||
// for setup on some APIs (IE openGL)
|
// for setup on some APIs (IE openGL)
|
||||||
metaRenderer.runRenderPassSetup(renderParams);
|
metaRenderer.runRenderPassSetup(renderParams);
|
||||||
|
|
||||||
testRenderer.render();
|
testRenderer.render(renderParams);
|
||||||
|
|
||||||
metaRenderer.runRenderPassCleanup(renderParams);
|
metaRenderer.runRenderPassCleanup(renderParams);
|
||||||
}
|
}
|
||||||
@@ -695,7 +695,8 @@ public class ClientApi
|
|||||||
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
||||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
||||||
{
|
{
|
||||||
fadeRenderer.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.clientLevelWrapper);
|
RenderParams renderParams = new RenderParams(EDhApiRenderPass.OPAQUE, RENDER_STATE);
|
||||||
|
fadeRenderer.render(renderParams);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@@ -725,7 +726,8 @@ public class ClientApi
|
|||||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
|
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
|
||||||
if (renderFade)
|
if (renderFade)
|
||||||
{
|
{
|
||||||
fadeRenderer.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.clientLevelWrapper);
|
RenderParams renderParams = new RenderParams(EDhApiRenderPass.TRANSPARENT, RENDER_STATE);
|
||||||
|
fadeRenderer.render(renderParams);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-10
@@ -215,7 +215,7 @@ public class LodRenderer
|
|||||||
if (Config.Client.Advanced.Graphics.Ssao.enableSsao.get())
|
if (Config.Client.Advanced.Graphics.Ssao.enableSsao.get())
|
||||||
{
|
{
|
||||||
profiler.popPush("LOD SSAO");
|
profiler.popPush("LOD SSAO");
|
||||||
this.ssaoRenderer.render(renderParams.dhProjectionMatrix);
|
this.ssaoRenderer.render(renderParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
// custom objects without SSAO
|
// custom objects without SSAO
|
||||||
@@ -248,10 +248,7 @@ public class LodRenderer
|
|||||||
{
|
{
|
||||||
profiler.popPush("LOD Fog");
|
profiler.popPush("LOD Fog");
|
||||||
|
|
||||||
Mat4f combinedMatrix = new Mat4f(renderParams.dhProjectionMatrix);
|
this.fogRenderer.render(renderParams);
|
||||||
combinedMatrix.multiply(renderParams.dhModelViewMatrix);
|
|
||||||
|
|
||||||
this.fogRenderer.render(combinedMatrix, renderParams.partialTicks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -278,7 +275,7 @@ public class LodRenderer
|
|||||||
if (!cancelApplyShader)
|
if (!cancelApplyShader)
|
||||||
{
|
{
|
||||||
profiler.popPush("Apply to MC");
|
profiler.popPush("Apply to MC");
|
||||||
this.metaRenderer.applyToMcTexture();
|
this.metaRenderer.applyToMcTexture(renderParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -300,10 +297,7 @@ public class LodRenderer
|
|||||||
{
|
{
|
||||||
profiler.popPush("LOD Fog");
|
profiler.popPush("LOD Fog");
|
||||||
|
|
||||||
Mat4f combinedMatrix = new Mat4f(renderParams.dhProjectionMatrix);
|
this.fogRenderer.render(renderParams);
|
||||||
combinedMatrix.multiply(renderParams.dhModelViewMatrix);
|
|
||||||
|
|
||||||
this.fogRenderer.render(combinedMatrix, renderParams.partialTicks);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -19,12 +19,12 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
import com.seibel.distanthorizons.core.render.RenderParams;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||||
|
|
||||||
public interface IDhFogRenderer extends IBindable
|
public interface IDhFogRenderer extends IBindable
|
||||||
{
|
{
|
||||||
|
|
||||||
void render(DhApiMat4f modelViewProjectionMatrix, float partialTicks);
|
void render(RenderParams renderParams);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ public interface IDhMetaRenderer extends IBindable
|
|||||||
{
|
{
|
||||||
void runRenderPassSetup(RenderParams renderParams);
|
void runRenderPassSetup(RenderParams renderParams);
|
||||||
void runRenderPassCleanup(RenderParams renderParams);
|
void runRenderPassCleanup(RenderParams renderParams);
|
||||||
void applyToMcTexture();
|
void applyToMcTexture(RenderParams renderParams);
|
||||||
void clearDhDepthAndColorTextures(RenderParams renderParams);
|
void clearDhDepthAndColorTextures(RenderParams renderParams);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -20,11 +20,12 @@
|
|||||||
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
||||||
|
import com.seibel.distanthorizons.core.render.RenderParams;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||||
|
|
||||||
public interface IDhSsaoRenderer extends IBindable
|
public interface IDhSsaoRenderer extends IBindable
|
||||||
{
|
{
|
||||||
|
|
||||||
void render(DhApiMat4f dhProjectionMatrix);
|
void render(RenderParams renderParams);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -19,11 +19,12 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.core.render.RenderParams;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||||
|
|
||||||
public interface IDhTestTriangleRenderer extends IBindable
|
public interface IDhTestTriangleRenderer extends IBindable
|
||||||
{
|
{
|
||||||
|
|
||||||
void render();
|
void render(RenderParams renderParams);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
package com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.core.render.RenderParams;
|
||||||
import com.seibel.distanthorizons.core.util.math.Mat4f;
|
import com.seibel.distanthorizons.core.util.math.Mat4f;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||||
@@ -26,6 +27,6 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab
|
|||||||
public interface IDhVanillaFadeRenderer extends IBindable
|
public interface IDhVanillaFadeRenderer extends IBindable
|
||||||
{
|
{
|
||||||
|
|
||||||
void render(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, IClientLevelWrapper level);
|
void render(RenderParams renderParams);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user