diff --git a/lib/umka b/lib/umka index c16dc53..7497aa0 160000 --- a/lib/umka +++ b/lib/umka @@ -1 +1 @@ -Subproject commit c16dc53c5d7007b0838da8bf7598b1dcada8bff6 +Subproject commit 7497aa08382b4cc55f11d7ea5c9961532fb21fd0 diff --git a/tests/fontt.um b/tests/fontt.um index 28c8940..92045af 100644 --- a/tests/fontt.um +++ b/tests/fontt.um @@ -21,7 +21,7 @@ fn init*() { window::setup("my title", 400, 400) window::setViewport(th::Vf2{400, 400}) - f, err = font::load("etc/roboto.ttf", 16, font::Filter.nearest) + f, err = font::load("etc/roboto.ttf", 16, .nearest) std::exitif(err) window::onFrame.register(signal::Callback{ diff --git a/tests/imaget.um b/tests/imaget.um index db3f01d..6ef09fe 100644 --- a/tests/imaget.um +++ b/tests/imaget.um @@ -2,6 +2,7 @@ import ( "std.um" "th.um" + "rt.um" "rect.um" "image.um" "input.um" @@ -20,7 +21,7 @@ fn pixelmerge(r, g, b, a: uint8): uint32 { return r << 24 | g << 16 | b << 8 | a var ( img, img2, img3: image::Image - target: image::RenderTarget + target: rt::RenderTarget ) fn init*() { @@ -52,7 +53,7 @@ fn init*() { img3.crop({ 0.5, 0.5 }, { 1, 1 }) img3.flipv(true) - target, err = image::createRenderTarget(th::Vf2{10, 10}, .nearest) + target, err = rt::mk(th::Vf2{10, 10}, .nearest) std::exitif(err) window::onFrame.register({ @@ -112,7 +113,7 @@ fn init*() { img.draw(th::Transform{ s: th::Vf2{0.5, 0.5}, p: th::Vf2{0, 0}}, 0xFFFFFF99) - err = target.end(window::wp) + err = target.end() std::exitif(err) target.toImage().draw(th::Transform{s: th::Vf2{10, 10}, p: p}) diff --git a/tests/uit.um b/tests/uit.um index d0c5c80..5136736 100644 --- a/tests/uit.um +++ b/tests/uit.um @@ -16,7 +16,7 @@ fn init*() { window::setup("gui test", 600, 600) window::setViewport(th::Vf2{ 200, 200 }) - ft, err := font::load("etc/roboto.ttf", 32, font::Filter.linear) + ft, err := font::load("etc/roboto.ttf", 32, .linear) std::exitif(err) gui = ui::mk(rect::mk(0, 0, 200, 200), ui::getDefaultStyle())