maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix debug draw color

Browse source
This commit is contained in:
unknown 2018-12-24 11:38:54 +01:00
parent d315945b4f
commit 41918ae7da
3 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Shaders/debug_draw/line.vert.glsl
View file

@ -1,21 +1,12 @@
#version 450
// #include "compiled.inc"
in vec3 pos;
in vec3 col;
uniform mat4 VP;
out vec3 color;
// #ifdef HLSL
out vec4 wvpposition;
// #endif
void main() {
color = col;
gl_Position = VP * vec4(pos, 1.0);
// #ifdef HLSL
wvpposition = gl_Position;
// #endif
}

11
Shaders/debug_draw/line_deferred.frag.glsl
View file

@ -1,18 +1,9 @@
#version 450
#include "compiled.inc"
in vec3 color;
// #ifdef HLSL
vec4 wvpposition;
// #endif
out vec4[2] fragColor;
void main() {
// #ifdef HLSL // D3D
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0 - ((wvpposition.z / wvpposition.w) * 0.5 + 0.5));
// #else
// fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0 - gl_FragCoord.z);
// #endif
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0);
fragColor[1] = vec4(color, 1.0);
}

26
Sources/armory/trait/internal/DebugDraw.hx
View file

@ -18,7 +18,7 @@ class DebugDraw {
static var inst:DebugDraw = null;
public var color = 0xffff0000;
public var color:kha.Color = 0xffff0000;
public var strength = 0.02;
var vertexBuffer:VertexBuffer;
@ -146,30 +146,30 @@ class DebugDraw {
vbData.set(i + 0, x1);
vbData.set(i + 1, y1);
vbData.set(i + 2, z1);
vbData.set(i + 3, 1.0);
vbData.set(i + 4, 0.0);
vbData.set(i + 5, 0.0);
vbData.set(i + 3, color.R);
vbData.set(i + 4, color.G);
vbData.set(i + 5, color.B);
vbData.set(i + 6, x2);
vbData.set(i + 7, y2);
vbData.set(i + 8, z2);
vbData.set(i + 9, 1.0);
vbData.set(i + 10, 0.0);
vbData.set(i + 11, 0.0);
vbData.set(i + 9, color.R);
vbData.set(i + 10, color.G);
vbData.set(i + 11, color.B);
vbData.set(i + 12, x2 + strength * l.x);
vbData.set(i + 13, y2 + strength * l.y);
vbData.set(i + 14, z2 + strength * l.z);
vbData.set(i + 15, 1.0);
vbData.set(i + 16, 0.0);
vbData.set(i + 17, 0.0);
vbData.set(i + 15, color.R);
vbData.set(i + 16, color.G);
vbData.set(i + 17, color.B);
vbData.set(i + 18, x1 + strength * l.x);
vbData.set(i + 19, y1 + strength * l.y);
vbData.set(i + 20, z1 + strength * l.z);
vbData.set(i + 21, 1.0);
vbData.set(i + 22, 0.0);
vbData.set(i + 23, 0.0);
vbData.set(i + 21, color.R);
vbData.set(i + 22, color.G);
vbData.set(i + 23, color.B);
i = lines * 6;
ibData[i + 0] = lines * 4 + 0;