|
31 | 31 | import net.raphimc.noteblocktool.util.SoundSystemSongPlayer;
|
32 | 32 | import net.raphimc.thingl.ThinGL;
|
33 | 33 | import net.raphimc.thingl.renderer.impl.Renderer2D;
|
34 |
| -import net.raphimc.thingl.renderer.text.Font; |
35 | 34 | import net.raphimc.thingl.renderer.text.SDFTextRenderer;
|
36 | 35 | import net.raphimc.thingl.resource.texture.AbstractTexture;
|
37 | 36 | import net.raphimc.thingl.resource.texture.Texture2D;
|
38 | 37 | import net.raphimc.thingl.util.GlobalObjects;
|
| 38 | +import net.raphimc.thingl.util.font.Font; |
39 | 39 | import org.joml.Matrix4fStack;
|
40 | 40 | import org.lwjgl.opengl.GL11C;
|
41 | 41 |
|
@@ -169,7 +169,7 @@ private void drawNotes(final Matrix4fStack positionMatrix) {
|
169 | 169 | final float whiteKeyWidth = (float) width / WHITE_PIANO_KEY_COUNT;
|
170 | 170 | final float blackKeyWidth = whiteKeyWidth * BLACK_KEY_WIDTH_RATIO;
|
171 | 171 | final float noteSize = 16 * Math.max(1, width / 960);
|
172 |
| - final float noteSquishFactor = 1.5F; |
| 172 | + final float noteSquishFactor = 1F; |
173 | 173 |
|
174 | 174 | final Song song = this.songPlayer.getSong();
|
175 | 175 | final int tickWindow = MathUtils.ceilInt(height / (noteSize / noteSquishFactor));
|
@@ -242,13 +242,13 @@ private void drawPiano(final Matrix4fStack positionMatrix) {
|
242 | 242 | final float pressOffset = height / KEY_PRESS_DEPTH_RATIO - height / KEY_PRESS_DEPTH_RATIO * (progress < 0.5F ? 1F - progress : progress);
|
243 | 243 | final String noteName = this.getNoteName(nbsKey);
|
244 | 244 | if (!this.isBlackKey(nbsKey)) {
|
245 |
| - Renderer2D.INSTANCE.filledRectangle(positionMatrix, x, pressOffset, x + 1, height, Color.BLACK); |
246 |
| - Renderer2D.INSTANCE.filledRectangle(positionMatrix, x + whiteKeyWidth - 1, pressOffset, x + whiteKeyWidth, height, Color.BLACK); |
247 | 245 | Renderer2D.INSTANCE.filledRectangle(positionMatrix, x + 1, pressOffset, x + whiteKeyWidth - 1, height, Color.WHITE);
|
248 | 246 | if (this.pianoKeyLastColors[nbsKey] != null) {
|
249 | 247 | Renderer2D.INSTANCE.filledRectangle(positionMatrix, x + 1, pressOffset, x + whiteKeyWidth - 1, height, this.pianoKeyLastColors[nbsKey].withAlpha(Math.round(PRESSED_KEY_COLOR_ALPHA * (1 - colorProgress))));
|
250 | 248 | }
|
251 | 249 | Renderer2D.INSTANCE.filledRectangle(positionMatrix, x, height - whiteKeyLineOffset + pressOffset, x + whiteKeyWidth, height - whiteKeyLineOffset - KEY_LINE_HEIGHT + pressOffset, Color.GRAY);
|
| 250 | + Renderer2D.INSTANCE.filledRectangle(positionMatrix, x, pressOffset, x + 1, height, Color.BLACK); |
| 251 | + Renderer2D.INSTANCE.filledRectangle(positionMatrix, x + whiteKeyWidth - 1, pressOffset, x + whiteKeyWidth, height, Color.BLACK); |
252 | 252 |
|
253 | 253 | this.textRenderer.setGlobalScale(ThinGL.getWindowFramebufferWidth() / 2745F); // 0,7
|
254 | 254 | final float nameWidth = this.textRenderer.calculateWidth(noteName);
|
|
0 commit comments