bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create model matrix for Object

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-01-30 13:15:36 +01:00
parent 0594c87f77
commit 89ed1b9571
10 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/mesh/Mesh.java
View File

@@ -1,6 +1,8 @@
package com.bartlomiejpluta.samplegame.core.gl.object.mesh;
import com.bartlomiejpluta.samplegame.core.gl.render.Renderable;
import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.samplegame.core.gl.shader.program.ShaderProgram;
import org.lwjgl.opengl.GL15;
import org.lwjgl.system.MemoryStack;
@@ -44,7 +46,7 @@ public class Mesh implements Renderable {
}
@Override
public void render() {
public void render(ShaderManager shaderManager) {
glBindVertexArray(vaoId);
glEnableVertexAttribArray(0);
glDrawElements(GL_TRIANGLES, elementsCount, GL_UNSIGNED_INT, 0);

15
app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/DefaultRenderer.java
View File

@@ -1,18 +1,14 @@
package com.bartlomiejpluta.samplegame.core.gl.render;
import com.bartlomiejpluta.samplegame.core.ui.Window;
import com.bartlomiejpluta.samplegame.core.gl.shader.constant.UniformName;
import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.samplegame.core.ui.Window;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.lwjgl.system.MemoryStack;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import static org.lwjgl.opengl.GL15.*;
import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
import static org.lwjgl.opengl.GL30.glBindVertexArray;
import static org.lwjgl.opengl.GL30.glGenVertexArrays;
@Slf4j
@Component
@@ -23,7 +19,10 @@ public class DefaultRenderer implements Renderer {
@Override
public void init() {
log.info("Initializing renderer");
shaderManager.createShader("default", "/shaders/default.vs", "/shaders/default.fs");
shaderManager
.createShader("default", "/shaders/default.vs", "/shaders/default.fs")
.selectShader("default")
.createUniform(UniformName.UNI_MODEL_MATRIX);
}
@Override
@@ -33,7 +32,7 @@ public class DefaultRenderer implements Renderer {
shaderManager.selectShader("default").useSelectedShader();
renderable.render();
renderable.render(shaderManager);
shaderManager.detachCurrentShader();
}

5
app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderable.java
View File

@@ -1,6 +1,9 @@
package com.bartlomiejpluta.samplegame.core.gl.render;
import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.samplegame.core.gl.shader.program.ShaderProgram;
public interface Renderable {
void render();
void render(ShaderManager shaderManager);
void cleanUp();
}

5
app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/constant/UniformName.java Executable file
View File

@@ -0,0 +1,5 @@
package com.bartlomiejpluta.samplegame.core.gl.shader.constant;
public interface UniformName {
public static final String UNI_MODEL_MATRIX = "modelMatrix";
}

51
app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/Object.java
View File

@@ -1,15 +1,14 @@
package com.bartlomiejpluta.samplegame.core.world.object;
import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh;
import com.bartlomiejpluta.samplegame.core.gl.render.Renderable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.joml.Matrix4f;
import org.joml.Vector3f;
@RequiredArgsConstructor
public abstract class Object implements Renderable {
private final Mesh mesh;
import static java.lang.Math.toRadians;
public abstract class Object {
private final Matrix4f modelMatrix = new Matrix4f();
@Getter
private final Vector3f position = new Vector3f(0, 0, 0);
@@ -34,6 +33,20 @@ public abstract class Object implements Renderable {
this.position.z = position.z;
return this;
}
public Object movePosition(float x, float y, float z) {
position.x += x;
position.y += y;
position.z += z;
return this;
}
public Object movePosition(Vector3f position) {
this.position.x += position.x;
this.position.y += position.y;
this.position.z += position.z;
return this;
}
public Object setRotation(float x, float y, float z) {
rotation.x = x;
@@ -49,13 +62,27 @@ public abstract class Object implements Renderable {
return this;
}
@Override
public void render() {
mesh.render();
public Object moveRotation(float x, float y, float z) {
rotation.x += x;
rotation.y += y;
rotation.z += z;
return this;
}
@Override
public void cleanUp() {
mesh.cleanUp();
public Object moveRotation(Vector3f rotation) {
this.rotation.x += rotation.x;
this.rotation.y += rotation.y;
this.rotation.z += rotation.z;
return this;
}
public Matrix4f getModelMatrix() {
return modelMatrix
.identity()
.translate(position)
.rotateX((float) toRadians(-rotation.x))
.rotateY((float) toRadians(-rotation.y))
.rotateZ((float) toRadians(-rotation.z))
.scale(scale);
}
}

21
app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/RenderableObject.java Executable file
View File

@@ -0,0 +1,21 @@
package com.bartlomiejpluta.samplegame.core.world.object;
import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh;
import com.bartlomiejpluta.samplegame.core.gl.render.Renderable;
import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public abstract class RenderableObject extends Object implements Renderable {
private final Mesh mesh;
@Override
public void render(ShaderManager shaderManager) {
mesh.render(shaderManager);
}
@Override
public void cleanUp() {
mesh.cleanUp();
}
}

4
app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/Sprite.java
View File

@@ -2,14 +2,14 @@ package com.bartlomiejpluta.samplegame.core.world.object;
import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh;
public class Sprite extends Object {
public class Sprite extends RenderableObject {
private static final float[] VERTICES = new float[]{
-0.5f, 0.5f, 0.0f,
-0.5f, -0.5f, 0.0f,
0.5f, -0.5f, 0.0f,
0.5f, 0.5f, 0.0f
};
private static final int[] ELEMENTS = new int[]{
0, 1, 2,
2, 3, 0

18
app/src/main/java/com/bartlomiejpluta/samplegame/core/world/scene/Scene.java
View File

@@ -1,27 +1,31 @@
package com.bartlomiejpluta.samplegame.core.world.scene;
import com.bartlomiejpluta.samplegame.core.gl.render.Renderable;
import com.bartlomiejpluta.samplegame.core.gl.shader.constant.UniformName;
import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.samplegame.core.world.object.RenderableObject;
import java.util.ArrayList;
import java.util.List;
public class Scene implements Renderable {
private final List<Renderable> renderables = new ArrayList<>();
private final List<RenderableObject> objects = new ArrayList<>();
public Scene add(Renderable renderable) {
renderables.add(renderable);
public Scene add(RenderableObject object) {
objects.add(object);
return this;
}
@Override
public void render() {
for(var renderable : renderables) {
renderable.render();
public void render(ShaderManager shaderManager) {
for(var object : objects) {
shaderManager.setUniform(UniformName.UNI_MODEL_MATRIX, object.getModelMatrix());
object.render(shaderManager);
}
}
@Override
public void cleanUp() {
renderables.forEach(Renderable::cleanUp);
objects.forEach(Renderable::cleanUp);
}
}

6
app/src/main/java/com/bartlomiejpluta/samplegame/game/logic/DefaultGameLogic.java
View File

@@ -7,6 +7,7 @@ import com.bartlomiejpluta.samplegame.core.world.object.Sprite;
import com.bartlomiejpluta.samplegame.core.world.scene.Scene;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.joml.Vector3f;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,12 +18,15 @@ public class DefaultGameLogic implements GameLogic {
private final Renderer renderer;
private final Scene scene = new Scene();
Sprite sprite;
@Override
public void init(Window window) {
log.info("Initializing game logic");
renderer.init();
scene.add(new Sprite());
sprite = new Sprite();
scene.add(sprite);
}
@Override

4
app/src/main/resources/shaders/default.vs
View File

@@ -1,8 +1,10 @@
#version 330
uniform mat4 modelMatrix;
layout(location=0) in vec3 position;
void main()
{
gl_Position = vec4(position, 1.0);
gl_Position = modelMatrix * vec4(position, 1.0);
}