merge development into test #26

Merged
j23f0712 merged 95 commits from development into dev/test 2024-12-01 21:02:48 +01:00
2 changed files with 3 additions and 6 deletions
Showing only changes of commit 7a482b74ab - Show all commits

View File

@@ -82,9 +82,6 @@ public void onAction(String name, boolean isPressed, float tpf) {
}
}
}, "Test");
}
@Override

View File

@@ -1,7 +1,7 @@
in vec4 inPosition;
in vec2 inTexCoord;
attribute vec4 inPosition;
attribute vec2 inTexCoord;
out vec2 texCoord;
varying vec2 texCoord;
void main() {
vec2 pos = inPosition.xy * 2.0 - 1.0;