qm3x3,boxf debug, bugfixes

[vg.git] / src / vg / vg_lines.h

diff --git a/src/vg/vg_lines.h b/src/vg/vg_lines.h
index 0263722818b592fa05f4a3db73c1f2f2d80c511c..704d9bde796b28ae16da8005e6d95d20fb376ddc 100644 (file)
--- a/src/vg/vg_lines.h
+++ b/src/vg/vg_lines.h
@@ -1,5 +1,7 @@
 /* Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved */
 
+static int debug_lines_enable = 1;
+
 #ifdef VG_3D
  typedef v3f line_co;
 #else
@@ -63,6 +65,14 @@ vg_lines;
 
 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 );
@@ -127,7 +137,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;
@@ -167,3 +179,44 @@ 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_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 );
+}