mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-28 14:52:53 +00:00
Code Issues Releases Wiki Activity

fix font texture resizing and node insertion of fullwidth char

Browse Source
This commit is contained in:
cvrunmin 2023-07-08 21:18:06 +08:00
parent 1739f2f936
commit cd75c1f1cd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/common/src/client/java/dan200/computercraft/client/render/text/DynamicFontTexture.java
View File

@ -127,7 +127,7 @@ public class DynamicFontTexture extends AbstractTexture {
} }
bind(); bind();
sheetGlyphInfo.upload(assignedNode.x, assignedNode.y); sheetGlyphInfo.upload(assignedNode.x, assignedNode.y);
regGlyphWrapper[0] = new RegisteredGlyph(assignedNode.x, assignedNode.y, assignedNode.x + assignedNode.width, assignedNode.y + assignedNode.height); regGlyphWrapper[0] = new RegisteredGlyph(assignedNode.x, assignedNode.y, assignedNode.x + sheetGlyphInfo.getPixelWidth(), assignedNode.y + sheetGlyphInfo.getPixelHeight());
return null; return null;
}); });
return regGlyphWrapper[0]; return regGlyphWrapper[0];
@ -144,7 +144,7 @@ public class DynamicFontTexture extends AbstractTexture {
TextureUtil.prepareImage(NativeImage.InternalGlFormat.RGBA, newId, desiredSize, desiredSize); TextureUtil.prepareImage(NativeImage.InternalGlFormat.RGBA, newId, desiredSize, desiredSize);
ARBCopyImage.glCopyImageSubData(id, GL11.GL_TEXTURE_2D, 0, 0, 0, 0, ARBCopyImage.glCopyImageSubData(id, GL11.GL_TEXTURE_2D, 0, 0, 0, 0,
newId, GL11.GL_TEXTURE_2D, 0, 0, 0, 0, newId, GL11.GL_TEXTURE_2D, 0, 0, 0, 0,
currentSize, currentSize, 0); currentSize, currentSize, 1);
TextureUtil.releaseTextureId(id); TextureUtil.releaseTextureId(id);
this.id = newId; this.id = newId;
} }
@ -218,11 +218,15 @@ public class DynamicFontTexture extends AbstractTexture {
return this; return this;
} }
int halfSize = width / 2; int halfSize = width / 2;
if(glyphW > halfSize && glyphH > halfSize){
occupied = true;
return this;
}
if(glyphW <= halfSize && glyphH > halfSize){ if(glyphW <= halfSize && glyphH > halfSize){
this.topLeft = new TextureSlotNode(this.x, this.y, halfSize, this.height); this.topLeft = new TextureSlotNode(this.x, this.y, halfSize, this.height);
this.topRight = new TextureSlotNode(this.x + halfSize, this.y, halfSize, this.height); this.topRight = new TextureSlotNode(this.x + halfSize, this.y, halfSize, this.height);
} }
else if(glyphW > halfSize && glyphH <= halfSize){ else if(glyphW > halfSize){
this.topLeft = new TextureSlotNode(this.x, this.y, this.width, halfSize); this.topLeft = new TextureSlotNode(this.x, this.y, this.width, halfSize);
this.bottomLeft = new TextureSlotNode(this.x, this.y + halfSize, this.width, halfSize); this.bottomLeft = new TextureSlotNode(this.x, this.y + halfSize, this.width, halfSize);
} }