halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

cleaned up a bit remind me to clean up camera

pull/1/head
BuildTools 2019-05-27 19:52:41 +10:00
parent 6f873a81a8
commit 5eeccfa5d6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
View File

@ -37,9 +37,7 @@ public class ParticleRenderer {
Matrix4f viewMatrix = Maths.createViewMatrix(camera);
prepare();
for(ParticleTexture texture : particles.keySet()) {
GL13.glActiveTexture(GL13.GL_TEXTURE0);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture.getTextureID());
shader.loadNumberOfRows(texture.getNumberOfRows());
bindTexture(texture);
for(Particle particle : particles.get(texture)) {
updateModelViewMatrix(particle.getPosition(), particle.getRotation(), particle.getScale().x, viewMatrix);
}
@ -53,6 +51,12 @@ public class ParticleRenderer {
shader.cleanUp();
}
private void bindTexture(ParticleTexture texture) {
GL13.glActiveTexture(GL13.GL_TEXTURE0);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture.getTextureID());
shader.loadNumberOfRows(texture.getNumberOfRows());
}
private void updateModelViewMatrix(Vector3f position, float rotation, float scale, Matrix4f viewMatrix) {
Matrix4f modelMatrix = new Matrix4f();
Matrix4f.translate(position, modelMatrix, modelMatrix);
@ -68,7 +72,6 @@ public class ParticleRenderer {
Matrix4f.rotate((float)Math.toRadians(rotation), new Vector3f(0,0,1), modelMatrix, modelMatrix);
Matrix4f.scale(new Vector3f(scale,scale,scale), modelMatrix, modelMatrix);
Matrix4f modelViewMatrix = Matrix4f.mul(viewMatrix, modelMatrix, null);
shader.loadModelViewMatrix(modelViewMatrix);
}
private void prepare(){

BIN
target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class
View File

Binary file not shown.