Add uniform image::Filter

tophat2d · Aug 25, 2024 · 453a5d9 · 453a5d9
1 parent 1676de5
commit 453a5d9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 39 deletions.
diff --git a/src/staembed.c b/src/staembed.c
@@ -490,6 +490,14 @@ const char *th_em_modulesrc[] = {
 "\t\"th.um\"\n"
 ")\n"
 "\n"
+"//~~enum Filter\n"
+"// Filtering mode for images, render targets, and fonts.\n"
+"type Filter* = enum {\n"
+"\tnearest = 0\n"
+"\tlinear  = 1\n"
+"}\n"
+"//~~\n"
+"\n"
 "//~~opaque Image\n"
 "// Represents a drawable image. It is an opaque structure.\n"
 "// Images support a color filter. It is applied by multiplying the color\n"
@@ -502,12 +510,12 @@ const char *th_em_modulesrc[] = {
 "type RenderTarget* = struct { _: ^struct{} }\n"
 "//~~\n"
 "\n"
-"fn umth_image_create_render_target(ret: ^RenderTarget, width: int, height: int, filter: int): th::ErrCode\n"
+"fn umth_image_create_render_target(ret: ^RenderTarget, width: int, height: int, filter: Filter): th::ErrCode\n"
 "//~~fn createRenderTarget\n"
 "// Creates a render target you can draw to, like to a window.\n"
 "// Filter specifies specfifies filtering for resulting image.\n"
 "// Image can be retrieved via `toImage`.\n"
-"fn createRenderTarget*(size: th::Vf2, filter: int): (RenderTarget, std::Err) {\n"
+"fn createRenderTarget*(size: th::Vf2, filter: Filter): (RenderTarget, std::Err) {\n"
 "//~~\n"
 "\trt := RenderTarget{}\n"
 "\tec := umth_image_create_render_target(&rt, trunc(size.x), trunc(size.y), filter)\n"
@@ -735,14 +743,14 @@ const char *th_em_modulesrc[] = {
 "\treturn img, th::__errFromCode(ec)\n"
 "}\n"
 "\n"
-"fn umth_image_set_filter(data: Image, filter: int): th::ErrCode\n"
+"fn umth_image_set_filter(data: Image, filter: Filter): th::ErrCode\n"
 "//~~fn Image.setfilter\n"
 "// Sets a mag/min filter. 0 is nearest, others are linear.\n"
 "// This function will regenerate the texture. This means it shouldn\'t be\n"
 "// used in a loop.\n"
 "// https://learnopengl.com/img/getting-started/texture_filtering.png\n"
 "// left is nearest, right is linear.\n"
-"fn (i: ^Image) setfilter*(filter: int): std::Err {\n"
+"fn (i: ^Image) setfilter*(filter: Filter): std::Err {\n"
 "//~~\n"
 "\tif !i.validate() {\n"
 "\t\tth::__error(\"image is invalid\")\n"
@@ -2079,19 +2087,13 @@ const char *th_em_modulesrc[] = {
 "import (\n"
 "\t\"th.um\"\n"
 "\t\"std.um\"\n"
+"\t\"image.um\"\n"
 ")\n"
 "\n"
-"//~~Filtering constants\n"
-"type Filter* = enum {\n"
-"\tnearest = 0\n"
-"\tlinear = 1\n"
-"}\n"
-"//~~\n"
-"\n"
 "// TODO: should this be exported and documented?\n"
 "type TrueType* = struct { _: ^struct{} }\n"
 "\n"
-"fn umth_ttf_font_load(f: ^TrueType, path: str, size: th::fu, filter: Filter): th::ErrCode\n"
+"fn umth_ttf_font_load(f: ^TrueType, path: str, size: th::fu, filter: image::Filter): th::ErrCode\n"
 "fn umth_ttf_font_draw(font: TrueType, s: str, x: th::fu, y: th::fu, color: uint32, scale: th::fu)\n"
 "fn umth_ttf_font_measure(font: TrueType, s: str): th::Vf2\n"
 "\n"
@@ -2130,7 +2132,7 @@ const char *th_em_modulesrc[] = {
 "\n"
 "//~~fn load\n"
 "// Loads a font from a path and returns it.\n"
-"fn load*(path: str, size: th::fu, filter: Filter = Filter.linear): (Font, std::Err) {\n"
+"fn load*(path: str, size: th::fu, filter: image::Filter = .linear): (Font, std::Err) {\n"
 "//~~\n"
 "\tvar f: TrueType\n"
 "\tec := umth_ttf_font_load(&f, path, size, filter)\n"
@@ -4389,6 +4391,17 @@ const char *th_em_moduledocs[] = {
 "---------\n"
 "\n"
 "",
+"[1menum Filter[0m\n"
+"\n"
+"[3mtype Filter* = enum {\n"
+"\tnearest = 0\n"
+"\tlinear  = 1\n"
+"}\n"
+"[0m\n"
+"Filtering mode for images, render targets, and fonts.\n"
+"\n"
+"---------\n"
+"\n"
 "[1mopaque Image[0m\n"
 "\n"
 "[3mtype Image* = struct{ _: ^struct{} }\n"
@@ -4409,7 +4422,7 @@ const char *th_em_moduledocs[] = {
 "\n"
 "[1mfn createRenderTarget[0m\n"
 "\n"
-"[3mfn createRenderTarget*(size: th::Vf2, filter: int): (RenderTarget, std::Err) {\n"
+"[3mfn createRenderTarget*(size: th::Vf2, filter: Filter): (RenderTarget, std::Err) {\n"
 "[0m\n"
 "Creates a render target you can draw to, like to a window.\n"
 "Filter specifies specfifies filtering for resulting image.\n"
@@ -4582,7 +4595,7 @@ const char *th_em_moduledocs[] = {
 "\n"
 "[1mfn Image.setfilter[0m\n"
 "\n"
-"[3mfn (i: ^Image) setfilter*(filter: int): std::Err {\n"
+"[3mfn (i: ^Image) setfilter*(filter: Filter): std::Err {\n"
 "[0m\n"
 "Sets a mag/min filter. 0 is nearest, others are linear.\n"
 "This function will regenerate the texture. This means it shouldn\'t be\n"
@@ -5629,16 +5642,6 @@ const char *th_em_moduledocs[] = {
 "\n"
 "---------\n"
 "\n"
-"[1mFiltering constants[0m\n"
-"\n"
-"[3mtype Filter* = enum {\n"
-"\tnearest = 0\n"
-"\tlinear = 1\n"
-"}\n"
-"[0m\n"
-"\n"
-"---------\n"
-"\n"
 "[1minterface Font[0m\n"
 "\n"
 "[3mtype Font* = interface {\n"
@@ -5657,7 +5660,7 @@ const char *th_em_moduledocs[] = {
 "\n"
 "[1mfn load[0m\n"
 "\n"
-"[3mfn load*(path: str, size: th::fu, filter: Filter = Filter.linear): (Font, std::Err) {\n"
+"[3mfn load*(path: str, size: th::fu, filter: image::Filter = .linear): (Font, std::Err) {\n"
 "[0m\n"
 "Loads a font from a path and returns it.\n"
 "\n"

diff --git a/umka/font.um b/umka/font.um
@@ -5,19 +5,13 @@
 import (
 	"th.um"
 	"std.um"
+	"image.um"
 )
 
-//~~Filtering constants
-type Filter* = enum {
-	nearest = 0
-	linear = 1
-}
-//~~
-
 // TODO: should this be exported and documented?
 type TrueType* = struct { _: ^struct{} }
 
-fn umth_ttf_font_load(f: ^TrueType, path: str, size: th::fu, filter: Filter): th::ErrCode
+fn umth_ttf_font_load(f: ^TrueType, path: str, size: th::fu, filter: image::Filter): th::ErrCode
 fn umth_ttf_font_draw(font: TrueType, s: str, x: th::fu, y: th::fu, color: uint32, scale: th::fu)
 fn umth_ttf_font_measure(font: TrueType, s: str): th::Vf2
 
@@ -56,7 +50,7 @@ type Font* = interface {
 
 //~~fn load
 // Loads a font from a path and returns it.
-fn load*(path: str, size: th::fu, filter: Filter = Filter.linear): (Font, std::Err) {
+fn load*(path: str, size: th::fu, filter: image::Filter = .linear): (Font, std::Err) {
 //~~
 	var f: TrueType
 	ec := umth_ttf_font_load(&f, path, size, filter)

diff --git a/umka/image.um b/umka/image.um
@@ -4,6 +4,14 @@ import (
 	"th.um"
 )
 
+//~~enum Filter
+// Filtering mode for images, render targets, and fonts.
+type Filter* = enum {
+	nearest = 0
+	linear  = 1
+}
+//~~
+
 //~~opaque Image
 // Represents a drawable image. It is an opaque structure.
 // Images support a color filter. It is applied by multiplying the color
@@ -16,12 +24,12 @@ type Image* = struct{ _: ^struct{} }
 type RenderTarget* = struct { _: ^struct{} }
 //~~
 
-fn umth_image_create_render_target(ret: ^RenderTarget, width: int, height: int, filter: int): th::ErrCode
+fn umth_image_create_render_target(ret: ^RenderTarget, width: int, height: int, filter: Filter): th::ErrCode
 //~~fn createRenderTarget
 // Creates a render target you can draw to, like to a window.
 // Filter specifies specfifies filtering for resulting image.
 // Image can be retrieved via `toImage`.
-fn createRenderTarget*(size: th::Vf2, filter: int): (RenderTarget, std::Err) {
+fn createRenderTarget*(size: th::Vf2, filter: Filter): (RenderTarget, std::Err) {
 //~~
 	rt := RenderTarget{}
 	ec := umth_image_create_render_target(&rt, trunc(size.x), trunc(size.y), filter)
@@ -249,14 +257,14 @@ fn (i: ^Image) copy*(): (Image, std::Err) {
 	return img, th::__errFromCode(ec)
 }
 
-fn umth_image_set_filter(data: Image, filter: int): th::ErrCode
+fn umth_image_set_filter(data: Image, filter: Filter): th::ErrCode
 //~~fn Image.setfilter
 // Sets a mag/min filter. 0 is nearest, others are linear.
 // This function will regenerate the texture. This means it shouldn't be
 // used in a loop.
 // https://learnopengl.com/img/getting-started/texture_filtering.png
 // left is nearest, right is linear.
-fn (i: ^Image) setfilter*(filter: int): std::Err {
+fn (i: ^Image) setfilter*(filter: Filter): std::Err {
 //~~
 	if !i.validate() {
 		th::__error("image is invalid")