@woosh/meep-engine 2.43.46 → 2.43.48

package/core/model/node-graph/NodeGraph.js

@@ -69,7 +69,7 @@ export class NodeGraph {
         const n = nodes.length;
 
         for (let i = 0; i < n; i++) {
-            const node = nodes[i];
+            const node = nodes.get(i);
 
             if (node.id === id) {
                 return node;

package/core/model/node-graph/NodeGraph.spec.js

@@ -31,3 +31,19 @@ test("createConnection returns a number", () => {
 
     expect(typeof g.createConnection(i0, pOut, i1, pInt)).toBe('number');
 });
+
+test('getNode produces correct result', () => {
+    const graph = new NodeGraph();
+
+    //
+    expect(graph.getNode(0)).toBe(undefined);
+
+    const d = new NodeDescription();
+
+    const node_id = graph.createNode(d);
+
+    const node_instance = graph.getNode(node_id);
+
+    expect(node_instance).toBeDefined();
+    expect(node_instance.id).toBe(node_id);
+});

package/engine/asset/loaders/image/png/prototypePNG.js

@@ -7,7 +7,7 @@ const array_loader = new ArrayBufferLoader();
 
 
 
-array_loader.load('moicon/bad_png_01/splat_height_2_messed_up (1).png',(asset)=>{
+array_loader.load('moicon/ISO 7010 - Safety Signs (3)/ISO 7010 - Safety Signs/Emergency/400px/E001 – Emergency exit (left hand).png',(asset)=>{
 
     const array = asset.create();
 

package/engine/graphics/ecs/decal/v2/prototypeDecalSystem.js

@@ -26,6 +26,7 @@ import { DrawMode } from "../../mesh-v2/DrawMode.js";
 import { OctahedralUvEncoder } from "../../../impostors/octahedral/grid/OctahedralUvEncoder.js";
 import { makeSolidArrowGeometry } from "../../../../../editor/process/symbolic/makeSolidArrowGeometry.js";
 import { vec3 } from "gl-matrix";
+import Quaternion from "../../../../../core/geom/Quaternion.js";
 
 const decal_urls = `data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/staff_13_t.png
 data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/artifact_01_t.png
@@ -266,10 +267,7 @@ function grid(ecd, offset_x, offset_y, x, y, size_x, size_y, spacing, textures)
 
 }
 
-function makeNormalTestGridDecal(ecd) {
-
-    const GRID_OFFSET = new Vector3(5, 0, 5);
-
+function makeNormalTestGridDecal(ecd, root_transform = new Transform()) {
     const uv = new OctahedralUvEncoder();
 
     const GRID_SIZE = 9;
@@ -285,7 +283,7 @@ function makeNormalTestGridDecal(ecd) {
 
             uv.uv_to_unit(direction, [i / (GRID_SIZE - 1), j / (GRID_SIZE - 1)]);
 
-            vec3.negate(direction,direction);
+            vec3.negate(direction, direction);
 
             const decal = new Decal();
 
@@ -298,14 +296,14 @@ function makeNormalTestGridDecal(ecd) {
             const transform = new Transform();
             transform.position.set(
                 SPACING * i,
+                SPACING * j,
                 0,
-                SPACING * j
             );
+            transform.scale.setScalar(1);
+            transform.rotation._lookRotation(direction[0],direction[2], direction[1] , 0, 1, 0);
 
-            transform.position.add(GRID_OFFSET);
+            transform.multiplyTransforms(root_transform, transform);
 
-            transform.scale.setScalar(1);
-            transform.rotation._lookRotation(direction[0], direction[1], direction[2], 0, 1, 0);
 
             entity
                 .add(ShadedGeometry.from(DEBUG_BOX, new LineBasicMaterial(), DrawMode.LineSegments))
@@ -422,7 +420,32 @@ async function main(engine) {
 
     const task = countTask(0, ENTITY_COUNT, makeOne);
 
-    makeNormalTestGridDecal(ecd);
+    const q_down = new Quaternion();
+    q_down.lookRotation(Vector3.down)
+
+    makeNormalTestGridDecal(ecd, Transform.fromJSON({
+        position: new Vector3(5, 0, 5),
+        rotation: q_down
+    }));
+
+
+    const q_forward = new Quaternion();
+    q_forward.lookRotation(Vector3.forward)
+
+    const t_forward_grid = Transform.fromJSON({
+        position: new Vector3(5, 4, 5),
+        rotation: q_forward
+    });
+    makeNormalTestGridDecal(ecd, t_forward_grid);
+
+    new EntityBuilder()
+        .add(SGMesh.fromURL('data/models/snaps/cube_white.gltf'))
+        .add(Transform.fromJSON({
+        position:new Vector3(14,1,4.8),
+            rotation: t_forward_grid.rotation,
+            scale: new Vector3(25,25,0.1)
+        }))
+        .build(ecd);
 
     // TaskLoadingScreen.instance.load(engine, task);
 

package/engine/graphics/render/forward_plus/materials/FP_SHADER_CHUNK_ACCUMULATION.js

@@ -61,18 +61,18 @@ export const FP_SHADER_CHUNK_ACCUMULATION = `
                 vec4 light_data_4 = texelFetch(fp_t_light_data, address_to_data_texture_coordinates(light_address+4u), 0);
                 
                 // compute normal of the decal, we get this by extracting rotation matrix and transforming (0,1,0) vector using that 
-                
-                mat4 decal_view_transform = viewMatrix*decal_transform_matrix;
-                
                 vec3 decal_normal = normalize(vec3(
-                    decal_view_transform[1][0], decal_view_transform[1][1], decal_view_transform[1][2]
-                ));
-                
-                float decal_surface_dot = dot(decal_normal, geometry.normal);
+                    decal_transform_matrix[0][2], decal_transform_matrix[1][2], decal_transform_matrix[2][2]
+                )); 
                 
+                // Get geometry normal in world-space
+                vec3 g_normal = normalize( ( transpose(viewMatrix) * vec4( geometry.normal, 0.0 ) ).xyz );
+                                
+                float decal_surface_dot = dot(decal_normal, g_normal);
+                                
                 // we fade out decals when the projection angle to the surface gets too steep
                 // 0.7 is cos(45deg) and 0.5 is cos(60deg), dot returns cos of angle between two normals
-                float decal_surface_angle_fade = smoothstep(0.7,0.5,decal_surface_dot);
+                float decal_surface_angle_fade = smoothstep(-0.5,-0.7,decal_surface_dot);
                 
                 if(decal_surface_angle_fade <= 0.0){
                     continue;

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.43.46",
+  "version": "2.43.48",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",