Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mesh attribute cleanup

Browse Source
This commit is contained in:
Anuken
2021-03-18 15:18:59 -04:00
parent 46cf48e012
commit a8c31d838f
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/graphics/CubemapMesh.java
View File

@@ -3,7 +3,6 @@ package mindustry.graphics;
import arc.*; import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.Texture.*; import arc.graphics.Texture.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*; import arc.util.*;
@@ -60,9 +59,7 @@ public class CubemapMesh implements Disposable{
public CubemapMesh(Cubemap map){ public CubemapMesh(Cubemap map){
this.map = map; this.map = map;
this.map.setFilter(TextureFilter.linear); this.map.setFilter(TextureFilter.linear);
this.mesh = new Mesh(true, vertices.length, 0, this.mesh = new Mesh(true, vertices.length, 0, VertexAttribute.position3);
new VertexAttribute(Usage.position, 3, "a_position")
);
mesh.getVerticesBuffer().limit(vertices.length); mesh.getVerticesBuffer().limit(vertices.length);
mesh.getVerticesBuffer().put(vertices, 0, vertices.length); mesh.getVerticesBuffer().put(vertices, 0, vertices.length);

7
core/src/mindustry/graphics/IndexedRenderer.java
View File

@@ -1,7 +1,6 @@
package mindustry.graphics; package mindustry.graphics;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.*; import arc.math.*;
@@ -200,9 +199,9 @@ public class IndexedRenderer implements Disposable{
if(mesh != null) mesh.dispose(); if(mesh != null) mesh.dispose();
mesh = new Mesh(true, 6 * sprites, 0, mesh = new Mesh(true, 6 * sprites, 0,
new VertexAttribute(Usage.position, 2, "a_position"), VertexAttribute.position,
new VertexAttribute(Usage.colorPacked, 4, "a_color"), VertexAttribute.color,
new VertexAttribute(Usage.textureCoordinates, 2, "a_texCoord0")); VertexAttribute.texCoords);
vertices = new float[6 * sprites * vsize]; vertices = new float[6 * sprites * vsize];
mesh.setVertices(vertices); mesh.setVertices(vertices);
} }

8
core/src/mindustry/graphics/g3d/MeshBuilder.java
View File

@@ -1,8 +1,6 @@
package mindustry.graphics.g3d; package mindustry.graphics.g3d;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.gl.*;
import arc.math.geom.*; import arc.math.geom.*;
import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.graphics.g3d.PlanetGrid.*;
@@ -92,9 +90,9 @@ public class MeshBuilder{
private static void begin(int count){ private static void begin(int count){
mesh = new Mesh(true, count, 0, mesh = new Mesh(true, count, 0,
new VertexAttribute(Usage.position, 3, Shader.positionAttribute), VertexAttribute.position3,
new VertexAttribute(Usage.normal, 3, Shader.normalAttribute), VertexAttribute.normal,
new VertexAttribute(Usage.colorPacked, 4, Shader.colorAttribute) VertexAttribute.color
); );
mesh.getVerticesBuffer().limit(mesh.getMaxVertices()); mesh.getVerticesBuffer().limit(mesh.getMaxVertices());

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=20f1b39b3238d56cff9956db35e808e72d6797b6 archash=4d946367d20f6be02af22084f86ffffa53a0ab8e