upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added check for quad builder to always have the particle texture set, and fixed where that wasn't true. Fixes #3653

Browse Source
This commit is contained in:
RainWarrior committed 2017-02-19 22:11:31 +03:00
1 parent 5f6bf3b063
commit b2e3233dc1
2 files changed
+8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java
+3
View File
@@ -71,6 +71,7 @@ public abstract class SimpleModelFontRenderer extends FontRenderer {
float ht = h / 128f;
UnpackedBakedQuad.Builder quadBuilder = new UnpackedBakedQuad.Builder(format);
quadBuilder.setTexture(sprite);
quadBuilder.setQuadOrientation(orientation);
addVertex(quadBuilder, posX + sh, posY, x, y);
@@ -84,6 +85,7 @@ public abstract class SimpleModelFontRenderer extends FontRenderer {
float cuv = 15f / 16f;
quadBuilder = new UnpackedBakedQuad.Builder(format);
quadBuilder.setTexture(sprite);
quadBuilder.setQuadOrientation(orientation);
addVertex(quadBuilder, posX + w + sh, posY, cuv, cuv);
@@ -93,6 +95,7 @@ public abstract class SimpleModelFontRenderer extends FontRenderer {
builder.add(quadBuilder.build());
quadBuilder = new UnpackedBakedQuad.Builder(format);
quadBuilder.setTexture(sprite);
quadBuilder.setQuadOrientation(orientation);
addVertex(quadBuilder, posX + sh, posY + h, cuv, cuv);
src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java
+5
View File
@@ -124,6 +124,7 @@ public class UnpackedBakedQuad extends BakedQuad
this.orientation = orientation;
}
// FIXME: move (or at least add) into constructor
public void setTexture(TextureAtlasSprite texture)
{
this.texture = texture;
@@ -167,6 +168,10 @@ public class UnpackedBakedQuad extends BakedQuad
{
throw new IllegalStateException("not enough data");
}
if(texture == null)
{
throw new IllegalStateException("texture not set");
}
if(contractUVs)
{
float tX = texture.getOriginX() / texture.getMinU();