-// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
+/* Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved */
-SHADER_DEFINE( vg_line_shader,
+static int debug_lines_enable = 1;
+
+#ifdef VG_3D
+ typedef v3f line_co;
+#else
+ typedef v2f line_co;
+#endif
- // VERTEX
+SHADER_DEFINE( vg_line_shader,
+#ifdef VG_3D
+ "uniform mat4 uPv;"
+ "layout (location=0) in vec3 a_co;"
+#else
+ "uniform mat3 uPv;"
"layout (location=0) in vec2 a_co;"
+#endif
"layout (location=1) in vec4 a_colour;"
- "uniform mat3 uPv;"
""
"out vec4 s_colour;"
""
"void main()"
"{"
+#ifdef VG_3D
+ " vec4 vert_pos = uPv * vec4( a_co, 1.0 );"
+#else
" vec4 vert_pos = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );"
+#endif
" s_colour = a_colour;"
" gl_Position = vert_pos;"
"}",
{
struct vg_lines_vert
{
+#ifdef VG_3D
+ v3f co;
+#else
v2f co;
+#endif
+
u32 colour;
}
*buffer;
static void vg_lines_init(void)
{
+ vg_convar_push( (struct vg_convar){
+ .name = "debug_lines",
+ .data = &debug_lines_enable,
+ .data_type = k_convar_dtype_i32,
+ .opt_i32 = { .min=0, .max=1, .clamp=1 },
+ .persistent = 1
+ });
+
SHADER_INIT( vg_line_shader );
glGenVertexArrays( 1, &vg_lines.vao );
glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo );
- vg_lines.cap = 10000;
+ vg_lines.cap = 50000;
vg_lines.buffer_size = vg_lines.cap * sizeof( struct vg_lines_vert );
glBufferData( GL_ARRAY_BUFFER, vg_lines.buffer_size, NULL, GL_DYNAMIC_DRAW );
free( vg_lines.buffer );
}
-static void vg_lines_drawall(float* projection)
+static void vg_lines_drawall( float* projection )
{
SHADER_USE( vg_line_shader );
- glUniformMatrix3fv( SHADER_UNIFORM( vg_line_shader, "uPv" ), 1, GL_FALSE, projection );
-
+
+#ifdef VG_3D
+ glUniformMatrix4fv
+#else
+ glUniformMatrix3fv
+#endif
+ ( SHADER_UNIFORM( vg_line_shader, "uPv" ), 1, GL_FALSE, projection );
+
glBindVertexArray( vg_lines.vao );
glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo );
- glBufferSubData( GL_ARRAY_BUFFER, 0, vg_lines.draw_idx * sizeof(struct vg_lines_vert), vg_lines.buffer );
+ glBufferSubData( GL_ARRAY_BUFFER, 0, vg_lines.draw_idx *
+ sizeof(struct vg_lines_vert), vg_lines.buffer );
+
glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glBlendEquation( GL_FUNC_ADD );
-
- glDrawArrays( GL_LINES, 0, vg_lines.draw_idx );
+
+ if( debug_lines_enable )
+ glDrawArrays( GL_LINES, 0, vg_lines.draw_idx );
glDisable( GL_BLEND );
vg_lines.draw_idx = 0;
}
-static void vg_line2( v2f from, v2f to, u32 fc, u32 tc )
+static void vg_line2( line_co from, line_co to, u32 fc, u32 tc )
{
- struct vg_lines_vert *v = vg_lines.buffer + vg_lines.draw_idx;
+ struct vg_lines_vert *v = &vg_lines.buffer[vg_lines.draw_idx];
+
+#ifdef VG_3D
+ v3_copy( from, v[0].co );
+ v3_copy( to, v[1].co );
+#else
v2_copy( from, v[0].co );
v2_copy( to, v[1].co );
+#endif
+
v[0].colour = fc;
v[1].colour = tc;
vg_lines.draw_idx += 2;
}
-static void vg_line( v2f from, v2f to, u32 colour )
+static void vg_line( line_co from, line_co to, u32 colour )
{
vg_line2( from, to, colour, colour );
}
-static void vg_line_box( v2f min, v2f max, u32 colour )
+static void vg_line_box( line_co min, line_co max, u32 colour )
{
+#ifdef VG_3D
+ /* TODO... */
+#else
vg_line( min, (v2f){min[0],max[1]}, colour );
vg_line( (v2f){min[0],max[1]}, max, colour );
vg_line( max, (v2f){max[0],min[1]}, colour );
vg_line( (v2f){max[0],min[1]}, min, colour );
+#endif
+}
+
+static void vg_line_boxf( boxf box, u32 colour )
+{
+ v3f p000, p001, p010, p011, p100, p101, p110, p111;
+
+ p000[0]=box[0][0];p000[1]=box[0][1];p000[2]=box[0][2];
+ p001[0]=box[0][0];p001[1]=box[0][1];p001[2]=box[1][2];
+ p010[0]=box[0][0];p010[1]=box[1][1];p010[2]=box[0][2];
+ p011[0]=box[0][0];p011[1]=box[1][1];p011[2]=box[1][2];
+
+ p100[0]=box[1][0];p100[1]=box[0][1];p100[2]=box[0][2];
+ p101[0]=box[1][0];p101[1]=box[0][1];p101[2]=box[1][2];
+ p110[0]=box[1][0];p110[1]=box[1][1];p110[2]=box[0][2];
+ p111[0]=box[1][0];p111[1]=box[1][1];p111[2]=box[1][2];
+
+ vg_line( p000, p001, colour );
+ vg_line( p001, p011, colour );
+ vg_line( p011, p010, colour );
+ vg_line( p010, p000, colour );
+
+ vg_line( p100, p101, colour );
+ vg_line( p101, p111, colour );
+ vg_line( p111, p110, colour );
+ vg_line( p110, p100, colour );
+
+ vg_line( p100, p000, colour );
+ vg_line( p101, p001, colour );
+ vg_line( p110, p010, colour );
+ vg_line( p111, p011, colour );
+}
+
+static void vg_line_pt3( v3f pt, float size, u32 colour )
+{
+ boxf box =
+ {
+ { pt[0]-size, pt[1]-size, pt[2]-size },
+ { pt[0]+size, pt[1]+size, pt[2]+size }
+ };
+
+ vg_line_boxf( box, colour );
}
projects / vg.git / blobdiff