From 1b61eca58bc2a113856a90e8973f573e1719f696 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sun, 27 Apr 2025 11:02:55 +0200 Subject: [PATCH] models: remove uv --- .../chess/view/DDDrender/loader/ModelLoader.java | 15 +-------------- .../chess/view/DDDrender/shader/PieceShader.java | 3 +-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/chess/view/DDDrender/loader/ModelLoader.java b/app/src/main/java/chess/view/DDDrender/loader/ModelLoader.java index 3499cb3..851703c 100644 --- a/app/src/main/java/chess/view/DDDrender/loader/ModelLoader.java +++ b/app/src/main/java/chess/view/DDDrender/loader/ModelLoader.java @@ -24,10 +24,8 @@ import chess.view.DDDrender.opengl.VertexBuffer; public class ModelLoader { private static final int VERTEX_SIZE = 3; - private static final int UV_SIZE = 2; private static final int VERTEX_POSITION_INDEX = 0; - private static final int VERTEX_UV_INDEX = 1; - private static final int VERTEX_NORMAL_INDEX = 2; + private static final int VERTEX_NORMAL_INDEX = 1; private static float[] toFloatArray(List list) { float[] result = new float[list.size()]; @@ -47,7 +45,6 @@ public class ModelLoader { private static VertexArray processMesh(AIMesh mesh, AIScene scene) { List positions = new ArrayList<>(); - List textureCoords = new ArrayList<>(); List normals = new ArrayList<>(); List indicies = new ArrayList<>(); @@ -79,24 +76,14 @@ public class ModelLoader { normals.add(normal.z()); } - // PointerBuffer vertexTexture = mesh.mTextureCoords(); - // for (int i = 0; i < vertNumber; i++) { - // PointerBuffer buff = mesh.mTextureCoords(); - // textureCoords.add(buff.get(i).x()); - // textureCoords.add(buff.get(i).y()); - // } - VertexBuffer positionVBO = new VertexBuffer(toFloatArray(positions), VERTEX_SIZE); positionVBO.AddVertexAttribPointer(VERTEX_POSITION_INDEX, VERTEX_SIZE, 0); - VertexBuffer textureVBO = new VertexBuffer(toFloatArray(textureCoords), UV_SIZE); - textureVBO.AddVertexAttribPointer(VERTEX_UV_INDEX, UV_SIZE, 0); VertexBuffer normalVBO = new VertexBuffer(toFloatArray(normals), VERTEX_SIZE); normalVBO.AddVertexAttribPointer(VERTEX_NORMAL_INDEX, VERTEX_SIZE, 0); VertexArray vao = new VertexArray(new ElementBuffer(toIntArray(indicies))); vao.Bind(); vao.BindVertexBuffer(positionVBO); - vao.BindVertexBuffer(textureVBO); vao.BindVertexBuffer(normalVBO); vao.Unbind(); return vao; diff --git a/app/src/main/java/chess/view/DDDrender/shader/PieceShader.java b/app/src/main/java/chess/view/DDDrender/shader/PieceShader.java index 1f49eaf..48bee93 100644 --- a/app/src/main/java/chess/view/DDDrender/shader/PieceShader.java +++ b/app/src/main/java/chess/view/DDDrender/shader/PieceShader.java @@ -11,8 +11,7 @@ public class PieceShader extends ShaderProgram { #version 330 layout(location = 0) in vec3 position; - layout(location = 1) in vec2 uv; - layout(location = 2) in vec3 normal; + layout(location = 1) in vec3 normal; uniform mat4 projectionMatrix; uniform mat4 viewMatrix;