mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

remove old float type entirely

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-06-25 21:36:44 +02:00
parent a911146182
commit f26e65a943
10 changed files with 80 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gl/1shader.v
View File

@ -166,7 +166,7 @@ pub fn (s Shader) uni_location(key string) int {
return C.glGetUniformLocation(s.program_id, key.str)
}
// fn (s Shader) set_mat4(str string, f *float) {
// fn (s Shader) set_mat4(str string, f *f32) {
pub fn (s Shader) set_mat4(str string, m glm.Mat4) {
// TODO cache uniform location
C.glUniformMatrix4fv(s.uni_location(str), 1, false, m.data)
@ -177,6 +177,6 @@ pub fn (s Shader) set_int(str string, n int) {
}
pub fn (s Shader) set_color(str string, c gx.Color) {
C.glUniform3f(s.uni_location(str), float(c.r) / 255.0, float(c.g) / 255.0, float(c.b) / 255.0)
C.glUniform3f(s.uni_location(str), f32(c.r) / 255.0, f32(c.g) / 255.0, f32(c.b) / 255.0)
}

14
gl/gl.v
View File

@ -33,7 +33,7 @@ pub fn viewport(a int, b int, c int, d int) {
}
pub fn clear_color(r, g, b, a int) {
# glClearColor(((float)r)/255.0,((float)g)/255.0,b/255.0, a/255.0);
# glClearColor(((f32)r)/255.0,((f32)g)/255.0,b/255.0, a/255.0);
}
pub fn clear() {
@ -132,14 +132,14 @@ pub fn buffer_data_int(typ int, vertices[]int, draw_typ int) {
C.glBufferData(typ, size, vertices.data, draw_typ)
}
pub fn buffer_data_float(typ int, vertices[]float, draw_typ int) {
size := sizeof(float) * vertices.len
pub fn buffer_data_f32(typ int, vertices[]f32, draw_typ int) {
size := sizeof(f32) * vertices.len
C.glBufferData(typ, size, vertices.data, draw_typ)
}
pub fn set_vbo(vbo u32, vertices[]float, draw_typ int) {
pub fn set_vbo(vbo u32, vertices[]f32, draw_typ int) {
gl.bind_buffer(GL_ARRAY_BUFFER, vbo)
gl.buffer_data_float(GL_ARRAY_BUFFER, vertices, draw_typ)
gl.buffer_data_f32(GL_ARRAY_BUFFER, vertices, draw_typ)
}
pub fn set_ebo(ebo u32, indices[]int, draw_typ int) {
@ -182,8 +182,8 @@ pub fn gen_buffer() u32 {
pub fn vertex_attrib_pointer(index, size int, typ int, normalized bool, stride int, ptr int) {
if typ == GL_FLOAT {
stride *= sizeof(float)
ptr *= sizeof(float)
stride *= sizeof(f32)
ptr *= sizeof(f32)
}
C.glVertexAttribPointer(index, size, typ, normalized, stride, ptr)
}