working textures

Author: ArtemPopof

src/main/java/org/opengame/engine/TestClient.java

@@ -3,6 +3,7 @@
 import lombok.extern.java.Log;
 import org.joml.Vector3f;
 import org.opengame.engine.app.AppConfig;
+import org.opengame.engine.camera.FlyingCamera;
 import org.opengame.engine.scene.MeshLoader;
 import org.opengame.engine.render.TestCube;
 import org.opengame.engine.scene.Scene;
@@ -23,14 +24,28 @@ public static void main(String[] args) throws IOException, InterruptedException,
         engine.Init(config);
 
         var scene = new Scene();
+        var camera = (FlyingCamera) scene.getCamera();
+        camera.setFlySpeed(0.5f);
 //        for (int i = 0; i < 1; i++) {
 //            scene.add(new TestCube());
 //        }
 
+        var model2 = MeshLoader.loadModel( Engine.getWorkingDirectory() + "models/cube.obj");
+        model2.setTexture("flowers_cloth.dds");
+        model2.setRotation(new Vector3f(5, 11.4f, 0));
+        model2.setPosition(new Vector3f(0, 4, 20));
+        scene.add(model2);
+
+        var model3 = MeshLoader.loadModel( Engine.getWorkingDirectory() + "models/cube.obj");
+        model3.setTexture("cat.dds");
+        model3.setRotation(new Vector3f(5, 21.4f, 0));
+        model3.setPosition(new Vector3f(11, 4, 20));
+        scene.add(model3);
+
         var model = MeshLoader.loadModel( Engine.getWorkingDirectory() + "models/cube.obj");
-        scene.add(model);
         model.setRotation(new Vector3f(0, 1.4f, 0));
         model.setPosition(new Vector3f(0, 1, 20));
+        scene.add(model);
 
         engine.setCurrentScene(scene);
 

src/main/java/org/opengame/engine/camera/FlyingCamera.java

@@ -1,5 +1,7 @@
 package org.opengame.engine.camera;
 
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.java.Log;
 import org.joml.*;
 import org.opengame.engine.Engine;
@@ -20,6 +22,8 @@ public class FlyingCamera extends Camera {
     private final Vector2f windowCenterPos;
 
     private Vector2f viewportSize;
+    @Setter
+    @Getter
     private float flySpeed;
     private boolean isChangingDirection;
     private double lastMouseX = -1;

src/main/java/org/opengame/engine/scene/Mesh.java

@@ -46,8 +46,8 @@ public class Mesh extends SceneObject {
     private final short indexBuffer;
     private final BGFXVertexLayout layout;
     private final short program;
-    private final short texture;
-    private final short textureUniform;
+    private short texture;
+    private short textureUniform;
 
     private final Matrix4x3f model = new Matrix4x3f();
     private final FloatBuffer modelBuffer;
@@ -212,14 +212,23 @@ private ByteBuffer loadResource(String resourcePath) throws IOException {
         return resource;
     }
 
+    public void setTexture(String textureName) throws IOException {
+        bgfx_destroy_texture(texture);
+        bgfx_destroy_uniform(textureUniform);
+
+        texture = loadTexture(textureName);
+        textureUniform = bgfx_create_uniform("s_texColor", BGFX_UNIFORM_TYPE_VEC4, 1);
+    }
+
     @Override
     public void frame(float time, float frameTime) {
-        //bgfx_dbg_text_printf(0, 15, 0x4f, "testClient - OpenGameEngine");
+        bgfx_dbg_text_printf(0, 2, 0x6f, "OpenGameEngine 0.0.1-SNAPSHOT");
+        bgfx_dbg_text_printf(0, 3, 0x0f, String.format("Frame: %7.3f[ms]", frameTime));
 
         long encoder = bgfx_encoder_begin(false);
         bgfx_encoder_set_transform(encoder,
-                   model.translation(position.x, position.y, position.z)
-                        .rotateXYZ(rotation.x, rotation.y, rotation.z)
+                model.translation(position)
+                        .rotateXYZ(rotation)
                         .get4x4(modelBuffer));
 
         bgfx_encoder_set_vertex_buffer(encoder, 0, vertexBuffer, 0, vertexCount);
@@ -234,7 +243,6 @@ public void frame(float time, float frameTime) {
                 | BGFX_STATE_MSAA, 0);
 
         bgfx_encoder_submit(encoder, 0, program, 0, 0);
-
         bgfx_encoder_end(encoder);
     }
 

src/main/java/org/opengame/engine/scene/MeshLoader.java

@@ -57,6 +57,6 @@ private static Mesh createMesh(AIMesh aiMesh) throws IOException {
         }
 
         return new Mesh(meshVertices, meshIndices,
-                "vs_cubes", "fs_cubes", null);
+                "vs_simple_textured", "fs_simple_textured", null);
     }
 }

src/main/java/org/opengame/engine/scene/Model.java

@@ -4,6 +4,7 @@
 import org.joml.Vector3f;
 import org.opengame.engine.object.Renderable;
 
+import java.io.IOException;
 import java.util.List;
 
 public class Model implements Renderable {
@@ -22,6 +23,15 @@ public void setPosition(Vector3f position) {
         meshes.forEach((mesh) -> mesh.setPosition(position));
     }
 
+    public void setTexture(String textureName) {
+        meshes.forEach(mesh -> {
+            try {
+                mesh.setTexture(textureName);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
     @Override
     public void frame(float time, float frameTimeMs) {
         meshes.forEach((mesh) -> mesh.frame(time, frameTimeMs));