Support color option in Switch.IRSensor

TooTallNate · Dec 28, 2023 · 0ad81bb · 0ad81bb
1 parent 2964d88
commit 0ad81bb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/.changeset/tender-boxes-rhyme.md b/.changeset/tender-boxes-rhyme.md
@@ -0,0 +1,5 @@
+---
+'nxjs-runtime': patch
+---
+
+Support `color` option in `Switch.IRSensor`
diff --git a/packages/runtime/src/$.ts b/packages/runtime/src/$.ts
@@ -116,7 +116,7 @@ export interface Init {
 
 	// irs.c
 	irsInit(): () => void;
-	irsSensorNew(image: ImageBitmap): IRSensor;
+	irsSensorNew(image: ImageBitmap, color: RGBA): IRSensor;
 	irsSensorStart(s: IRSensor): void;
 	irsSensorStop(s: IRSensor): void;
 	irsSensorUpdate(s: IRSensor): boolean;

diff --git a/packages/runtime/src/switch/irsensor.ts b/packages/runtime/src/switch/irsensor.ts
@@ -1,3 +1,4 @@
+import colorRgba = require('color-rgba');
 import { $ } from '../$';
 import { ImageBitmap } from '../canvas/image-bitmap';
 import { INTERNAL_SYMBOL } from '../internal';
@@ -28,6 +29,7 @@ export interface IRSensorInit {
 	 * requested.
 	 */
 	frequency?: number;
+	color?: string;
 }
 
 /**
@@ -57,11 +59,15 @@ export class IRSensor extends Sensor {
 			init = true;
 			addEventListener('unload', $.irsInit());
 		}
+		const color = colorRgba(opts.color || 'green');
+		if (!color) {
+			throw new Error(`Invalid color specified: "${opts.color}"`);
+		}
 		// @ts-expect-error Internal constructor
 		super(INTERNAL_SYMBOL);
 		const image = $.imageNew(320, 240) as ImageBitmap;
 		Object.setPrototypeOf(image, ImageBitmap.prototype);
-		const self = $.irsSensorNew(image);
+		const self = $.irsSensorNew(image, color);
 		Object.setPrototypeOf(self, IRSensor.prototype);
 		_.set(self, {
 			activated: false,

diff --git a/source/irs.c b/source/irs.c
@@ -1,12 +1,22 @@
 #include "irs.h"
 #include "image.h"
+#include "canvas.h"
 
 static JSClassID nx_ir_sensor_class_id;
 
+struct RGBA
+{
+	u8 r;
+	u8 g;
+	u8 b;
+	u8 a;
+};
+
 typedef struct
 {
 	IrsIrCameraHandle irhandle;
 	IrsImageTransferProcessorConfig config;
+	struct RGBA color;
 	nx_image_t *image;
 	u8 *sensor_buf;
 	u32 sensor_buf_size;
@@ -60,6 +70,20 @@ static JSValue nx_irs_sensor_new(JSContext *ctx, JSValueConst this_val, int argc
 		return JS_EXCEPTION;
 	}
 
+	u32 r, g, b;
+	double a;
+	if (JS_ToUint32(ctx, &r, JS_GetPropertyUint32(ctx, argv[1], 0)) ||
+		JS_ToUint32(ctx, &g, JS_GetPropertyUint32(ctx, argv[1], 1)) ||
+		JS_ToUint32(ctx, &b, JS_GetPropertyUint32(ctx, argv[1], 2)) ||
+		JS_ToFloat64(ctx, &a, JS_GetPropertyUint32(ctx, argv[1], 3)))
+	{
+		return JS_EXCEPTION;
+	}
+	data->color.r = r;
+	data->color.g = g;
+	data->color.b = b;
+	data->color.a = a * 255;
+
 	// TODO: make configurable
 	HidNpadIdType id = HidNpadIdType_Handheld;
 
@@ -131,7 +155,12 @@ static JSValue nx_irs_sensor_update(JSContext *ctx, JSValueConst this_val, int a
 			{
 				// The IR image/camera is sideways with the joycon held flat.
 				u32 pos = y * data->image->width + x;
-				((u32 *)data->image->data)[pos] = BGRA8_MAXALPHA(/*ir_buffer[pos2]*/ 0, data->sensor_buf[pos], /*ir_buffer[pos2]*/ 0);
+				u8 alpha = (data->sensor_buf[pos] * data->color.a) / 255;
+				((u32 *)data->image->data)[pos] = BGRA8(
+					(data->color.r * alpha) / 255,
+					(data->color.g * alpha) / 255,
+					(data->color.b * alpha) / 255,
+					alpha);
 			}
 		}
 		cairo_surface_mark_dirty_rectangle(