fix some things
This commit is contained in:
parent
1dbb0d2a7b
commit
16ba9b7c58
|
@ -194,6 +194,9 @@ public class Minecraft implements Runnable {
|
||||||
|
|
||||||
this.checkGLError("Post startup");
|
this.checkGLError("Post startup");
|
||||||
this.ingameGUI = new GuiIngame(this);
|
this.ingameGUI = new GuiIngame(this);
|
||||||
|
|
||||||
|
GL11.anisotropicPatch(GL11.EaglerAdapterImpl2.glNeedsAnisotropicFix());
|
||||||
|
|
||||||
this.displayGuiScreen(new GuiMainMenu());
|
this.displayGuiScreen(new GuiMainMenu());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,15 @@ public class ClippingHelper {
|
||||||
public float[] clippingMatrix = new float[16];
|
public float[] clippingMatrix = new float[16];
|
||||||
|
|
||||||
public boolean isBoxInFrustum(double var1, double var3, double var5, double var7, double var9, double var11) {
|
public boolean isBoxInFrustum(double var1, double var3, double var5, double var7, double var9, double var11) {
|
||||||
for(int var13 = 0; var13 < 6; ++var13) {
|
for (int var13 = 0; var13 < 6; ++var13) {
|
||||||
if((double)this.frustum[var13][0] * var1 + (double)this.frustum[var13][1] * var3 + (double)this.frustum[var13][2] * var5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var7 + (double)this.frustum[var13][1] * var3 + (double)this.frustum[var13][2] * var5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var1 + (double)this.frustum[var13][1] * var9 + (double)this.frustum[var13][2] * var5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var7 + (double)this.frustum[var13][1] * var9 + (double)this.frustum[var13][2] * var5 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var1 + (double)this.frustum[var13][1] * var3 + (double)this.frustum[var13][2] * var11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var7 + (double)this.frustum[var13][1] * var3 + (double)this.frustum[var13][2] * var11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var1 + (double)this.frustum[var13][1] * var9 + (double)this.frustum[var13][2] * var11 + (double)this.frustum[var13][3] <= 0.0D && (double)this.frustum[var13][0] * var7 + (double)this.frustum[var13][1] * var9 + (double)this.frustum[var13][2] * var11 + (double)this.frustum[var13][3] <= 0.0D) {
|
if ((double) this.frustum[var13][0] * var1 + (double) this.frustum[var13][1] * var3 + (double) this.frustum[var13][2] * var5 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var7 + (double) this.frustum[var13][1] * var3 + (double) this.frustum[var13][2] * var5 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var1 + (double) this.frustum[var13][1] * var9 + (double) this.frustum[var13][2] * var5 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var7 + (double) this.frustum[var13][1] * var9 + (double) this.frustum[var13][2] * var5 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var1 + (double) this.frustum[var13][1] * var3 + (double) this.frustum[var13][2] * var11 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var7 + (double) this.frustum[var13][1] * var3 + (double) this.frustum[var13][2] * var11 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var1 + (double) this.frustum[var13][1] * var9 + (double) this.frustum[var13][2] * var11 + (double) this.frustum[var13][3] <= 0.0D
|
||||||
|
&& (double) this.frustum[var13][0] * var7 + (double) this.frustum[var13][1] * var9 + (double) this.frustum[var13][2] * var11 + (double) this.frustum[var13][3] <= 0.0D) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ public class RenderHelper {
|
||||||
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
|
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
|
||||||
GL11.glColorMaterial(GL11.GL_FRONT_AND_BACK, GL11.GL_AMBIENT_AND_DIFFUSE);
|
GL11.glColorMaterial(GL11.GL_FRONT_AND_BACK, GL11.GL_AMBIENT_AND_DIFFUSE);
|
||||||
GL11.copyModelToLightMatrix2();
|
GL11.copyModelToLightMatrix2();
|
||||||
|
//GL11.flipSecondLightMatrix();
|
||||||
GL11.flipBothLightMatrix();
|
GL11.flipBothLightMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,6 +94,7 @@ public class WorldRenderer {
|
||||||
this.tileEntityRenderers.clear();
|
this.tileEntityRenderers.clear();
|
||||||
byte var8 = 1;
|
byte var8 = 1;
|
||||||
ChunkCache var9 = new ChunkCache(this.worldObj, var1 - var8, var2 - var8, var3 - var8, var4 + var8, var5 + var8, var6 + var8);
|
ChunkCache var9 = new ChunkCache(this.worldObj, var1 - var8, var2 - var8, var3 - var8, var4 + var8, var5 + var8, var6 + var8);
|
||||||
|
GL11.hintAnisotropicFix(true);
|
||||||
RenderBlocks var10 = new RenderBlocks(var9);
|
RenderBlocks var10 = new RenderBlocks(var9);
|
||||||
|
|
||||||
for(int var11 = 0; var11 < 2; ++var11) {
|
for(int var11 = 0; var11 < 2; ++var11) {
|
||||||
|
@ -149,6 +150,8 @@ public class WorldRenderer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GL11.hintAnisotropicFix(false);
|
||||||
|
|
||||||
HashSet var22 = new HashSet();
|
HashSet var22 = new HashSet();
|
||||||
var22.addAll(this.tileEntityRenderers);
|
var22.addAll(this.tileEntityRenderers);
|
||||||
var22.removeAll(var21);
|
var22.removeAll(var21);
|
||||||
|
|
|
@ -1581,7 +1581,7 @@ public class GL11 implements JSObject {
|
||||||
|
|
||||||
public static final boolean glGetQueryResultAvailable(int obj) {
|
public static final boolean glGetQueryResultAvailable(int obj) {
|
||||||
QueryGL q = queryObjs.get(obj);
|
QueryGL q = queryObjs.get(obj);
|
||||||
return _wglGetQueryObjecti(q, _wGL_QUERY_RESULT_AVAILABLE) >= 0;
|
return _wglGetQueryObjecti(q, _wGL_QUERY_RESULT_AVAILABLE) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void glGetQueryResult(int in, IntBuffer out) {
|
public static final void glGetQueryResult(int in, IntBuffer out) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user