ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed mac render glitch, flipped visualizer

Browse Source
This commit is contained in:
Harrison Deng 2017-09-22 10:26:36 -05:00
parent d64dc8a4d1
commit 307e118b3a
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java
View File

@ -24,7 +24,8 @@ public class BasicVisualizer extends VisualizerCore {
private float barHeightMultiplier; private float barHeightMultiplier;
private float rotation; private float rotation;
private Vector2 angleRot; private Vector2 angleRot;
private boolean flip;
public BasicVisualizer() { public BasicVisualizer() {
super(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()/2, 0, 0); super(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()/2, 0, 0);
barHeightMultiplier = Gdx.graphics.getHeight()*0.008f; barHeightMultiplier = Gdx.graphics.getHeight()*0.008f;
@ -39,8 +40,7 @@ public class BasicVisualizer extends VisualizerCore {
angleRot = new Vector2(MathUtils.cosDeg(rotation), MathUtils.sinDeg(rotation)); angleRot = new Vector2(MathUtils.cosDeg(rotation), MathUtils.sinDeg(rotation));
textures = new Texture[barCount]; textures = new Texture[barCount];
bars = new Sprite[barCount]; bars = new Sprite[barCount];
for (int i = 0; i < textures.length; i++) { for (int i = 0; i < textures.length; i++) {
textures[i] = new Texture(pixmap); textures[i] = new Texture(pixmap);
bars[i] = new Sprite(textures[i]); bars[i] = new Sprite(textures[i]);
@ -108,7 +108,11 @@ public class BasicVisualizer extends VisualizerCore {
for (int i = 0; i < bars.length; i++) { for (int i = 0; i < bars.length; i++) {
barSpace = i*(barWidth+spaceBetweenBars); barSpace = i*(barWidth+spaceBetweenBars);
bars[i].setRotation(rotation); if (flip) {
bars[i].setRotation(rotation+180);
} else {
bars[i].setRotation(rotation);
}
bars[i].setPosition(xPos + barSpace*angleRot.x, yPos + barSpace*angleRot.y); bars[i].setPosition(xPos + barSpace*angleRot.x, yPos + barSpace*angleRot.y);
} }
} }
@ -128,4 +132,12 @@ public class BasicVisualizer extends VisualizerCore {
public void setRotation(float rotation) { public void setRotation(float rotation) {
this.rotation = rotation; this.rotation = rotation;
} }
public void flip() {
flip = flip ? false : true;
}
public boolean isFlipped() {
return flip;
}
} }

8
core/src/zero1hd/rhythmbullet/graphics/meshes/TitleBarMesh.java
View File

@ -81,24 +81,21 @@ public class TitleBarMesh implements Disposable {
verts[idx++] = c; verts[idx++] = c;
} }
private void flush() { public void flush() {
if (idx != 0) { if (idx != 0) {
mesh.setVertices(verts); mesh.setVertices(verts);
Gdx.gl.glDepthMask(false); Gdx.gl.glDepthMask(false);
Gdx.gl.glEnable(GL20.GL_BLEND); Gdx.gl.glEnable(GL20.GL_BLEND);
Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA); Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
int vertCount = idx/TOTAL_VARS; int vertCount = idx/TOTAL_VARS;
cam.setToOrtho(false, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); cam.setToOrtho(false, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
shader.begin(); shader.begin();
shader.setUniformMatrix("u_projTrans", cam.combined); shader.setUniformMatrix("u_projTrans", cam.combined);
mesh.render(shader, GL20.GL_TRIANGLE_FAN, 0, vertCount); mesh.render(shader, GL20.GL_TRIANGLE_FAN, 0, vertCount);
shader.end(); shader.end();
Gdx.gl.glDepthMask(true); Gdx.gl.glDepthMask(true);
@ -110,5 +107,6 @@ public class TitleBarMesh implements Disposable {
@Override @Override
public void dispose() { public void dispose() {
mesh.dispose(); mesh.dispose();
shader.dispose();
} }
} }

3
core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java
View File

@ -28,6 +28,7 @@ public class TitleBarVisualizer extends Group implements Disposable {
hvisual.setWidth(getWidth()); hvisual.setWidth(getWidth());
hvisual.setHeight(Gdx.graphics.getHeight()*0.3f); hvisual.setHeight(Gdx.graphics.getHeight()*0.3f);
hvisual.getVis().flip();
} }
@Override @Override
@ -38,6 +39,8 @@ public class TitleBarVisualizer extends Group implements Disposable {
@Override @Override
public void draw(Batch batch, float parentAlpha) { public void draw(Batch batch, float parentAlpha) {
background.draw(); background.draw();
batch.end();
batch.begin();
super.draw(batch, parentAlpha); super.draw(batch, parentAlpha);
} }

4
core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java
View File

@ -63,4 +63,8 @@ public class Visualizer extends Widget {
public boolean isUpdatePositioning() { public boolean isUpdatePositioning() {
return updatePositioning; return updatePositioning;
} }
public BasicVisualizer getVis() {
return vis;
}
} }

3
desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java
View File

@ -10,6 +10,9 @@ public class DesktopLauncher {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
config.title = "Rhythm Bullet"; config.title = "Rhythm Bullet";
config.resizable = false; config.resizable = false;
config.allowSoftwareMode = true;
config.useHDPI = true;
config.vSyncEnabled = true;
new LwjglApplication(new RhythmBullet(), config); new LwjglApplication(new RhythmBullet(), config);
} }
} }