Add tint parameterto Atlas and Tilemap

tophat2d · Aug 24, 2024 · 1676de5 · 1676de5
1 parent d07ca1c
commit 1676de5
Show file tree

Hide file tree

Showing 7 changed files with 329 additions and 18 deletions.
diff --git a/src/bindings.c b/src/bindings.c
@@ -208,7 +208,9 @@ umth_tilemap_draw(UmkaStackSlot *p, UmkaStackSlot *r)
 {
 	th_tmap *t = umkaGetParam(p, 0)->ptrVal;
 	th_transform tr = *(th_transform *)umkaGetParam(p, 1);
-	th_tmap_draw(t, tr);
+	uint32_t tint = umkaGetParam(p, 2)->uintVal;
+
+	th_tmap_draw(t, tr, tint);
 }
 
 // checks, if tilemap collides with entity.

diff --git a/src/staembed.c b/src/staembed.c
@@ -1,4 +1,4 @@
-#include "tophat.h"
+#include "tophat.h" 
 const char *th_em_modulesrc[] = {
 "\n"
 "import (\n"
@@ -1559,14 +1559,14 @@ const char *th_em_modulesrc[] = {
 "}\n"
 "\n"
 "\n"
-"fn umth_tilemap_draw(ct: ^Tilemap, tr: th::Transform)\n"
+"fn umth_tilemap_draw(ct: ^Tilemap, tr: th::Transform, tint: uint32)\n"
 "//~~fn Tilemap.draw\n"
 "// Draws the tilemap.\n"
-"fn (t: ^Tilemap) draw*(tr: th::Transform) {\n"
+"fn (t: ^Tilemap) draw*(tr: th::Transform, tint: uint32 = 0xFFFFFFFF) {\n"
 "//~~\n"
 "\tif len(t.cells) == 0 { return }\n"
 "\n"
-"\tumth_tilemap_draw(t, tr)\n"
+"\tumth_tilemap_draw(t, tr, tint)\n"
 "}\n"
 "\n"
 "fn umth_tilemap_getcoll(pos: ^th::Vf2, vert: ^th::Vf2, t: ^Tilemap, e: ^ent::Ent): bool\n"
@@ -2773,10 +2773,10 @@ const char *th_em_modulesrc[] = {
 "\n"
 "//~~fn Atlas.draw\n"
 "// Draws the tile at `at`\n"
-"fn (a: ^Atlas) draw*(at: th::Vf2, t: th::Transform) {\n"
+"fn (a: ^Atlas) draw*(at: th::Vf2, t: th::Transform, tint: uint32 = 0xFFFFFFFF) {\n"
 "//~~\n"
 "\ta.cropSource(at)\n"
-"\ta.i.draw(t, th::white)\n"
+"\ta.i.draw(t, tint)\n"
 "\ta.i.crop({}, {1, 1})\n"
 "}\n"
 "",
@@ -4389,6 +4389,227 @@ const char *th_em_moduledocs[] = {
 "---------\n"
 "\n"
 "",
+"[1mopaque Image[0m\n"
+"\n"
+"[3mtype Image* = struct{ _: ^struct{} }\n"
+"[0m\n"
+"Represents a drawable image. It is an opaque structure.\n"
+"Images support a color filter. It is applied by multiplying the color\n"
+"of each pixel with the filter.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mopaque RenderTarget[0m\n"
+"\n"
+"[3mtype RenderTarget* = struct { _: ^struct{} }\n"
+"[0m\n"
+"An image you can render to.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn createRenderTarget[0m\n"
+"\n"
+"[3mfn createRenderTarget*(size: th::Vf2, filter: int): (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"
+"Image can be retrieved via `toImage`.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn RenderTarget.begin[0m\n"
+"\n"
+"[3mfn (rt: ^RenderTarget) begin*(): std::Err {\n"
+"[0m\n"
+"Begins the render target rendering pass.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn RenderTarget.end[0m\n"
+"\n"
+"[3mfn (rt: ^RenderTarget) end*(wp: th::Vf2): std::Err {\n"
+"[0m\n"
+"Ends the render target rendering pass.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn RenderTarget.toImage[0m\n"
+"\n"
+"[3mfn (rt: ^RenderTarget) toImage*(): Image {\n"
+"[0m\n"
+"Returns the image of the render target. The resulting image has the same\n"
+"lifetime as the base RenderTarget. If you need to use it past the lifetime\n"
+"of the RenderTarget, use the copy method.\n"
+"Do not call `setfilter` on the resulting image.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn load[0m\n"
+"\n"
+"[3mfn load*(path: str): (Image, std::Err) {\n"
+"[0m\n"
+"Loads an image at path.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.validate[0m\n"
+"\n"
+"[3mfn (i: ^Image) validate*(): bool {\n"
+"[0m\n"
+"Returns true, if i\'s handle points to an image.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.flipv[0m\n"
+"\n"
+"[3mfn (i: ^Image) flipv*(flip: bool) {\n"
+"[0m\n"
+"Flips image on it\'s vertical axis.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.fliph[0m\n"
+"\n"
+"[3mfn (i: ^Image) fliph*(flip: bool) {\n"
+"[0m\n"
+"Flips image on it\'s horizontal axis.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.draw[0m\n"
+"\n"
+"[3mfn (i: ^Image) draw*(t: th::Transform, color: uint32 = th::white) {\n"
+"[0m\n"
+"Draws the image in screen coordinates. It transforms it with t and\n"
+"applies color as a color filter.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.blit[0m\n"
+"\n"
+"[3mfn (i: ^Image) blit*(src, dest: rect::Rect, color: uint32 = 0xFFFFFFFF, rot: th::fu = 0, origin: th::Vf2 = {0, 0}) {\n"
+"[0m\n"
+"Copies source rectangle (texture coordinates) to destination rectangle (screen coordinates).\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.drawNinepatch[0m\n"
+"\n"
+"[3mfn (i: ^Image) drawNinepatch*(outer, inner, dest: rect::Rect, color: uint32 = th::white, scale: real = 1.0) {\n"
+"[0m\n"
+"Draws \"nine-patch\" image.\n"
+"`outer` specifies the texture coordinates of the outer rect of source image,\n"
+"`inner` specifies coordinates of inner rect of source image, positioned relative to `outer`.\n"
+"You can tint with `color`.\n"
+"\n"
+"![](img/ninepatch.png)\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.drawOnQuad[0m\n"
+"\n"
+"[3mfn (i: ^Image) drawOnQuad*(q: th::Quad, color: uint32 = th::white) {\n"
+"[0m\n"
+"Draws the image on top of a quad with corners of the image positioned\n"
+"on the verticies of the quad.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.getDims[0m\n"
+"\n"
+"[3mfn (i: ^Image) getDims*(): th::Vf2 {\n"
+"[0m\n"
+"Returns width and heigth.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.crop[0m\n"
+"\n"
+"[3mfn (i: ^Image) crop*(tl, br: th::Vf2) {\n"
+"[0m\n"
+"Crops an image. Coordinates are between 0, 0 (top left) and\n"
+"1, 1 (bottom right)\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.cropPx[0m\n"
+"\n"
+"[3mfn (i: ^Image) cropPx*(tr, br: th::Vf2) {\n"
+"[0m\n"
+"Same as `Image.crop`, but the positions are in pixels.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.cropRect[0m\n"
+"\n"
+"[3mfn (i: ^Image) cropRect*(r: rect::Rect) {\n"
+"[0m\n"
+"Same as `Image.crop`, but uses a rect instead of two positions.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.cropQuad[0m\n"
+"\n"
+"[3mfn (i: ^Image) cropQuad*(q: th::Quad) {\n"
+"[0m\n"
+"Crop an image using a quad.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.getCropQuad[0m\n"
+"\n"
+"[3mfn (i: ^Image) getCropQuad*(): th::Quad {\n"
+"[0m\n"
+"Crop an image using a quad.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn mk[0m\n"
+"\n"
+"[3mfn mk*(data: []uint32, dm: th::Vf2): (Image, std::Err) {\n"
+"[0m\n"
+"Creates an image from raw data.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.copy[0m\n"
+"\n"
+"[3mfn (i: ^Image) copy*(): (Image, std::Err) {\n"
+"[0m\n"
+"Copies image into a new one.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.setfilter[0m\n"
+"\n"
+"[3mfn (i: ^Image) setfilter*(filter: int): 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"
+"used in a loop.\n"
+"https://learnopengl.com/img/getting-started/texture_filtering.png\n"
+"left is nearest, right is linear.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.setData[0m\n"
+"\n"
+"[3mfn (i: ^Image) setData*(data: []uint32, dm: th::Vf2): std::Err {\n"
+"[0m\n"
+"Updates the image data. dm are the dimensions of the new image.\n"
+"The new image doesn\'t have to be the same size as the old one.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn Image.getData[0m\n"
+"\n"
+"[3mfn (i: ^Image) getData*(): []uint32 {\n"
+"[0m\n"
+"Gets the image data. This downloads the data from the GPU on **each call**.\n"
+"Don\'t use in performance critical sections.\n"
+"\n"
+"---------\n"
+"\n"
 "",
 "[1m[0m\n"
 "\n"
@@ -4796,6 +5017,94 @@ const char *th_em_moduledocs[] = {
 "---------\n"
 "\n"
 "",
+"[1m[0m\n"
+"\n"
+"[3m[0m\n"
+"Canvas library allowing for drawing basic shapes. Coordinates are based on\n"
+"the screen.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawText[0m\n"
+"\n"
+"[3mfn drawText*(text: str, pos: th::Vf2, color: uint32, size: th::fu) {\n"
+"[0m\n"
+"Draws a basic pixel text. Only ascii is supported.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn textSize[0m\n"
+"\n"
+"[3mfn textSize*(text: str, scale: th::fu): th::Vf2 {\n"
+"[0m\n"
+"Returns the size of text taken by an equivalent drawText call.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mPixel Font[0m\n"
+"\n"
+"[3mvar pixelFont*: PixelFont\n"
+"[0m\n"
+"The `pixelFont` variable exposes the canvas pixel font as a generic font.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawRect[0m\n"
+"\n"
+"[3mfn drawRect*(color: uint32, r: rect::Rect) {\n"
+"[0m\n"
+"Draws a Rectangle.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawLine[0m\n"
+"\n"
+"[3mfn drawLine*(color: uint32, b, e: th::Vf2, thickness: th::fu) {\n"
+"[0m\n"
+"Draws a line.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawRectLines[0m\n"
+"\n"
+"[3mfn drawRectLines*(color: uint32, r: rect::Rect, thickness: real32 = 1.0) {\n"
+"[0m\n"
+"Draws rect border.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawQuad[0m\n"
+"\n"
+"[3mfn drawQuad*(color: uint32, q: th::Quad) {\n"
+"[0m\n"
+"Draws a convex quad.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn drawTrig[0m\n"
+"\n"
+"[3mfn drawTrig*(color: uint32, a, b, c: th::Vf2) {\n"
+"[0m\n"
+"Draws a triangle.\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn beginScissorRect[0m\n"
+"\n"
+"[3mfn beginScissorRect*(r: rect::Rect, debug: bool = false) {\n"
+"[0m\n"
+"Disable rendering outside of rect `r`\n"
+"\n"
+"---------\n"
+"\n"
+"[1mfn endScissor[0m\n"
+"\n"
+"[3mfn endScissor*() {\n"
+"[0m\n"
+"Stops cropping\n"
+"\n"
+"---------\n"
+"\n"
 "",
 "[1mstruct Rect[0m\n"
 "\n"
@@ -4974,7 +5283,7 @@ const char *th_em_moduledocs[] = {
 "\n"
 "[1mfn Tilemap.draw[0m\n"
 "\n"
-"[3mfn (t: ^Tilemap) draw*(tr: th::Transform) {\n"
+"[3mfn (t: ^Tilemap) draw*(tr: th::Transform, tint: uint32 = 0xFFFFFFFF) {\n"
 "[0m\n"
 "Draws the tilemap.\n"
 "\n"
@@ -5936,7 +6245,7 @@ const char *th_em_moduledocs[] = {
 "\n"
 "[1mfn Atlas.draw[0m\n"
 "\n"
-"[3mfn (a: ^Atlas) draw*(at: th::Vf2, t: th::Transform) {\n"
+"[3mfn (a: ^Atlas) draw*(at: th::Vf2, t: th::Transform, tint: uint32 = 0xFFFFFFFF) {\n"
 "[0m\n"
 "Draws the tile at `at`\n"
 "\n"

diff --git a/src/thextdata.h b/src/thextdata.h
@@ -88,7 +88,7 @@ THEXT(void, th_transform_transform, th_transform *o, th_transform t);
 THEXT(void, th_rotate_point, th_vf2 *p, th_vf2 o, fu rot);
 THEXT(void, th_vector_normalize, float *x, float *y);
 THEXT(uint32_t, th_sg_get_gl_image, sg_image img);
-THEXT(void, th_tmap_draw, th_tmap *t, th_transform tr);
+THEXT(void, th_tmap_draw, th_tmap *t, th_transform tr, uint32_t tint);
 THEXT(void, th_tmap_autotile, uu *tgt, uu *src, uu w, uu h, uu *tiles, uu limiter);
 THEXT(th_shader *, th_get_shader, uu index);
 THEXT(th_shader *, th_get_shader_err, uu index);