refactor(rendering)!: migrate chunk vertex attribute changes by pollend · Pull Request #4735 · MovingBlocks/Terasology

pollend · 2021-05-30T23:52:19Z

This migrates chunkMesh to take advantage of this attribute scheme. I also migrated the code to take advantage of GLSL 330. There isn't really any significant performance changes from what I can tell. one nice thing about this change is that renderdoc is able to properly render frames from the game with debug information about incoming vertices and different state of the rendering peipline. should make it easier to debug our render pipeline.

PR: Terasology/CoreRendering#59

looks like we don't really take good advantage of the depth pass well. most of the texture is unused from what I can tell.

PR: MovingBlocks/Terasology#4735

pollend · 2021-05-31T17:03:29Z

so this should be a first pass on this logic. we probably want to tweak this more.

…ks/Terasology into refactor/rendering-migrate-chunk-vertex-attribute

pollend · 2021-05-31T18:03:52Z

here is how I get this to work under renderdoc

I've just been building the project in intellij and executing ps aux | grep .Terasology and copying the classpath into RenderDoc

/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin/java -Dvisualvm.id=189314906091785 -Xms256m -Xmx1536m -javaagent:/home/michaelpollind/.local/share/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7142.45/lib/idea_rt.jar=38783:/home/michaelpollind/.local/share/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7142.45/bin -Dfile.encoding=UTF-8 -classpath /tmp/classpath973167907.jar org.terasology.engine.Terasology -homedir -noCrashReport

jdrueckert

Works on my machine, but there's some minor issues

jdrueckert · 2021-05-31T18:17:51Z

engine/src/main/resources/org/terasology/engine/include/globalFunctionsFragIncl.glsl

+//bool checkFlag(int flag, float val) {
+//    return val > float(flag) - 0.5 && val < float(flag) + 0.5;
+//}


if we don't use this anymore, can we remove it?

jdrueckert · 2021-05-31T18:17:58Z

engine/src/main/resources/org/terasology/engine/include/globalFunctionsVertIncl.glsl

+//bool checkFlag(uint flag, uint val) {
+//    return flag == val;
+//}


jdrueckert · 2021-05-31T18:18:26Z

engine/src/main/resources/org/terasology/engine/assets/shaders/chunk_vert.glsl

 #if defined (NORMAL_MAPPING)
-    normalMatrix = gl_NormalMatrix;
-    worldSpaceNormal = gl_Normal;
+//    normalMatrix = in_normal;


can this be removed?

jdrueckert · 2021-05-31T18:18:36Z

engine/src/main/resources/org/terasology/engine/assets/shaders/chunk_vert.glsl

+	vertexWorldPos = in_vert + chunkPositionWorld.xyz;
+
+	if (in_frames > 0) {


there seem to be tabs here

jdrueckert · 2021-05-31T18:18:43Z

engine/src/main/resources/org/terasology/engine/assets/shaders/chunk_vert.glsl

+	sunVecView = (modelViewMatrix * vec4(sunVec.x, sunVec.y, sunVec.z, 0.0)).xyz;
+
+	isUpside = in_normal.y > 0.9 ? 1 : 0;


jdrueckert · 2021-05-31T18:18:54Z

engine/src/main/resources/org/terasology/engine/assets/shaders/shadowMap_vert.glsl

+	gl_Position = projectionMatrix * modelViewMatrix *  vec4(in_vert, 1.0);
+	v_pos = gl_Position;


jdrueckert · 2021-05-31T18:19:07Z

engine/src/main/resources/org/terasology/engine/assets/shaders/chunk_vert.glsl

-varying vec3 worldSpaceNormal;
-varying mat3 normalMatrix;
+out vec3 worldSpaceNormal;
+//out mat3 normalMatrix;


jdrueckert · 2021-05-31T18:19:26Z

engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkMesh.java

+        public final VertexAttributeBinding<Vector3fc, Vector3f> position;
+        public final VertexAttributeBinding<Vector3fc, Vector3f> normals;
+        public final VertexAttributeBinding<Vector2fc, Vector2f> uv0;
+//        public final VertexAttributeBinding<Colorc, Color> color; // color data is unused


I want to keep a note here because we had color data that we're not using. I guess the plan was to have colored lights of some kind :?

There were beautiful colored torches long ago, in either case. This might have been left in place by somebody disabling them "temporarily" hoping they'd be back?

pollend · 2021-06-01T05:42:12Z

here is how I get this to work under renderdoc

I've just been building the project in intellij and executing ps aux | grep .Terasology and copying the classpath into RenderDoc

/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin/java -Dvisualvm.id=189314906091785 -Xms256m -Xmx1536m -javaagent:/home/michaelpollind/.local/share/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7142.45/lib/idea_rt.jar=38783:/home/michaelpollind/.local/share/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7142.45/bin -Dfile.encoding=UTF-8 -classpath /tmp/classpath973167907.jar org.terasology.engine.Terasology -homedir -noCrashReport

* refactor(rendering)!: update chunk rendering logic with changes PR: MovingBlocks/Terasology#4735 * chore: clean up states changes in chunkmesh

refactor(rendering): migrate Chunkmesh with vertex attribute changes

c3eadd7

github-actions bot added the Type: Refactoring Request for or implementation of pure and automatic refactorings, e.g. renaming, to improve clarity label May 30, 2021

pollend changed the title ~~refactor(rendering): migrate chunk vertex attribute changes~~ refactor(rendering)!: migrate chunk vertex attribute changes May 30, 2021

pollend added a commit to Terasology/CoreRendering that referenced this pull request May 31, 2021

refactor(rendering)!: update chunk rendering logic with changes

431489e

PR: MovingBlocks/Terasology#4735

pollend mentioned this pull request May 31, 2021

refactor(rendering)!: update chunk rendering logic with changes Terasology/CoreRendering#59

Merged

pollend requested a review from skaldarnar May 31, 2021 00:01

pollend added 2 commits May 30, 2021 17:24

chore: fix fragment for blocklight

439eac0

remove usage of map for ChunkMesh

7190c2c

Merge branch 'feature/mesh-attribute-scheme' of github.com:MovingBloc…

3b8b0d5

…ks/Terasology into refactor/rendering-migrate-chunk-vertex-attribute

Cervator added the Topic: Rendering Requests, Issues and Changes related to lighting, meshes, camera, etc. label May 31, 2021

jdrueckert reviewed May 31, 2021

View reviewed changes

chore: cleanup shader and code

4a6e347

jdrueckert approved these changes May 31, 2021

View reviewed changes

jdrueckert merged commit 6591cd2 into feature/mesh-attribute-scheme May 31, 2021

jdrueckert deleted the refactor/rendering-migrate-chunk-vertex-attribute branch May 31, 2021 20:36

jdrueckert mentioned this pull request May 31, 2021

feature(rendering)!: add vertex attribute scheme #4634

Merged

		vertexWorldPos = in_vert + chunkPositionWorld.xyz;

		if (in_frames > 0) {

		sunVecView = (modelViewMatrix * vec4(sunVec.x, sunVec.y, sunVec.z, 0.0)).xyz;

		isUpside = in_normal.y > 0.9 ? 1 : 0;

		gl_Position = projectionMatrix * modelViewMatrix * vec4(in_vert, 1.0);
		v_pos = gl_Position;

Conversation

pollend commented May 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pollend commented May 31, 2021

Uh oh!

pollend commented May 31, 2021

Uh oh!

jdrueckert left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pollend commented Jun 1, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pollend commented May 30, 2021 •

edited

Loading