projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uhh
[fishladder.git]
/
vg
/
vg_lines.h
diff --git
a/vg/vg_lines.h
b/vg/vg_lines.h
index 81b009150b4791518087ad5cb130965229d6dc8f..18a0a7c320950e80d0b13f51372b1a408958627a 100644
(file)
--- a/
vg/vg_lines.h
+++ b/
vg/vg_lines.h
@@
-3,15
+3,15
@@
SHADER_DEFINE( vg_line_shader,
// VERTEX
SHADER_DEFINE( vg_line_shader,
// VERTEX
- "layout (location=0) in vec
3
a_co;"
+ "layout (location=0) in vec
2
a_co;"
"layout (location=1) in vec4 a_colour;"
"layout (location=1) in vec4 a_colour;"
- "uniform mat
4
uPv;"
+ "uniform mat
3
uPv;"
""
"out vec4 s_colour;"
""
"void main()"
"{"
""
"out vec4 s_colour;"
""
"void main()"
"{"
- " vec4 vert_pos =
uPv * vec4( a_co
, 1.0 );"
+ " vec4 vert_pos =
vec4( uPv * vec3( a_co, 1.0 )
, 1.0 );"
" s_colour = a_colour;"
" gl_Position = vert_pos;"
"}",
" s_colour = a_colour;"
" gl_Position = vert_pos;"
"}",
@@
-33,14
+33,13
@@
struct
{
struct vg_lines_vert
{
{
struct vg_lines_vert
{
- v
ec3
co;
+ v
2f
co;
u32 colour;
}
*buffer;
GLuint vao, vbo;
u32 draw_idx, cap, buffer_size;
u32 colour;
}
*buffer;
GLuint vao, vbo;
u32 draw_idx, cap, buffer_size;
-
}
vg_lines;
}
vg_lines;
@@
-93,7
+92,7
@@
static void vg_lines_free(void)
static void vg_lines_drawall(void)
{
SHADER_USE( vg_line_shader );
static void vg_lines_drawall(void)
{
SHADER_USE( vg_line_shader );
- glUniformMatrix
4
fv( SHADER_UNIFORM( vg_line_shader, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+ glUniformMatrix
3
fv( SHADER_UNIFORM( vg_line_shader, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
glBindVertexArray( vg_lines.vao );
glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo );
glBindVertexArray( vg_lines.vao );
glBindBuffer( GL_ARRAY_BUFFER, vg_lines.vbo );
@@
-109,18
+108,18
@@
static void vg_lines_drawall(void)
vg_lines.draw_idx = 0;
}
vg_lines.draw_idx = 0;
}
-static void vg_line2( v
ec3 from, vec3
to, u32 fc, u32 tc )
+static void vg_line2( v
2f from, v2f
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;
-
glm_vec3
_copy( from, v[0].co );
-
glm_vec3
_copy( to, v[1].co );
+
v2
_copy( from, v[0].co );
+
v2
_copy( to, v[1].co );
v[0].colour = fc;
v[1].colour = tc;
vg_lines.draw_idx += 2;
}
v[0].colour = fc;
v[1].colour = tc;
vg_lines.draw_idx += 2;
}
-static void vg_line( v
ec3 from, vec3
to, u32 colour )
+static void vg_line( v
2f from, v2f
to, u32 colour )
{
vg_line2( from, to, colour, colour );
}
{
vg_line2( from, to, colour, colour );
}