vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

gg: free gg.create_image from having to be called by sokols init_fn callback

pull/6063/head
Delyan Angelov 2020-08-04 12:37:28 +03:00
parent f3817c47f9
commit 9ce75e10d5
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vlib/gg/gg.v
View File

@ -251,7 +251,8 @@ pub mut:
ok bool ok bool
data voidptr data voidptr
ext string ext string
sokol_img C.sg_image simg_ok bool
simg C.sg_image
} }
pub fn create_image(file string) Image { pub fn create_image(file string) Image {
@ -268,6 +269,10 @@ pub fn create_image(file string) Image {
data: stb_img.data data: stb_img.data
ext: stb_img.ext ext: stb_img.ext
} }
return img
}
pub fn (mut img Image) init_sokol_image() &Image {
mut img_desc := C.sg_image_desc{ mut img_desc := C.sg_image_desc{
width: img.width width: img.width
height: img.height height: img.height
@ -281,7 +286,8 @@ pub fn create_image(file string) Image {
ptr: img.data ptr: img.data
size: img.nr_channels * img.width * img.height size: img.nr_channels * img.width * img.height
} }
img.sokol_img = C.sg_make_image(&img_desc) img.simg = C.sg_make_image(&img_desc)
img.simg_ok = true
return img return img
} }
@ -320,7 +326,14 @@ pub fn (ctx &Context) draw_line(x, y, x2, y2 f32, c gx.Color) {
sgl.end() sgl.end()
} }
pub fn (ctx &Context) draw_image(x, y, width, height f32, img Image) { pub fn (ctx &Context) draw_image(x, y, width, height f32, img &Image) {
if !img.simg_ok {
unsafe {
mut image := img
image.init_sokol_image()
println('>>> img.simg_ok: $img.simg_ok')
}
}
u0 := f32(0.0) u0 := f32(0.0)
v0 := f32(0.0) v0 := f32(0.0)
u1 := f32(1.0) u1 := f32(1.0)
@ -332,7 +345,7 @@ pub fn (ctx &Context) draw_image(x, y, width, height f32, img Image) {
// //
sgl.load_pipeline(ctx.timage_pip) sgl.load_pipeline(ctx.timage_pip)
sgl.enable_texture() sgl.enable_texture()
sgl.texture(img.sokol_img) sgl.texture(img.simg)
sgl.begin_quads() sgl.begin_quads()
sgl.c4b(255, 255, 255, 255) sgl.c4b(255, 255, 255, 255)
sgl.v2f_t2f(x0, y0, u0, v0) sgl.v2f_t2f(x0, y0, u0, v0)