1
0
Fork 0
forked from AbleOS/ableos

fixes for the absolutely huge breakage pushed

This commit is contained in:
Able 2024-12-16 08:12:12 -06:00 committed by peony
parent afddfea8fb
commit 5cb3b956d9
4 changed files with 21 additions and 14 deletions

6
Cargo.lock generated
View file

@ -213,12 +213,12 @@ dependencies = [
[[package]] [[package]]
name = "hbbytecode" name = "hbbytecode"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a1e692eac73fbf44f1fbf816832aaae0ea8f04d7" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#c0d957e70c7146f2c788a7b410632a940a18768f"
[[package]] [[package]]
name = "hblang" name = "hblang"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a1e692eac73fbf44f1fbf816832aaae0ea8f04d7" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#c0d957e70c7146f2c788a7b410632a940a18768f"
dependencies = [ dependencies = [
"hashbrown", "hashbrown",
"hbbytecode", "hbbytecode",
@ -229,7 +229,7 @@ dependencies = [
[[package]] [[package]]
name = "hbvm" name = "hbvm"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a1e692eac73fbf44f1fbf816832aaae0ea8f04d7" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#c0d957e70c7146f2c788a7b410632a940a18768f"
dependencies = [ dependencies = [
"hbbytecode", "hbbytecode",
] ]

View file

@ -38,9 +38,9 @@ Label := struct {
} }
render_label_to_surface := fn(surface: Surface, label: Label, font: Font, pos: Vec2(uint)): void { render_label_to_surface := fn(surface: Surface, label: Label, font: Font, pos: Vec2(uint)): void {
if label.is_dirty { // if label.is_dirty {
label.surface.clear(label.bg) // render.clear(label.surface, label.bg)
label.surface.put_text(font, .(0, 0), label.fg, label.text) // render.put_text(label.surface, font, .(0, 0), label.fg, label.text)
} // }
surface.put_surface(label.surface, pos, false) // render.put_surface(surface, label.surface, pos, false)
} }

View file

@ -21,13 +21,20 @@ main := fn(): void {
} }
text_label := Label.new_label("kernel : akern 0.2.0\0", 300) text_label := Label.new_label("kernel : akern 0.2.0\0", 300)
text_label.set_color(sunset.server.DECO_COLOUR, render.BLACK) text_label_2 := Label.new_label("os : ableos\0", 300)
text_label_3 := Label.new_label("wm : sunset\0", 300)
text_label.set_color(render.BLACK, render.WHITE)
text_label_2 := Label.new_label("os : ableos\0", 300) text_label_2.set_color(render.BLACK, render.WHITE)
text_label_2.set_color(sunset.server.DECO_COLOUR, render.BLACK) text_label_3.set_color(render.BLACK, render.WHITE)
text_label_3 := Label.new_label("wm : sunset\0", 300)
text_label_3.set_color(sunset.server.DECO_COLOUR, render.BLACK)
pos1 := Vec2(uint).(1, 1)
pos2 := Vec2(uint).(1, 20)
pos3 := Vec2(uint).(1, 40)
// render.clear(window.surface, render.black)
render_label_to_surface(window.surface, text_label, font, pos1)
render_label_to_surface(window.surface, text_label_2, font, pos2)
render_label_to_surface(window.surface, text_label_3, font, pos3)
loop { loop {
render.clear(window.surface, render.BLACK) render.clear(window.surface, render.BLACK)
// render.put_surface(window.surface, image, .(image.width + x % window.data.props.dimensions.x, 40), false) // render.put_surface(window.surface, image, .(image.width + x % window.data.props.dimensions.x, 40), false)

View file

@ -21,7 +21,7 @@ main := fn(): void {
} }
x := 0 x := 0
loop { loop {
render.clear(window.surface, render.black) screen.clear(window.surface, render.BLACK)
render.put_surface(window.surface, image, .(image.width + x % window.data.props.dimensions.x, 20), false) render.put_surface(window.surface, image, .(image.width + x % window.data.props.dimensions.x, 20), false)
_ = sunset.client.send_frame(window) _ = sunset.client.send_frame(window)
x += 1 x += 1