@shaderfrog/core 3.0.2 → 3.1.0

package/graph/base-node.d.ts

@@ -25,6 +25,11 @@ export type NodePosition = {
     x: number;
     y: number;
 };
+export type NodeInputSectionVisibility = 'visible' | 'hidden';
+export type NodeInputSection = 'Properties' | 'Uniforms' | 'Code';
+export type NodeDisplay = {
+    visibilities: Partial<Record<NodeInputSection, NodeInputSectionVisibility>>;
+};
 export interface BaseNode {
     id: string;
     parentId?: string;
@@ -33,4 +38,5 @@ export interface BaseNode {
     inputs: NodeInput[];
     outputs: NodeOutput[];
     position: NodePosition;
+    display?: NodeDisplay;
 }

package/graph/data-nodes.d.ts

@@ -4,6 +4,7 @@ type Vector = 'vector2' | 'vector3' | 'vector4';
 type Color = 'rgb' | 'rgba';
 type Mat = 'mat2' | 'mat3' | 'mat4' | 'mat2x2' | 'mat2x3' | 'mat2x4' | 'mat3x2' | 'mat3x3' | 'mat3x4' | 'mat4x2' | 'mat4x3' | 'mat4x4';
 export type GraphDataType = Vector | Color | Mat | 'texture' | 'samplerCube' | 'number' | ArrayType;
+export declare const canMapType: (fromType: GraphDataType | undefined, toType: GraphDataType | undefined) => boolean;
 export interface NumberNode extends BaseNode {
     type: 'number';
     value: string;
@@ -40,13 +41,17 @@ export interface TextureNode extends BaseNode {
 export declare const textureNode: (id: string, name: string, position: NodePosition, value?: TextureNodeValueData) => TextureNode;
 export type TextureDataUniform = Pick<TextureNode, 'type' | 'value' | 'name'>;
 export declare const textureUniformData: (name: string, value: TextureNodeValueData) => TextureDataUniform;
+export type SamplerCubeNodeValueData = {
+    assetId?: number;
+    versionId?: number;
+};
 export interface SamplerCubeNode extends BaseNode {
     type: 'samplerCube';
-    value: string;
+    value?: SamplerCubeNodeValueData;
 }
-export declare const samplerCubeNode: (id: string, name: string, position: NodePosition, value: string) => SamplerCubeNode;
+export declare const samplerCubeNode: (id: string, name: string, position: NodePosition, value?: SamplerCubeNodeValueData) => SamplerCubeNode;
 export type SamplerCubeDataUniform = Pick<SamplerCubeNode, 'type' | 'value' | 'name'>;
-export declare const samplerCubeUniformData: (name: string, value: string) => SamplerCubeDataUniform;
+export declare const samplerCubeUniformData: (name: string, value: SamplerCubeNodeValueData) => SamplerCubeDataUniform;
 export type ArrayValue = string[];
 export interface ArrayNode extends BaseNode {
     type: 'array';

package/graph/data-nodes.js

@@ -9,6 +9,20 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var TypeCompatibility = [
+    new Set(['vector4', 'rgba']),
+    new Set(['vector3', 'rgb']),
+    // Note vector4 is wrong here - you can't plug a *data* vector4 into a
+    // texture. But the output of a shader node is a *bakeable* vector4. This
+    // allows that. Needs updating to take into account data vs code
+    new Set(['texture', 'samplerCube', 'vector4']),
+];
+export var canMapType = function (fromType, toType) {
+    if (fromType === toType || !fromType || !toType) {
+        return true;
+    }
+    return TypeCompatibility.some(function (compatibility) { return compatibility.has(fromType) && compatibility.has(toType); });
+};
 export var numberNode = function (id, name, position, value, optionals) { return ({
     type: 'number',
     id: id,
@@ -46,7 +60,7 @@ export var textureNode = function (id, name, position, value) { return ({
         {
             name: 'texture',
             id: '1',
-            dataType: 'vector4',
+            dataType: 'texture',
             category: 'data',
         },
     ],
@@ -57,18 +71,22 @@ export var samplerCubeNode = function (id, name, position, value) { return ({
     id: id,
     name: name,
     position: position,
-    value: value,
     inputs: [],
     outputs: [
         {
             name: 'samplerCube',
             id: '1',
-            dataType: 'vector4',
+            dataType: 'samplerCube',
             category: 'data',
         },
     ],
+    value: value,
+}); };
+export var samplerCubeUniformData = function (name, value) { return ({
+    type: 'samplerCube',
+    name: name,
+    value: value,
 }); };
-export var samplerCubeUniformData = function (name, value) { return ({ type: 'samplerCube', name: name, value: value }); };
 export function arrayNode(id, name, position, value) {
     return {
         id: id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaderfrog/core",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Shaderfrog core",
   "type": "module",
   "files": [
@@ -50,7 +50,7 @@
   "peerDependencies": {
     "@shaderfrog/glsl-parser": "^6.0.0-beta.7",
     "babylonjs": ">=4",
-    "playcanvas": "^1.65.3",
+    "playcanvas": ">=1.65.3",
     "three": ">=0.50"
   },
   "peerDependenciesMeta": {

package/plugins/three/threngine.js

@@ -129,6 +129,11 @@ export var phongNode = function (id, name, position, uniforms, stage) {
                     : namedAttributeStrategy('position'),
             ],
         },
+        display: {
+            visibilities: {
+                Uniforms: 'hidden',
+            },
+        },
         inputs: [],
         outputs: [
             {
@@ -196,6 +201,11 @@ export var physicalNode = function (id, name, position, uniforms, stage) {
                     : namedAttributeStrategy('position'),
             ],
         },
+        display: {
+            visibilities: {
+                Uniforms: 'hidden',
+            },
+        },
         inputs: [],
         outputs: [
             {
@@ -421,6 +431,11 @@ export var toonNode = function (id, name, position, uniforms, stage) {
                     : namedAttributeStrategy('position'),
             ],
         },
+        display: {
+            visibilities: {
+                Uniforms: 'hidden',
+            },
+        },
         inputs: [],
         outputs: [
             {