X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=src%2Fvg%2Fvg_lines.h;h=82f1814add1126f90df1dc98abfc3967f6be4515;hb=367883958336d1c04c8a304af6119b21f0f2f15a;hp=c3d94722d6efca492a38418696cf87965768ee48;hpb=a153af7a16d9d4f81e9ebe4cfb2c99a028755189;p=vg.git diff --git a/src/vg/vg_lines.h b/src/vg/vg_lines.h index c3d9472..82f1814 100644 --- a/src/vg/vg_lines.h +++ b/src/vg/vg_lines.h @@ -1,12 +1,27 @@ /* Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved */ +#ifndef VG_LINES_H +#define VG_LINES_H + +#include "vg/vg.h" + +static int debug_lines_enable = 1; + #ifdef VG_3D typedef v3f line_co; #else typedef v2f line_co; #endif -SHADER_DEFINE( vg_line_shader, +static struct vg_shader _shader_lines = +{ + .name = "[vg] lines", + .link = NULL, + .vs = + { + .orig_file = NULL, + .static_src = + #ifdef VG_3D "uniform mat4 uPv;" "layout (location=0) in vec3 a_co;" @@ -27,9 +42,13 @@ SHADER_DEFINE( vg_line_shader, #endif " s_colour = a_colour;" " gl_Position = vert_pos;" - "}", - - // FRAGMENT + "}" + }, + .fs = + { + .orig_file = NULL, + .static_src = + "out vec4 FragColor;" "" "in vec4 s_colour;" @@ -38,9 +57,8 @@ SHADER_DEFINE( vg_line_shader, "{" " FragColor = s_colour;" "}" - , - UNIFORMS({ "uPv" }) -) + } +}; struct { @@ -63,60 +81,81 @@ vg_lines; static void vg_lines_init(void) { - SHADER_INIT( vg_line_shader ); - - glGenVertexArrays( 1, &vg_lines.vao ); - glGenBuffers( 1, &vg_lines.vbo ); - glBindVertexArray( vg_lines.vao ); - - glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo ); - - vg_lines.cap = 10000; - vg_lines.buffer_size = vg_lines.cap * sizeof( struct vg_lines_vert ); - - glBufferData( GL_ARRAY_BUFFER, vg_lines.buffer_size, NULL, GL_DYNAMIC_DRAW ); - glBindVertexArray( vg_lines.vao ); - - glVertexAttribPointer( - 0, - sizeof( vg_lines.buffer[0].co ) / sizeof(float), - GL_FLOAT, - GL_FALSE, - sizeof( struct vg_lines_vert ), - (void *)0 - ); - glEnableVertexAttribArray( 0 ); - - glVertexAttribPointer( - 1, - 4, - GL_UNSIGNED_BYTE, - GL_TRUE, - sizeof( struct vg_lines_vert ), - (void*)(offsetof( struct vg_lines_vert, colour )) - ); - glEnableVertexAttribArray( 1 ); - vg_lines.buffer = malloc( vg_lines.buffer_size ); + vg_info( "vg_lines_init\n" ); + + 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 + }); + + vg_shader_register( &_shader_lines ); + + vg_acquire_thread_sync(); + { + glGenVertexArrays( 1, &vg_lines.vao ); + glGenBuffers( 1, &vg_lines.vbo ); + glBindVertexArray( vg_lines.vao ); + glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo ); + + 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 ); + glBindVertexArray( vg_lines.vao ); + VG_CHECK_GL_ERR(); + + /* Pointers */ + glVertexAttribPointer( + 0, + sizeof( vg_lines.buffer[0].co ) / sizeof(float), + GL_FLOAT, + GL_FALSE, + sizeof( struct vg_lines_vert ), + (void *)0 + ); + glEnableVertexAttribArray( 0 ); + + glVertexAttribPointer( + 1, + 4, + GL_UNSIGNED_BYTE, + GL_TRUE, + sizeof( struct vg_lines_vert ), + (void*)(offsetof( struct vg_lines_vert, colour )) + ); + glEnableVertexAttribArray( 1 ); + + VG_CHECK_GL_ERR(); + + /* Alloc RAM */ + vg_lines.buffer = vg_alloc( vg_lines.buffer_size ); + vg_success( "done\n" ); + } + + vg_release_thread_sync(); } -static void vg_lines_free(void) +static void vg_lines_free(void *nothing) { glDeleteVertexArrays( 1, &vg_lines.vao ); glDeleteBuffers( 1, &vg_lines.vbo ); - - free( vg_lines.buffer ); + vg_free( vg_lines.buffer ); } static void vg_lines_drawall( float* projection ) { - SHADER_USE( vg_line_shader ); + glUseProgram( _shader_lines.id ); #ifdef VG_3D glUniformMatrix4fv #else glUniformMatrix3fv #endif - ( SHADER_UNIFORM( vg_line_shader, "uPv" ), 1, GL_FALSE, projection ); + ( glGetUniformLocation( _shader_lines.id, "uPv" ), 1, GL_FALSE, projection ); glBindVertexArray( vg_lines.vao ); glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo ); @@ -127,8 +166,9 @@ static void vg_lines_drawall( float* projection ) 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; @@ -168,3 +208,102 @@ static void vg_line_box( line_co min, line_co max, u32 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_boxf_transformed( m4x3f m, 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]; + + m4x3_mulv( m, p000, p000 ); + m4x3_mulv( m, p001, p001 ); + m4x3_mulv( m, p010, p010 ); + m4x3_mulv( m, p011, p011 ); + m4x3_mulv( m, p100, p100 ); + m4x3_mulv( m, p101, p101 ); + m4x3_mulv( m, p110, p110 ); + m4x3_mulv( m, p111, p111 ); + + 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 ); + + vg_line( p000, p110, colour ); + vg_line( p100, p010, colour ); +} + +static void vg_line_cross(v3f pos,u32 colour, float scale) +{ + v3f p0, p1; + v3_add( (v3f){ scale,0.0f,0.0f}, pos, p0 ); + v3_add( (v3f){-scale,0.0f,0.0f}, pos, p1 ); + vg_line( p0, p1, colour ); + v3_add( (v3f){0.0f, scale,0.0f}, pos, p0 ); + v3_add( (v3f){0.0f,-scale,0.0f}, pos, p1 ); + vg_line( p0, p1, colour ); + v3_add( (v3f){0.0f,0.0f, scale}, pos, p0 ); + v3_add( (v3f){0.0f,0.0f,-scale}, pos, p1 ); + vg_line( p0, p1, 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 ); +} + +#endif /* VG_LINES_H */