diff --git a/src/projectzombie/entity/particle/ParticleBreak.java b/src/projectzombie/entity/particle/ParticleBreak.java index 9eb311e..6a3d010 100755 --- a/src/projectzombie/entity/particle/ParticleBreak.java +++ b/src/projectzombie/entity/particle/ParticleBreak.java @@ -101,7 +101,7 @@ public class ParticleBreak extends EntityParticle particles[i] = particle; } - still_ypos = 0.0125; + still_ypos = 1/256.0; time = 1000; still = 0; } diff --git a/src/projectzombie/entity/player/EntityPlayer.java b/src/projectzombie/entity/player/EntityPlayer.java index 7eb3033..503b6a1 100755 --- a/src/projectzombie/entity/player/EntityPlayer.java +++ b/src/projectzombie/entity/player/EntityPlayer.java @@ -463,7 +463,7 @@ public class EntityPlayer extends Entity implements if(ts.tile.canTileBreak(ts, holding, tool) || ts.tile.canUse(ts)) { Models.TILE_BORDER.setModel(Matrix4.translate( - new Vec3d(pos.x + 0.5 - ppos.x, 0, pos.y + 0.5 - ppos.z))); + new Vec3d(pos.x - ppos.x, 0, pos.y - ppos.z))); Models.TILE_BORDER.render(); break; diff --git a/src/projectzombie/model/ModelTileBorder.java b/src/projectzombie/model/ModelTileBorder.java index b69feb2..67f3fe1 100644 --- a/src/projectzombie/model/ModelTileBorder.java +++ b/src/projectzombie/model/ModelTileBorder.java @@ -38,21 +38,21 @@ public class ModelTileBorder extends Model float h = 0.0078125f; float f = 0b10; float c = 0b101111101111101111; - float o = 0.5f; + float o = 0.75f; return new float[] { - 0-o, h, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, - 1-o, h, 0-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0, h, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, + 1, h, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, - 0-o, h, 1-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, - 1-o, h, 1-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0, h, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, + 1, h, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, - 0-o, h, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, - 0-o, h, 1-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0, h, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, + 0, h, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, - 1-o, h, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, - 1-o, h, 1-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 1, h, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, + 1, h, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, o, c, f, }; } diff --git a/src/projectzombie/world/chunk/Chunk.java b/src/projectzombie/world/chunk/Chunk.java index 3a1e991..255bcb2 100755 --- a/src/projectzombie/world/chunk/Chunk.java +++ b/src/projectzombie/world/chunk/Chunk.java @@ -255,7 +255,7 @@ public class Chunk implements ClassBdf upto = renderEntities(((EntityHoldsEntities) e).getEntities(), particle_pool, upto); } - if(e instanceof EntityParticle && Main.world.isPoolDirty()) + if(e instanceof EntityParticle && particle_pool != null && Main.world.isPoolDirty()) { EntityParticle ep = (EntityParticle)e; diff --git a/src/resources/shader/effectRenderer.vsh b/src/resources/shader/effectRenderer.vsh index fbd9ed5..2dbf3f5 100644 --- a/src/resources/shader/effectRenderer.vsh +++ b/src/resources/shader/effectRenderer.vsh @@ -6,6 +6,6 @@ out vec2 pPos; void main() { - gl_Position = new vec4(aPos, 0, 1); + gl_Position = vec4(aPos, 0, 1); pPos = aPos; } \ No newline at end of file diff --git a/src/resources/shader/environmentRenderer.fsh b/src/resources/shader/environmentRenderer.fsh index 627cf40..4a4d21f 100644 --- a/src/resources/shader/environmentRenderer.fsh +++ b/src/resources/shader/environmentRenderer.fsh @@ -98,7 +98,11 @@ void main() * saturation + contrast; } - discard(textureRGB.a == 0 || (do_discard_coords == 1 && ( - pVertex.x < discard_coords.x || pVertex.y < discard_coords.y || - pVertex.x > discard_coords.z || pVertex.y > discard_coords.w))); + if( + textureRGB.a == 0 || (do_discard_coords == 1 && ( + pVertex.x < discard_coords.x || pVertex.y < discard_coords.y || + pVertex.x > discard_coords.z || pVertex.y > discard_coords.w))) + { + discard; + } } \ No newline at end of file