@woosh/meep-engine 2.56.1 → 2.57.0

package/editor/ecs/component/editors/ColorEditor.js

@@ -1,6 +1,6 @@
 import { TypeEditor } from "../TypeEditor.js";
 import EmptyView from "../../../../src/view/elements/EmptyView.js";
-import { rgb2hex } from "../../../../src/core/color/rgb2hex.js";
+import { rgb2hex } from "../../../../src/core/color/hex/rgb2hex.js";
 
 export class ColorEditor extends TypeEditor {
     build(parent, field) {

package/editor/ecs/component/editors/ImagePathEditor.js

@@ -4,13 +4,13 @@ import ImageView from "../../../../src/view/elements/image/ImageView.js";
 import ButtonView from "../../../../src/view/elements/button/ButtonView.js";
 import { url_to_data_url } from "../../../../src/core/binary/url_to_data_url.js";
 import { is_data_url } from "../../../../src/core/binary/is_data_url.js";
-import { LargeStrongEditor } from "./LargeStrongEditor.js";
+import { LargeStringEditor } from "./LargeStringEditor.js";
 
 export class ImagePathEditor extends TypeEditor {
     inline = true;
 
     build(parent, field, registry) {
-        const url_editor = new LargeStrongEditor();
+        const url_editor = new LargeStringEditor();
 
         const editor = url_editor.build(parent, field, registry);
 

package/editor/ecs/component/editors/{LargeStrongEditor.js → LargeStringEditor.js}

@@ -20,7 +20,7 @@ const MAX_PATH_LENGTH_EDITABLE = 256;
  */
 const MAX_CROP_LENGTH = 32;
 
-export class LargeStrongEditor extends TypeEditor {
+export class LargeStringEditor extends TypeEditor {
     inline = true;
 
     build(parent, field, registry) {

package/editor/tools/GridPaintTool.js

@@ -10,7 +10,7 @@ import { decodeMouseEventButtons, PointerDevice } from "../../src/engine/input/d
 import Vector2 from "../../src/core/geom/Vector2.js";
 import TopDownCameraControllerSystem
     from "../../src/engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import { hex2rgb } from "../../src/core/color/hex2rgb.js";
+import { hex2rgb } from "../../src/core/color/hex/hex2rgb.js";
 import { obtainTerrain } from "../../src/engine/ecs/terrain/util/obtainTerrain.js";
 import { pick } from "../../src/engine/ecs/grid/pick.js";
 
@@ -116,7 +116,7 @@ class GridPaintTool extends Tool {
         });
     }
 
-    shutdown() {
+    finalize() {
         this.terrain.overlay.pop();
 
         this.editor.selection.on.added.remove(this.paint, this);
@@ -128,7 +128,7 @@ class GridPaintTool extends Tool {
 
         this.cameraController.stop();
 
-        super.shutdown();
+        super.finalize();
     }
 
     affectTile(_x, _y) {

package/editor/tools/TopDownCameraControlTool.js

@@ -48,7 +48,7 @@ class TopDownCameraControlTool extends Tool {
         this.__controller.build(ecd);
     }
 
-    shutdown() {
+    finalize() {
         this.system.enabled.set(false);
 
         this.__controller.destroy();

package/editor/tools/TransformTool.js

@@ -301,7 +301,7 @@ export class TransformTool extends Tool {
         this.editor.engine.graphics.scene.add(this.editObject);
     }
 
-    shutdown() {
+    finalize() {
         this.editor.selection.forEach(this.handlers.handleSelectionRemoved);
         this.bindings.forEach(function (b) {
             b.unlink();

package/editor/tools/engine/Tool.js

@@ -4,11 +4,12 @@
 
 
 import ObservedValue from '../../../src/core/model/ObservedValue.js';
-import { buildToolStateMachine } from "./ToolStateMachine.js";
 import { ToolState } from "./ToolState.js";
 import ObservedString from "../../../src/core/model/ObservedString.js";
 
 class Tool {
+    #state = ToolState.Initial;
+
     /**
      *
      * @constructor
@@ -38,12 +39,6 @@ class Tool {
          * @type {ObservedString}
          */
         this.icon = new ObservedString("");
-
-        /**
-         *
-         * @type {StateMachine}
-         */
-        this.stateMachine = buildToolStateMachine(this);
     }
 
     /**
@@ -59,35 +54,25 @@ class Tool {
      * @returns {ToolState|number}
      */
     getState() {
-        return this.stateMachine.getState();
+        return this.#state;
     }
 
     isRunning() {
-        return this.getState() === ToolState.Running;
-    }
-
-    /**
-     *
-     * @param {ToolState} s
-     * @returns {Promise}
-     */
-    moveToState(s) {
-        const sm = this.stateMachine;
-
-        return sm.navigateTo(s);
+        return this.#state === ToolState.Running;
     }
 
     /**
      * Activate the tool and prepare it for usage
      */
     initialize() {
+        this.#state = ToolState.Ready;
     }
 
     /**
      * Deactivate the tool and remove and influence it may have
      */
-    shutdown() {
-
+    finalize() {
+        this.#state = ToolState.Ready;
     }
 
     /**
@@ -102,6 +87,7 @@ class Tool {
      * @example Start painting with a brush
      */
     start() {
+        this.#state = ToolState.Running;
     }
 
     /**
@@ -109,7 +95,7 @@ class Tool {
      * @example Finish brush stroke
      */
     stop() {
-
+        this.#state = ToolState.Ready;
     }
 
     handleKeyboardEvent(e) {

package/editor/tools/engine/ToolEngine.js

@@ -10,9 +10,7 @@ import { decodeMouseEventButtons, PointerDevice } from '../../../src/engine/inpu
 import SelectionTool from '../SelectionTool.js';
 import TopDownCameraControlTool from '../TopDownCameraControlTool.js';
 import GridPaintTool from "../GridPaintTool.js";
-import FoliagePaintTool from "../FoliagePaintTool.js";
 import { TransformTool } from "../TransformTool.js";
-import { ToolState } from "./ToolState.js";
 import Clock from "../../../src/engine/Clock.js";
 import { TerrainHeightPaintTool } from "../paint/TerrainHeightPaintTool.js";
 import { TerrainTexturePaintTool } from "../paint/TerrainTexturePaintTool.js";
@@ -47,14 +45,14 @@ ToolEngine.prototype.initialize = function () {
         console.log("active tool changed. Old: ", oldTool, ", New :", newTool);
 
         if (oldTool !== null && typeof oldTool === "object") {
-            oldTool.moveToState(ToolState.Initial);
+            oldTool.finalize();
         }
 
         if (newTool !== null && typeof newTool === "object") {
             newTool.editor = this.editor;
             newTool.engine = this.engine;
 
-            newTool.moveToState(ToolState.Ready);
+            newTool.initialize();
         }
     });
 
@@ -88,7 +86,7 @@ ToolEngine.prototype.initialize = function () {
         .add(terrainTexturePaintTool1)
         .add(terrainTexturePaintTool2)
         .add(terrainTexturePaintTool3)
-        .add(new FoliagePaintTool());
+    ;
 };
 
 /**
@@ -144,7 +142,7 @@ ToolEngine.prototype.startup = function (engine, editor) {
 
             }
 
-            tool.moveToState(ToolState.Running);
+            tool.start();
         }
     }
 
@@ -152,7 +150,7 @@ ToolEngine.prototype.startup = function (engine, editor) {
         const tool = self.active.get();
         if (tool !== null) {
 
-            tool.moveToState(ToolState.Ready);
+            tool.stop();
         }
     }
 

package/editor/tools/paint/TerrainHeightPaintTool.js

@@ -158,8 +158,8 @@ export class TerrainHeightPaintTool extends TerrainPaintTool {
 
     }
 
-    shutdown() {
-        super.shutdown();
+    finalize() {
+        super.finalize();
     }
 
     /**

package/editor/tools/paint/TerrainPaintTool.js

@@ -198,8 +198,8 @@ export class TerrainPaintTool extends Tool {
         engine.devices.pointer.on.wheel.add(this.__handleMouseWheel, this);
     }
 
-    shutdown() {
-        super.shutdown();
+    finalize() {
+        super.finalize();
 
 
         this.terrain.overlay.pop();

package/editor/tools/paint/TerrainTexturePaintTool.js

@@ -86,8 +86,8 @@ export class TerrainTexturePaintTool extends TerrainPaintTool {
         super.initialize();
     }
 
-    shutdown() {
-        super.shutdown();
+    finalize() {
+        super.finalize();
     }
 
     async paint(timeDelta) {

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.56.1",
+  "version": "2.57.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/bvh2/bvh3/query/compute_tight_near_far_clipping_planes.js

@@ -5,7 +5,7 @@ import { array_copy } from "../../../collection/array/array_copy.js";
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
 import { aabb3_array_intersects_frustum_degree } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_degree.js";
 import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
-import { v3_distance_above_plane } from "../../../geom/v3_distance_above_plane.js";
+import { v3_distance_above_plane } from "../../../geom/vec3/v3_distance_above_plane.js";
 import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
 const stack = SCRATCH_UINT32_TRAVERSAL_STACK;

package/src/core/bvh2/traversal/ThreeClippingPlaneComputingBVHVisitor.js

@@ -3,7 +3,7 @@ import { read_frustum_planes_to_array } from "../../geom/3d/frustum/read_frustum
 import {
     aabb3_detailed_volume_intersection_callback_based
 } from "./aabb3_detailed_volume_intersection_callback_based.js";
-import { v3_distance_above_plane } from "../../geom/v3_distance_above_plane.js";
+import { v3_distance_above_plane } from "../../geom/vec3/v3_distance_above_plane.js";
 
 export class ThreeClippingPlaneComputingBVHVisitor extends BVHVisitor {
     constructor() {

package/src/core/bvh2/traversal/__process_point_if_within_planes.js

@@ -1,4 +1,4 @@
-import { v3_distance_above_plane } from "../../geom/v3_distance_above_plane.js";
+import { v3_distance_above_plane } from "../../geom/vec3/v3_distance_above_plane.js";
 import { EPSILON } from "../../math/EPSILON.js";
 
 /**

package/src/core/cache/LoadingCache.js

@@ -24,7 +24,7 @@ class Record {
  * @readonly
  * @type {number}
  */
-const DEFAULT_TIME_TO_LIVE = 300; // 5 Minutes
+const DEFAULT_TIME_TO_LIVE = Infinity;
 
 /**
  * Asynchronous cache capable of resolving its own values by keys
@@ -56,6 +56,7 @@ export class LoadingCache {
 
     /**
      * @see {@link Cache} for more details on what each parameter means
+     * @template K,V
      * @param [maxWeight]
      * @param [keyWeigher]
      * @param [valueWeigher]
@@ -63,7 +64,7 @@ export class LoadingCache {
      * @param [keyEqualityFunction]
      * @param [capacity]
      * @param {number} [timeToLive] in seconds, default is 10 seconds
-     * @param load
+     * @param {function(key:K):Promise<V>} load
      * @param {boolean} [retryFailed]
      */
     constructor({

package/src/core/collection/array/arraySetSortingDiff.spec.js

@@ -1,8 +1,8 @@
 import { arraySetSortingDiff } from "./arraySetSortingDiff.js";
-import { compareNumbers } from "../../primitives/numbers/compareNumbers.js";
+import { number_compare_ascending } from "../../primitives/numbers/number_compare_ascending.js";
 
 test('two empty inputs', () => {
-    expect(arraySetSortingDiff([], [], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([], [], number_compare_ascending)).toEqual({
         uniqueA: [],
         uniqueB: [],
         common: []
@@ -10,7 +10,7 @@ test('two empty inputs', () => {
 });
 
 test('[] and [1] inputs', () => {
-    expect(arraySetSortingDiff([], [1], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([], [1], number_compare_ascending)).toEqual({
         uniqueA: [],
         uniqueB: [1],
         common: []
@@ -18,7 +18,7 @@ test('[] and [1] inputs', () => {
 });
 
 test('[1] and [] inputs', () => {
-    expect(arraySetSortingDiff([1], [], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([1], [], number_compare_ascending)).toEqual({
         uniqueA: [1],
         uniqueB: [],
         common: []
@@ -26,7 +26,7 @@ test('[1] and [] inputs', () => {
 });
 
 test('[1] and [1] inputs', () => {
-    expect(arraySetSortingDiff([1], [1], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([1], [1], number_compare_ascending)).toEqual({
         uniqueA: [],
         uniqueB: [],
         common: [1]
@@ -34,7 +34,7 @@ test('[1] and [1] inputs', () => {
 });
 
 test('[1] and [1,2] inputs', () => {
-    expect(arraySetSortingDiff([1], [1, 2], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([1], [1, 2], number_compare_ascending)).toEqual({
         uniqueA: [],
         uniqueB: [2],
         common: [1]
@@ -42,7 +42,7 @@ test('[1] and [1,2] inputs', () => {
 });
 
 test('[1,2] and [1] inputs', () => {
-    expect(arraySetSortingDiff([1, 2], [1], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([1, 2], [1], number_compare_ascending)).toEqual({
         uniqueA: [2],
         uniqueB: [],
         common: [1]
@@ -50,7 +50,7 @@ test('[1,2] and [1] inputs', () => {
 });
 
 test('[5,4,3,2,1] and [1,2,3,4,5] inputs', () => {
-    expect(arraySetSortingDiff([5, 4, 3, 2, 1], [1, 2, 3, 4, 5], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([5, 4, 3, 2, 1], [1, 2, 3, 4, 5], number_compare_ascending)).toEqual({
         uniqueA: [],
         uniqueB: [],
         common: [1, 2, 3, 4, 5]
@@ -58,16 +58,16 @@ test('[5,4,3,2,1] and [1,2,3,4,5] inputs', () => {
 });
 
 test('[5,1] and [1,2,3,4,5] inputs', () => {
-    expect(arraySetSortingDiff([5, 1], [1, 2, 3, 4, 5], compareNumbers)).toEqual({
+    expect(arraySetSortingDiff([5, 1], [1, 2, 3, 4, 5], number_compare_ascending)).toEqual({
         uniqueA: [],
-        uniqueB: [2,3,4],
+        uniqueB: [2, 3, 4],
         common: [1, 5]
     });
 });
 
 test('[1,2,3,4,5] and [5,1] inputs', () => {
-    expect(arraySetSortingDiff([1, 2, 3, 4, 5], [5, 1], compareNumbers)).toEqual({
-        uniqueA: [2,3,4],
+    expect(arraySetSortingDiff([1, 2, 3, 4, 5], [5, 1], number_compare_ascending)).toEqual({
+        uniqueA: [2, 3, 4],
         uniqueB: [],
         common: [1, 5]
     });

package/src/core/collection/array/weightedRandomFromArray.js

@@ -1,6 +1,6 @@
 import { assert } from "../../assert.js";
-import { compareNumbers } from "../../primitives/numbers/compareNumbers.js";
 import { binarySearchHighIndex } from "./binarySearchHighIndex.js";
+import { number_compare_ascending } from "../../primitives/numbers/number_compare_ascending.js";
 
 
 /**
@@ -45,7 +45,7 @@ export function weightedRandomFromArray(array, random, weight, weightContext, le
 
     const target_weight = random() * weight_total;
 
-    const index = binarySearchHighIndex(scratch_weights, target_weight, compareNumbers, 0, length - 1);
+    const index = binarySearchHighIndex(scratch_weights, target_weight, number_compare_ascending, 0, length - 1);
 
     return array[index];
 }

package/src/core/color/Color.js

@@ -1,15 +1,15 @@
 import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
-import { parseColor } from "./parseColor.js";
+import { parse_color } from "./parse_color.js";
 import { min2 } from "../math/min2.js";
 import { max2 } from "../math/max2.js";
 import { min3 } from "../math/min3.js";
-import { rgb2hsv } from "./rgb2hsv.js";
+import { rgb2hsv } from "./hsv/rgb2hsv.js";
 import { rgb2uint24 } from "./rgb2uint24.js";
 import { clamp01 } from "../math/clamp01.js";
-import { rgb2hex } from "./rgb2hex.js";
-import { linear_to_sRGB } from "./linear_to_sRGB.js";
-import { sRGB_to_linear } from "./sRGB_to_linear.js";
+import { rgb2hex } from "./hex/rgb2hex.js";
+import { linear_to_sRGB } from "./sRGB/linear_to_sRGB.js";
+import { sRGB_to_linear } from "./sRGB/sRGB_to_linear.js";
 import { lerp } from "../math/lerp.js";
 import { float2uint8 } from "../binary/float2uint8.js";
 
@@ -534,7 +534,7 @@ export class Color {
      * @returns {void}
      */
     parse(str) {
-        const c = parseColor(str);
+        const c = parse_color(str);
 
         if (typeof c[3] === "number") {
             this.a = c[3];

package/src/core/color/YCbCr/YCbCr.spec.js

@@ -0,0 +1,16 @@
+import { rgb_to_YCbCr_uint24 } from "./rgb_to_YCbCr_uint24.js";
+import { YCbCr_to_rgb_uint24 } from "./YCbCr_to_rgb_uint24.js";
+
+test("to/from consistency", () => {
+
+    const encoded = rgb_to_YCbCr_uint24(31, 73, 201);
+    const decoded = YCbCr_to_rgb_uint24((encoded >> 16) & 0xFF, (encoded >> 8) & 0xFF, encoded & 0xFF)
+
+    const r = ((decoded >> 16) & 0xFF);
+    const g = ((decoded >> 8) & 0xFF);
+    const b = ((decoded) & 0xFF);
+
+    expect(Math.abs(r - 31)).toBeLessThan(30);
+    expect(Math.abs(g - 73)).toBeLessThan(30);
+    expect(Math.abs(b - 201)).toBeLessThan(30);
+});

package/src/core/color/{YCbCr_to_rgb_uint24.js → YCbCr/YCbCr_to_rgb_uint24.js}

@@ -1,10 +1,8 @@
-import { rgb2uint24 } from "./rgb2uint24.js";
-
 /**
  * @see https://en.wikipedia.org/wiki/YUV
- * @param {number} Y
- * @param {number} Cb
- * @param {number} Cr
+ * @param {number} Y in range 0...255
+ * @param {number} Cb in range 0...255
+ * @param {number} Cr in range 0...255
  * @returns {number}
  */
 export function YCbCr_to_rgb_uint24(Y, Cb, Cr) {
@@ -15,5 +13,7 @@ export function YCbCr_to_rgb_uint24(Y, Cb, Cr) {
     const g = Y - ((_Cb >> 2) + (_Cb >> 4) + (_Cb >> 5)) - ((_Cr >> 1) + (_Cr >> 3) + (_Cr >> 4) + (_Cr >> 5));
     const b = Y + _Cb + (_Cb >> 1) + (_Cb >> 2) + (_Cb >> 6);
 
-    return rgb2uint24(r, g, b);
+    return ((r << 16) & 0xFF0000)
+        | ((g << 8) & 0xFF00)
+        | (b & 0xFF);
 }

package/src/core/color/YCbCr/rgb_to_YCbCr_uint24.js

@@ -0,0 +1,16 @@
+/**
+ *
+ * @param r in range 0...255
+ * @param g in range 0...255
+ * @param b in range 0...255
+ * @return {number}
+ */
+export function rgb_to_YCbCr_uint24(r, g, b) {
+    const Y = 0.299 * r + 0.587 * g + 0.114 * b;
+    const Cb = -0.169 * r - 0.331 * g + 0.499 * b + 128;
+    const Cr = 0.499 * g - 0.418 * g - 0.0813 * b + 128;
+
+    return ((Y << 16) & 0xFF0000)
+        | ((Cb << 8) & 0xFF00)
+        | (Cr & 0xFF);
+}

package/src/core/color/{hex2rgb.js → hex/hex2rgb.js}

@@ -1,4 +1,4 @@
-import { hex2dec } from "../binary/hex2dec.js";
+import { hex2dec } from "../../binary/hex2dec.js";
 
 /**
  *

package/src/core/color/{rgb2hex.js → hex/rgb2hex.js}

@@ -1,4 +1,4 @@
-import { dec2hex } from "../binary/dec2hex.js";
+import { dec2hex } from "../../binary/dec2hex.js";
 
 /**
  * Takes values in 0..255 range

package/src/core/color/{hsv2rgb.js → hsv/hsv2rgb.js}

@@ -1,12 +1,12 @@
-import { clamp01 } from "../math/clamp01.js";
-import { float2uint8 } from "../binary/float2uint8.js";
+import { clamp01 } from "../../math/clamp01.js";
+import { float2uint8 } from "../../binary/float2uint8.js";
 
 /**
  *
  * @param {number} h from 0 to 1
  * @param {number} s from 0 to 1
  * @param {number} v from 0 to 1
- * @returns {{r: number, g: number, b: number}}
+ * @returns {{r: number, g: number, b: number}} output in range 0..255
  */
 export function hsv2rgb(h, s, v) {
 

package/src/core/color/hsv/rgb2hsv.js

@@ -0,0 +1,49 @@
+import { uint82float } from "../../binary/uint82float.js";
+
+/**
+ *
+ * @param {number} r 0 to 255
+ * @param {number} g 0 to 255
+ * @param {number} b 0 to 255
+ * @returns {{h: number, s: number, v: number}}
+ */
+export function rgb2hsv(r, g, b) {
+
+    const _r = uint82float(r);
+    const _g = uint82float(g);
+    const _b = uint82float(b);
+
+
+    const max = Math.max(_r, _g, _b);
+    const min = Math.min(_r, _g, _b);
+
+    let h, s, v = max;
+
+    const d = max - min;
+
+    s = max === 0 ? 0 : d / max;
+
+    if (max === min) {
+        h = 0; // achromatic
+    } else {
+        switch (max) {
+            case _r:
+                h = (_g - _b) / d + (_g < _b ? 6 : 0);
+                break;
+            case _g:
+                h = (_b - _r) / d + 2;
+                break;
+            case _b:
+                h = (_r - _g) / d + 4;
+                break;
+        }
+
+        h /= 6;
+    }
+
+    return {
+        h,
+        s,
+        v
+    };
+}

package/src/core/color/{kelvin_to_rgb.js → kelvin/kelvin_to_rgb.js}

@@ -1,4 +1,4 @@
-import { clamp01 } from "../math/clamp01.js";
+import { clamp01 } from "../../math/clamp01.js";
 
 /**
  * @see https://www.zombieprototypes.com/?p=210

package/src/core/color/{kelvin_to_rgb.spec.js → kelvin/kelvin_to_rgb.spec.js}

@@ -1,6 +1,6 @@
 import { kelvin_to_rgb } from "./kelvin_to_rgb.js";
-import { v3_distance } from "../geom/v3_distance.js";
-import { Color } from "./Color.js";
+import { v3_distance } from "../../geom/vec3/v3_distance.js";
+import { Color } from "../Color.js";
 
 function rgb([r255, g255, b255]) {
     return [r255 * 255, g255 * 255, b255 * 255];

package/src/core/color/{prototype_kelvin_to_rgb.js → kelvin/prototype_kelvin_to_rgb.js}

@@ -1,9 +1,9 @@
-import { CanvasView } from "../../view/elements/CanvasView.js";
+import { CanvasView } from "../../../view/elements/CanvasView.js";
 import { kelvin_to_rgb } from "./kelvin_to_rgb.js";
-import { lerp } from "../math/lerp.js";
-import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
-import sampler2D2Canvas from "../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
-import { sRGB_to_linear } from "./sRGB_to_linear.js";
+import { lerp } from "../../math/lerp.js";
+import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
+import sampler2D2Canvas from "../../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
+import { sRGB_to_linear } from "../sRGB/sRGB_to_linear.js";
 
 const view = new CanvasView();
 

package/src/core/color/{rgb_to_kelvin.spec.js → kelvin/rgb_to_kelvin.spec.js}

@@ -1,5 +1,5 @@
 import { rgb_to_kelvin } from "./rgb_to_kelvin.js";
-import { Color } from "./Color.js";
+import { Color } from "../Color.js";
 
 
 test("1000 K", () => {

package/src/core/color/{parseColor.js → parse_color.js}

@@ -2,8 +2,8 @@
  * Created by Alex on 02/05/2016.
  */
 
-import { hsv2rgb } from "./hsv2rgb.js";
-import { hex2rgb } from "./hex2rgb.js";
+import { hsv2rgb } from "./hsv/hsv2rgb.js";
+import { hex2rgb } from "./hex/hex2rgb.js";
 
 
 const rgbRegEx = /rgb\(\s*([0-9]+),\s*([0-9]+),\s*([0-9]+)\s*\)/;
@@ -11,11 +11,11 @@ const rgbaRegEx = /rgba\(\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([
 const hsvRegEx = /hsv\(([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?)\)/;
 
 /**
- *
+ * Parses most CSS-format colors
  * @param {string|number} c
  * @returns {number[]} Numeric array, values are in Uint8 range (0...255)
  */
-export function parseColor(c) {
+export function parse_color(c) {
 
     const result = [];