@woosh/meep-engine 2.43.47 → 2.43.49

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

@@ -55,6 +55,9 @@ export class DataType {
      * @returns {DataType}
      */
     static from(id, name) {
+        assert.isNonNegativeInteger(id, 'id');
+        assert.isString(name, 'name');
+
         const r = new DataType();
 
         r.id = id;
@@ -63,3 +66,10 @@ export class DataType {
         return r;
     }
 }
+
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+DataType.prototype.isDataType = true;

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/core/model/node-graph/node/NodeDescription.js

@@ -110,6 +110,7 @@ export class NodeDescription {
      * @returns {NodeParameterDescription}
      */
     getParameter(id) {
+        assert.isNonNegativeInteger(id, 'id');
 
         const paramDescriptors = this.parameters;
 
@@ -133,6 +134,13 @@ export class NodeDescription {
      * @param {PortDirection} direction
      */
     createPort(type, name, direction) {
+        assert.defined(type, 'type');
+        assert.notNull(type, 'type');
+        assert.equal(type.isDataType, true, 'type.isDataType !== true');
+
+        assert.defined(direction, 'direction');
+        assert.isString(name, 'name');
+
         const port = new Port();
 
         const id = pickNewSetId(this.ports);
@@ -154,6 +162,8 @@ export class NodeDescription {
      * @returns {Port|null}
      */
     getPortById(id) {
+        assert.isNonNegativeInteger(id, 'id');
+
         for (const port of this.ports) {
             if (port.id === id) {
                 return port;
@@ -170,6 +180,7 @@ export class NodeDescription {
      * @return {Port|undefined}
      */
     getPortByName(name) {
+        assert.isString(name, 'name');
 
         for (const port of this.ports) {
             if (port.name === name) {

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/render/forward_plus/materials/FP_SHADER_CHUNK_ACCUMULATION.js

@@ -61,53 +61,15 @@ 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;
-                // mat3 decal_view_transform = mat3(transpose(inverse(viewMatrix*decal_transform_matrix)));
-                // mat3 decal_view_transform = mat3(transpose(inverse(  decal_transform_matrix )));
-                                
-                // vec3 decal_normal = normalize(vec3(
-                //     decal_view_transform[1][0], decal_view_transform[1][1], decal_view_transform[1][2]
-                // )); 
-                  
-                //   vec3 decal_normal = normalize(vec3(
-                //     decal_view_transform[0][2], decal_view_transform[1][2], decal_view_transform[2][2]
-                // ));  
-                  vec3 decal_normal = normalize(vec3(
+                vec3 decal_normal = normalize(vec3(
                     decal_transform_matrix[0][2], decal_transform_matrix[1][2], decal_transform_matrix[2][2]
                 )); 
-                //
-                
-                
-                // vec3 decal_normal = normalize( ( decal_view_transform * vec3( 0.0, 1.0, 0.0 ) ).xyz );
-                // vec3 decal_normal = normalize( ( transpose(inverse(  decal_view_transform )) * vec4( 0.0, 1.0, 0.0, 0.0 ) ).xyz );
                 
                 // Get geometry normal in world-space
                 vec3 g_normal = normalize( ( transpose(viewMatrix) * vec4( geometry.normal, 0.0 ) ).xyz );
-                
-                    // material.diffuseColor = geometry.normal*0.5 + 0.5;
-                    // material.diffuseColor = normalize( ( viewMatrix * vec4( geometry.normal, 0.0 ) ).xyz )*0.5 + 0.5;
-                    // material.diffuseColor = decal_normal*0.5 + 0.5;
-                    
-                // material.diffuseColor = mix(vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0), decal_normal.y*0.5 + 0.5);
-                // material.diffuseColor = mix(vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0), g_normal.y*0.5 + 0.5);
-                // material.diffuseColor = g_normal*0.5 + 0.5;
-                // continue;
-                
-                // if(length(local_position.xyz) < 0.3){
-                //     // circle in the center
-                //     material.diffuseColor = g_normal*0.5 + 0.5;
-                // }else{
-                //     material.diffuseColor = decal_normal*0.5 + 0.5;
-                // }
-                //
-                // continue;
-                
+                                
                 float decal_surface_dot = dot(decal_normal, g_normal);
-                
-                // material.diffuseColor = mix(vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0), decal_surface_dot);
-                // continue;
-                
+                                
                 // 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.5,-0.7,decal_surface_dot);

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.47",
+  "version": "2.43.49",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",