@onerjs/smart-filters 8.43.1 → 8.43.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/blockFoundation/blockDisableStrategy.d.ts +17 -0
- package/dist/blockFoundation/blockDisableStrategy.d.ts.map +1 -0
- package/dist/blockFoundation/blockDisableStrategy.js +18 -0
- package/dist/blockFoundation/blockDisableStrategy.js.map +1 -0
- package/dist/blockFoundation/disableableShaderBlock.d.ts +2 -16
- package/dist/blockFoundation/disableableShaderBlock.d.ts.map +1 -1
- package/dist/blockFoundation/disableableShaderBlock.js +3 -17
- package/dist/blockFoundation/disableableShaderBlock.js.map +1 -1
- package/dist/serialization/importCustomBlockDefinition.d.ts.map +1 -1
- package/dist/serialization/importCustomBlockDefinition.js +3 -0
- package/dist/serialization/importCustomBlockDefinition.js.map +1 -1
- package/dist/utils/buildTools/buildToolsLogger.d.ts +18 -0
- package/dist/utils/buildTools/buildToolsLogger.d.ts.map +1 -0
- package/dist/utils/buildTools/buildToolsLogger.js +19 -0
- package/dist/utils/buildTools/buildToolsLogger.js.map +1 -0
- package/dist/utils/buildTools/convertGlslIntoBlock.js +1 -1
- package/dist/utils/buildTools/convertGlslIntoBlock.js.map +1 -1
- package/dist/utils/buildTools/convertGlslIntoShaderProgram.d.ts.map +1 -1
- package/dist/utils/buildTools/convertGlslIntoShaderProgram.js +2 -2
- package/dist/utils/buildTools/convertGlslIntoShaderProgram.js.map +1 -1
- package/dist/utils/buildTools/convertShaders.js +5 -5
- package/dist/utils/buildTools/convertShaders.js.map +1 -1
- package/dist/utils/buildTools/shaderConverter.d.ts +2 -3
- package/dist/utils/buildTools/shaderConverter.d.ts.map +1 -1
- package/dist/utils/buildTools/shaderConverter.js +9 -9
- package/dist/utils/buildTools/shaderConverter.js.map +1 -1
- package/dist/utils/buildTools/watchShaders.d.ts +0 -7
- package/dist/utils/buildTools/watchShaders.d.ts.map +1 -1
- package/dist/utils/buildTools/watchShaders.js +6 -6
- package/dist/utils/buildTools/watchShaders.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
- package/src/blockFoundation/blockDisableStrategy.ts +17 -0
- package/src/blockFoundation/disableableShaderBlock.ts +4 -18
- package/src/serialization/importCustomBlockDefinition.ts +3 -0
- package/src/utils/buildTools/buildToolsLogger.ts +21 -0
- package/src/utils/buildTools/convertGlslIntoBlock.ts +1 -1
- package/src/utils/buildTools/convertGlslIntoShaderProgram.ts +2 -2
- package/src/utils/buildTools/convertShaders.ts +5 -5
- package/src/utils/buildTools/shaderConverter.ts +13 -14
- package/src/utils/buildTools/watchShaders.ts +6 -7
- package/src/version.ts +1 -1
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The strategy to use for making a block disableable.
|
|
3
|
+
*/
|
|
4
|
+
export declare enum BlockDisableStrategy {
|
|
5
|
+
/**
|
|
6
|
+
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
7
|
+
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
8
|
+
*/
|
|
9
|
+
Manual = 0,
|
|
10
|
+
/**
|
|
11
|
+
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
12
|
+
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
13
|
+
* you'll need to use the Manual strategy instead.
|
|
14
|
+
*/
|
|
15
|
+
AutoSample = 1
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=blockDisableStrategy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blockDisableStrategy.d.ts","sourceRoot":"","sources":["../../src/blockFoundation/blockDisableStrategy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,oBAAoB;IAC5B;;;OAGG;IACH,MAAM,IAAI;IAEV;;;;OAIG;IACH,UAAU,IAAI;CACjB"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The strategy to use for making a block disableable.
|
|
3
|
+
*/
|
|
4
|
+
export var BlockDisableStrategy;
|
|
5
|
+
(function (BlockDisableStrategy) {
|
|
6
|
+
/**
|
|
7
|
+
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
8
|
+
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
9
|
+
*/
|
|
10
|
+
BlockDisableStrategy[BlockDisableStrategy["Manual"] = 0] = "Manual";
|
|
11
|
+
/**
|
|
12
|
+
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
13
|
+
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
14
|
+
* you'll need to use the Manual strategy instead.
|
|
15
|
+
*/
|
|
16
|
+
BlockDisableStrategy[BlockDisableStrategy["AutoSample"] = 1] = "AutoSample";
|
|
17
|
+
})(BlockDisableStrategy || (BlockDisableStrategy = {}));
|
|
18
|
+
//# sourceMappingURL=blockDisableStrategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blockDisableStrategy.js","sourceRoot":"","sources":["../../src/blockFoundation/blockDisableStrategy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,oBAaX;AAbD,WAAY,oBAAoB;IAC5B;;;OAGG;IACH,mEAAU,CAAA;IAEV;;;;OAIG;IACH,2EAAc,CAAA;AAClB,CAAC,EAbW,oBAAoB,KAApB,oBAAoB,QAa/B"}
|
|
@@ -2,6 +2,8 @@ import type { SmartFilter } from "../smartFilter.js";
|
|
|
2
2
|
import type { ConnectionPoint } from "../connection/connectionPoint.js";
|
|
3
3
|
import { ConnectionPointType } from "../connection/connectionPointType.js";
|
|
4
4
|
import { ShaderBlock } from "./shaderBlock.js";
|
|
5
|
+
import { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
6
|
+
export { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
5
7
|
/**
|
|
6
8
|
* The interface that describes the disableable block.
|
|
7
9
|
*/
|
|
@@ -11,22 +13,6 @@ export interface IDisableableBlock {
|
|
|
11
13
|
*/
|
|
12
14
|
disabled: ConnectionPoint<ConnectionPointType.Boolean>;
|
|
13
15
|
}
|
|
14
|
-
/**
|
|
15
|
-
* The strategy to use for making a block disableable.
|
|
16
|
-
*/
|
|
17
|
-
export declare enum BlockDisableStrategy {
|
|
18
|
-
/**
|
|
19
|
-
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
20
|
-
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
21
|
-
*/
|
|
22
|
-
Manual = 0,
|
|
23
|
-
/**
|
|
24
|
-
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
25
|
-
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
26
|
-
* you'll need to use the Manual strategy instead.
|
|
27
|
-
*/
|
|
28
|
-
AutoSample = 1
|
|
29
|
-
}
|
|
30
16
|
/**
|
|
31
17
|
* A ShaderBlock that can be disabled. The optimizer can optionally remove disabled blocks from the graph,
|
|
32
18
|
* or they can be controlled by the disabled connection point at runtime. If disabled, they pass the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disableableShaderBlock.d.ts","sourceRoot":"","sources":["../../src/blockFoundation/disableableShaderBlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"disableableShaderBlock.d.ts","sourceRoot":"","sources":["../../src/blockFoundation/disableableShaderBlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;CAC1D;AAED;;;;GAIG;AACH,8BAAsB,sBAAuB,SAAQ,WAAY,YAAW,iBAAiB;IACzF;;OAEG;IACH,SAAgB,QAAQ,gHAAgG;IAExH;;OAEG;IACH,SAAgB,oBAAoB,EAAE,oBAAoB,CAAC;IAQ3D,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAS;IAC9C,OAAO,KAAK,sBAAsB,GAEjC;IACD,OAAO,KAAK,sBAAsB,QAEjC;IAED;;;OAGG;IACa,gBAAgB;IAkBhC;;;;;;OAMG;gBACS,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,UAAQ,EAAE,eAAe,uBAAkC;CAIrI"}
|
|
@@ -2,23 +2,9 @@ import { ConnectionPointType } from "../connection/connectionPointType.js";
|
|
|
2
2
|
import { CreateStrongRef } from "../runtime/strongRef.js";
|
|
3
3
|
import { ShaderBlock } from "./shaderBlock.js";
|
|
4
4
|
import { InjectAutoSampleDisableCode } from "../utils/shaderCodeUtils.js";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
export var BlockDisableStrategy;
|
|
9
|
-
(function (BlockDisableStrategy) {
|
|
10
|
-
/**
|
|
11
|
-
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
12
|
-
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
13
|
-
*/
|
|
14
|
-
BlockDisableStrategy[BlockDisableStrategy["Manual"] = 0] = "Manual";
|
|
15
|
-
/**
|
|
16
|
-
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
17
|
-
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
18
|
-
* you'll need to use the Manual strategy instead.
|
|
19
|
-
*/
|
|
20
|
-
BlockDisableStrategy[BlockDisableStrategy["AutoSample"] = 1] = "AutoSample";
|
|
21
|
-
})(BlockDisableStrategy || (BlockDisableStrategy = {}));
|
|
5
|
+
import { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
6
|
+
// Re-export for backward compatibility
|
|
7
|
+
export { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
22
8
|
/**
|
|
23
9
|
* A ShaderBlock that can be disabled. The optimizer can optionally remove disabled blocks from the graph,
|
|
24
10
|
* or they can be controlled by the disabled connection point at runtime. If disabled, they pass the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disableableShaderBlock.js","sourceRoot":"","sources":["../../src/blockFoundation/disableableShaderBlock.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"disableableShaderBlock.js","sourceRoot":"","sources":["../../src/blockFoundation/disableableShaderBlock.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,uCAAuC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAYjE;;;;GAIG;AACH,MAAM,OAAgB,sBAAuB,SAAQ,WAAW;IAkB5D,IAAY,sBAAsB;QAC9B,OAAQ,IAAI,CAAC,WAA6C,CAAC,sBAAsB,CAAC;IACtF,CAAC;IACD,IAAY,sBAAsB,CAAC,KAAc;QAC5C,IAAI,CAAC,WAA6C,CAAC,sBAAsB,GAAG,KAAK,CAAC;IACvF,CAAC;IAED;;;OAGG;IACa,gBAAgB;QAC5B,MAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAE/C,gFAAgF;QAChF,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC/B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;YAEnC,6BAA6B;YAC7B,QAAQ,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAChC,KAAK,oBAAoB,CAAC,UAAU;oBAChC,2BAA2B,CAAC,aAAa,CAAC,CAAC;oBAC3C,MAAM;YACd,CAAC;QACL,CAAC;QAED,OAAO,aAAa,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACH,YAAY,WAAwB,EAAE,IAAY,EAAE,mBAAmB,GAAG,KAAK,EAAE,eAAe,GAAG,oBAAoB,CAAC,UAAU;QAC9H,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAtDlD;;WAEG;QACa,aAAQ,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAoDpH,IAAI,CAAC,oBAAoB,GAAG,eAAe,CAAC;IAChD,CAAC;;AA9CD,2GAA2G;AAC3G,4GAA4G;AAC5G,4GAA4G;AAC5G,uGAAuG;AACvG,iHAAiH;AACjH,2BAA2B;AACZ,6CAAsB,GAAG,KAAK,AAAR,CAAS"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importCustomBlockDefinition.d.ts","sourceRoot":"","sources":["../../src/serialization/importCustomBlockDefinition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"importCustomBlockDefinition.d.ts","sourceRoot":"","sources":["../../src/serialization/importCustomBlockDefinition.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAKhF;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,GAAG,yBAAyB,CAyB7F"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ConnectionPointType } from "../connection/connectionPointType.js";
|
|
2
|
+
import { Logger } from "@onerjs/core/Misc/logger.js";
|
|
2
3
|
import { HasGlslHeader, ParseFragmentShader } from "../utils/buildTools/shaderConverter.js";
|
|
4
|
+
import { setLogger } from "../utils/buildTools/buildToolsLogger.js";
|
|
3
5
|
/**
|
|
4
6
|
* Imports a serialized custom block definition. Supports either serialized CustomShaderBlock definitions or
|
|
5
7
|
* CustomAggregateBlock definitions. Can throw an exception if the serialized data is invalid.
|
|
@@ -43,6 +45,7 @@ export function ImportCustomBlockDefinition(serializedData) {
|
|
|
43
45
|
* @returns The serialized block definition
|
|
44
46
|
*/
|
|
45
47
|
function ImportAnnotatedGlsl(fragmentShader) {
|
|
48
|
+
setLogger(Logger);
|
|
46
49
|
const fragmentShaderInfo = ParseFragmentShader(fragmentShader);
|
|
47
50
|
if (!fragmentShaderInfo.blockType) {
|
|
48
51
|
throw new Error("blockType must be defined");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importCustomBlockDefinition.js","sourceRoot":"","sources":["../../src/serialization/importCustomBlockDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"importCustomBlockDefinition.js","sourceRoot":"","sources":["../../src/serialization/importCustomBlockDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,oCAA4B;AAC7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAI5F,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,2BAA2B,CAAC,cAAsB;IAC9D,IAAI,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,OAAO,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACJ,0CAA0C;QAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEnD,0FAA0F;QAC1F,IAAI,eAAe,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,eAAe,CAAC,MAAM,GAAG,aAAa,CAAC;QAC3C,CAAC;QAED,qDAAqD;QACrD,gHAAgH;QAChH,IAAI,eAAe,CAAC,MAAM,KAAK,aAAa,IAAI,eAAe,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;YACjG,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC;QACrD,CAAC;QAED,aAAa;QACb,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAS,mBAAmB,CAAC,cAAsB;IAC/C,SAAS,CAAC,MAAM,CAAC,CAAC;IAClB,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAE/D,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC;IAED,wCAAwC;IACxC,MAAM,qBAAqB,GAAuC,EAAE,CAAC;IACrE,KAAK,MAAM,OAAO,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QAChD,qCAAqC;QACrC,MAAM,oBAAoB,GAAqC;YAC3D,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,QAA2B;SAC5D,CAAC;QACF,IAAI,oBAAoB,CAAC,IAAI,KAAK,mBAAmB,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;YACzG,oBAAoB,CAAC,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;QACnE,CAAC;QACD,qBAAqB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACH,MAAM,EAAE,uBAAuB;QAC/B,aAAa,EAAE,CAAC;QAChB,SAAS,EAAE,kBAAkB,CAAC,SAAS;QACvC,SAAS,EAAE,kBAAkB,CAAC,SAAS;QACvC,aAAa,EAAE;YACX,QAAQ,EAAE,kBAAkB,CAAC,UAAU;SAC1C;QACD,qBAAqB;QACrB,uBAAuB,EAAE,kBAAkB,CAAC,uBAAuB;QACnE,mBAAmB,EAAE,CAAC,CAAC,kBAAkB,CAAC,mBAAmB;KAChE,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Log function - defaults to console.log, upgraded to Logger.Log via setLogger.
|
|
3
|
+
*/
|
|
4
|
+
export declare let log: (message: string) => void;
|
|
5
|
+
/**
|
|
6
|
+
* Error function - defaults to console.error, upgraded to Logger.Error via setLogger.
|
|
7
|
+
*/
|
|
8
|
+
export declare let error: (message: string) => void;
|
|
9
|
+
/**
|
|
10
|
+
* Upgrades the build tools logger to use the provided Logger class.
|
|
11
|
+
* Call this synchronously after importing to switch from console to Babylon's Logger.
|
|
12
|
+
* @param LoggerClass - The Logger class (e.g. from core/Misc/logger)
|
|
13
|
+
*/
|
|
14
|
+
export declare function setLogger(LoggerClass: {
|
|
15
|
+
Log: (message: string) => void;
|
|
16
|
+
Error: (message: string) => void;
|
|
17
|
+
}): void;
|
|
18
|
+
//# sourceMappingURL=buildToolsLogger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildToolsLogger.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/buildToolsLogger.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAkB,CAAC;AAExD;;GAEG;AACH,eAAO,IAAI,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAoB,CAAC;AAE5D;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,WAAW,EAAE;IAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GAAG,IAAI,CAGjH"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/* eslint-disable no-console, @typescript-eslint/naming-convention */
|
|
2
|
+
/**
|
|
3
|
+
* Log function - defaults to console.log, upgraded to Logger.Log via setLogger.
|
|
4
|
+
*/
|
|
5
|
+
export let log = console.log;
|
|
6
|
+
/**
|
|
7
|
+
* Error function - defaults to console.error, upgraded to Logger.Error via setLogger.
|
|
8
|
+
*/
|
|
9
|
+
export let error = console.error;
|
|
10
|
+
/**
|
|
11
|
+
* Upgrades the build tools logger to use the provided Logger class.
|
|
12
|
+
* Call this synchronously after importing to switch from console to Babylon's Logger.
|
|
13
|
+
* @param LoggerClass - The Logger class (e.g. from core/Misc/logger)
|
|
14
|
+
*/
|
|
15
|
+
export function setLogger(LoggerClass) {
|
|
16
|
+
log = LoggerClass.Log.bind(LoggerClass);
|
|
17
|
+
error = LoggerClass.Error.bind(LoggerClass);
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=buildToolsLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildToolsLogger.js","sourceRoot":"","sources":["../../../src/utils/buildTools/buildToolsLogger.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAErE;;GAEG;AACH,MAAM,CAAC,IAAI,GAAG,GAA8B,OAAO,CAAC,GAAG,CAAC;AAExD;;GAEG;AACH,MAAM,CAAC,IAAI,KAAK,GAA8B,OAAO,CAAC,KAAK,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,WAAiF;IACvG,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import { ExtractShaderProgramFromGlsl } from "./convertGlslIntoShaderProgram.js";
|
|
3
3
|
import { ConnectionPointType } from "../../connection/connectionPointType.js";
|
|
4
|
-
import { BlockDisableStrategy } from "../../blockFoundation/
|
|
4
|
+
import { BlockDisableStrategy } from "../../blockFoundation/blockDisableStrategy.js";
|
|
5
5
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
6
6
|
const EXTRA_IMPORTS = "@EXTRA_IMPORTS@";
|
|
7
7
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertGlslIntoBlock.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoBlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"convertGlslIntoBlock.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertGlslIntoShaderProgram.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoShaderProgram.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convertGlslIntoShaderProgram.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoShaderProgram.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAkEpF;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAIjG;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CACxC,kBAAkB,EAAE,MAAM,EAC1B,oBAAoB,EAAE,MAAM,EAC5B,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,GACxB;IACC;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,kBAAkB,EAAE,kBAAkB,CAAC;CAC1C,CA0DA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
|
-
import { Logger } from "@onerjs/core/Misc/logger.js";
|
|
3
2
|
import { ParseFragmentShader } from "./shaderConverter.js";
|
|
3
|
+
import { log } from "./buildToolsLogger.js";
|
|
4
4
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
5
5
|
const TYPE_IMPORT_PATH = "@TYPE_IMPORT_PATH@";
|
|
6
6
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
@@ -94,7 +94,7 @@ export function ExtractShaderProgramFromGlsl(fragmentShaderPath, smartFiltersCor
|
|
|
94
94
|
vertexShader = fs.readFileSync(vertexShaderPath, "utf8");
|
|
95
95
|
}
|
|
96
96
|
if (vertexShader) {
|
|
97
|
-
|
|
97
|
+
log("Found vertex shader");
|
|
98
98
|
}
|
|
99
99
|
// Read the fragment shader
|
|
100
100
|
const fragmentShader = fs.readFileSync(fragmentShaderPath, "utf8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertGlslIntoShaderProgram.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoShaderProgram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"convertGlslIntoShaderProgram.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertGlslIntoShaderProgram.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import * as path from "path";
|
|
3
|
-
import { Logger } from "@onerjs/core/Misc/logger.js";
|
|
4
3
|
import { ConvertGlslIntoShaderProgram } from "./convertGlslIntoShaderProgram.js";
|
|
5
4
|
import { ConvertGlslIntoBlock } from "./convertGlslIntoBlock.js";
|
|
5
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
6
6
|
/**
|
|
7
7
|
* Converts all GLSL files in a path into blocks for use in the build system.
|
|
8
8
|
* @param shaderPath - The path to the .glsl files to convert, or a single .glsl file.
|
|
@@ -33,7 +33,7 @@ export function ConvertShaders(shaderPath, smartFiltersCorePath, babylonCorePath
|
|
|
33
33
|
shaderFiles = allFiles.filter((file) => file.isFile() && (file.name.endsWith(".fragment.glsl") || file.name.endsWith(".block.glsl")));
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
|
-
|
|
36
|
+
error(`Error: ${shaderPath} is neither a file nor a directory.`);
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
// Convert all shaders
|
|
@@ -49,13 +49,13 @@ export function ConvertShaders(shaderPath, smartFiltersCorePath, babylonCorePath
|
|
|
49
49
|
* @param babylonCorePath - The path to import the Babylon core from (optional).
|
|
50
50
|
*/
|
|
51
51
|
export function ConvertShader(fullPathAndFileName, smartFiltersCorePath, babylonCorePath) {
|
|
52
|
-
|
|
52
|
+
log(`\nProcessing shader: ${fullPathAndFileName}`);
|
|
53
53
|
if (fullPathAndFileName.endsWith(".fragment.glsl")) {
|
|
54
|
-
|
|
54
|
+
log("Generating a .ts file that exports a ShaderProgram.");
|
|
55
55
|
ConvertGlslIntoShaderProgram(fullPathAndFileName, smartFiltersCorePath);
|
|
56
56
|
}
|
|
57
57
|
else if (fullPathAndFileName.endsWith(".block.glsl")) {
|
|
58
|
-
|
|
58
|
+
log("Generating a .ts file that exports the block as a class.");
|
|
59
59
|
ConvertGlslIntoBlock(fullPathAndFileName, smartFiltersCorePath, babylonCorePath);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertShaders.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertShaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"convertShaders.js","sourceRoot":"","sources":["../../../src/utils/buildTools/convertShaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,oBAA4B,EAAE,eAAwB;IACrG,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEtC,IAAI,WAAwB,CAAC;IAE7B,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QACjB,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,WAAW,GAAG;YACV;gBACI,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI;gBAClB,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;aACd;SACjB,CAAC;IACN,CAAC;SAAM,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QAC7B,iCAAiC;QACjC,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtF,yEAAyE;QACzE,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC1I,CAAC;SAAM,CAAC;QACJ,KAAK,CAAC,UAAU,UAAU,qCAAqC,CAAC,CAAC;QACjE,OAAO;IACX,CAAC;IAED,sBAAsB;IACtB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACxE,aAAa,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,eAAe,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,mBAA2B,EAAE,oBAA4B,EAAE,eAAwB;IAC7G,GAAG,CAAC,wBAAwB,mBAAmB,EAAE,CAAC,CAAC;IAEnD,IAAI,mBAAmB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,qDAAqD,CAAC,CAAC;QAC3D,4BAA4B,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IAC5E,CAAC;SAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,0DAA0D,CAAC,CAAC;QAChE,oBAAoB,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,eAAe,CAAC,CAAC;IACrF,CAAC;AACL,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type { Nullable } from "@onerjs/core/types.js";
|
|
2
1
|
import type { ShaderCode } from "./shaderCode.types.js";
|
|
3
2
|
import { ConnectionPointType } from "../../connection/connectionPointType.js";
|
|
4
|
-
import { BlockDisableStrategy } from "../../blockFoundation/
|
|
3
|
+
import { BlockDisableStrategy } from "../../blockFoundation/blockDisableStrategy.js";
|
|
5
4
|
import type { ConstPropertyMetadata } from "../../serialization/v1/shaderBlockSerialization.types.js";
|
|
6
5
|
/**
|
|
7
6
|
* Describes the supported metadata annotation for a uniform
|
|
@@ -45,7 +44,7 @@ export type FragmentShaderInfo = {
|
|
|
45
44
|
/**
|
|
46
45
|
* If supplied, the namespace of the block
|
|
47
46
|
*/
|
|
48
|
-
namespace:
|
|
47
|
+
namespace: string | null;
|
|
49
48
|
/**
|
|
50
49
|
* If true, optimization should be disabled for this shader
|
|
51
50
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shaderConverter.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/shaderConverter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"shaderConverter.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/shaderConverter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0DAA0D,CAAC;AAmBtG;;GAEG;AACH,KAAK,yBAAyB,GAAG;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,GAAG,CAAC;IAEd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,KAAK,eAAe,GAAG;IACnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,mBAAmB,CAAC;IAE1B;;OAEG;IACH,UAAU,CAAC,EAAE,yBAAyB,CAAC;CAC1C,CAAC;AAiBF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAE5C;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;OAEG;IACH,QAAQ,EAAE,eAAe,EAAE,CAAC;IAE5B;;OAEG;IACH,uBAAuB,EAAE,qBAAqB,EAAE,CAAC;CACpD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,kBAAkB,CA4M9E;AAiOD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAE7D"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Logger } from "@onerjs/core/Misc/logger.js";
|
|
2
1
|
import { ConnectionPointType } from "../../connection/connectionPointType.js";
|
|
3
|
-
import { BlockDisableStrategy } from "../../blockFoundation/
|
|
2
|
+
import { BlockDisableStrategy } from "../../blockFoundation/blockDisableStrategy.js";
|
|
4
3
|
import { DecorateSymbol } from "../shaderCodeUtils.js";
|
|
4
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
5
5
|
// Note: creating a global RegExp object is risky, because it holds state (e.g. lastIndex) that has to be
|
|
6
6
|
// cleared at the right time to ensure correctness, which is easy to forget to do.
|
|
7
7
|
// Instead, for regular expressions used in multiple places, we define the string and options once, and create
|
|
@@ -132,15 +132,15 @@ export function ParseFragmentShader(fragmentShader) {
|
|
|
132
132
|
// Collect uniform, const, and function names which need to be decorated
|
|
133
133
|
// eslint-disable-next-line prettier/prettier
|
|
134
134
|
const uniformNames = uniforms.map((uniform) => uniform.name);
|
|
135
|
-
|
|
135
|
+
log(`Uniforms found: ${JSON.stringify(uniforms)}`);
|
|
136
136
|
const consts = [...fragmentShader.matchAll(/\S*const\s+\w*\s+(\w*)\s*=.*;/g)].map((match) => match[1]);
|
|
137
|
-
|
|
137
|
+
log(`Consts found: ${JSON.stringify(consts)}`);
|
|
138
138
|
const constPropertyFriendlyNames = fragmentConstProperties.map((c) => c.friendlyName);
|
|
139
|
-
|
|
139
|
+
log(`Const properties found: ${JSON.stringify(constPropertyFriendlyNames)}`);
|
|
140
140
|
const defineNames = [...fragmentShader.matchAll(new RegExp(GetDefineRegExString, GetDefineRegExOptions))].map((match) => match[1]);
|
|
141
|
-
|
|
141
|
+
log(`Defines found: ${JSON.stringify(defineNames)}`);
|
|
142
142
|
const functionNames = [...fragmentShaderWithNoFunctionBodies.matchAll(new RegExp(GetFunctionHeaderRegExString, GetFunctionHeaderRegExOptions))].map((match) => match[1]);
|
|
143
|
-
|
|
143
|
+
log(`Functions found: ${JSON.stringify(functionNames)}`);
|
|
144
144
|
// Decorate the uniforms, consts, defines, and functions
|
|
145
145
|
const symbolsToDecorate = [...uniformNames, ...consts, ...constPropertyFriendlyNames, ...defineNames, ...functionNames];
|
|
146
146
|
let fragmentShaderWithRenamedSymbols = fragmentShader;
|
|
@@ -154,7 +154,7 @@ export function ParseFragmentShader(fragmentShader) {
|
|
|
154
154
|
const regex = new RegExp(`(?<=\\W+)${symbol}(?=\\W+)`, "gs");
|
|
155
155
|
fragmentShaderWithRenamedSymbols = fragmentShaderWithRenamedSymbols.replace(regex, DecorateSymbol(symbol));
|
|
156
156
|
}
|
|
157
|
-
|
|
157
|
+
log(`${symbolsToDecorate.length} symbol(s) renamed`);
|
|
158
158
|
// Extract all the uniforms
|
|
159
159
|
const finalUniforms = [...fragmentShaderWithRenamedSymbols.matchAll(/^\s*(uniform\s.*)/gm)].map((match) => match[1]);
|
|
160
160
|
// Extract all the consts
|
|
@@ -281,7 +281,7 @@ function RemoveFunctionBodies(input) {
|
|
|
281
281
|
}
|
|
282
282
|
}
|
|
283
283
|
if (depth !== 0) {
|
|
284
|
-
|
|
284
|
+
error("Unbalanced curly braces in shader code");
|
|
285
285
|
}
|
|
286
286
|
return output;
|
|
287
287
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shaderConverter.js","sourceRoot":"","sources":["../../../src/utils/buildTools/shaderConverter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shaderConverter.js","sourceRoot":"","sources":["../../../src/utils/buildTools/shaderConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Watches all .glsl files under <shaderPath> and rebuilds them when changed.
|
|
3
|
-
* @param shaderPath - The path to the shaders to watch
|
|
4
|
-
* @param smartFiltersCorePath - The path to import the Smart Filters core from
|
|
5
|
-
* @param babylonCorePath - The path to import the Babylon core from (optional)
|
|
6
|
-
* @example node watchShaders.js <shaderPath> @babylonjs/smart-filters
|
|
7
|
-
*/
|
|
8
1
|
export {};
|
|
9
2
|
//# sourceMappingURL=watchShaders.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchShaders.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/watchShaders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watchShaders.d.ts","sourceRoot":"","sources":["../../../src/utils/buildTools/watchShaders.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/* eslint-disable no-console */
|
|
2
1
|
/**
|
|
3
2
|
* Watches all .glsl files under <shaderPath> and rebuilds them when changed.
|
|
4
3
|
* @param shaderPath - The path to the shaders to watch
|
|
@@ -9,6 +8,7 @@
|
|
|
9
8
|
import { watch } from "chokidar";
|
|
10
9
|
import { extname } from "path";
|
|
11
10
|
import { ConvertShader } from "./convertShaders.js";
|
|
11
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
12
12
|
const ExternalArguments = process.argv.slice(2);
|
|
13
13
|
if (ExternalArguments.length >= 2 && ExternalArguments[0] && ExternalArguments[1]) {
|
|
14
14
|
const shaderPath = ExternalArguments[0];
|
|
@@ -23,17 +23,17 @@ if (ExternalArguments.length >= 2 && ExternalArguments[0] && ExternalArguments[1
|
|
|
23
23
|
if (extname(file) !== ".glsl") {
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
log(`Change detected. Starting conversion...`);
|
|
27
27
|
// Wrap in try-catch to prevent the watcher from crashing
|
|
28
28
|
// if the new shader changes are invalid
|
|
29
29
|
try {
|
|
30
30
|
ConvertShader(file, smartFiltersCorePath, babylonCorePath);
|
|
31
|
-
|
|
31
|
+
log(`Successfully updated shader ${file}`);
|
|
32
32
|
}
|
|
33
|
-
catch (
|
|
34
|
-
|
|
33
|
+
catch (err) {
|
|
34
|
+
error(`Failed to convert shader ${file}: ${err}`);
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
log(`Watching for changes in ${shaderPath}...`);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
//# sourceMappingURL=watchShaders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchShaders.js","sourceRoot":"","sources":["../../../src/utils/buildTools/watchShaders.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"watchShaders.js","sourceRoot":"","sources":["../../../src/utils/buildTools/watchShaders.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAE7C,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACxC,4CAA4C;QAC5C,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACxC,OAAO;QACX,CAAC;QAED,2BAA2B;QAC3B,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QAED,GAAG,CAAC,yCAAyC,CAAC,CAAC;QAE/C,yDAAyD;QACzD,wCAAwC;QACxC,IAAI,CAAC;YACD,aAAa,CAAC,IAAI,EAAE,oBAAoB,EAAE,eAAe,CAAC,CAAC;YAC3D,GAAG,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,KAAK,CAAC,4BAA4B,IAAI,KAAK,GAAG,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,GAAG,CAAC,2BAA2B,UAAU,KAAK,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The version of the SmartFilter core. During publish, this file is overwritten by recordVersionNumber.ts with the same version that is used for the NPM publish.
|
|
3
3
|
*/
|
|
4
|
-
export declare const SmartFilterCoreVersion = "8.
|
|
4
|
+
export declare const SmartFilterCoreVersion = "8.43.2";
|
|
5
5
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The version of the SmartFilter core. During publish, this file is overwritten by recordVersionNumber.ts with the same version that is used for the NPM publish.
|
|
3
3
|
*/
|
|
4
|
-
export const SmartFilterCoreVersion = "8.
|
|
4
|
+
export const SmartFilterCoreVersion = "8.43.2";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The strategy to use for making a block disableable.
|
|
3
|
+
*/
|
|
4
|
+
export enum BlockDisableStrategy {
|
|
5
|
+
/**
|
|
6
|
+
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
7
|
+
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
8
|
+
*/
|
|
9
|
+
Manual = 0,
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
13
|
+
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
14
|
+
* you'll need to use the Manual strategy instead.
|
|
15
|
+
*/
|
|
16
|
+
AutoSample = 1,
|
|
17
|
+
}
|
|
@@ -5,6 +5,10 @@ import { ConnectionPointType } from "../connection/connectionPointType.js";
|
|
|
5
5
|
import { CreateStrongRef } from "../runtime/strongRef.js";
|
|
6
6
|
import { ShaderBlock } from "./shaderBlock.js";
|
|
7
7
|
import { InjectAutoSampleDisableCode } from "../utils/shaderCodeUtils.js";
|
|
8
|
+
import { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
9
|
+
|
|
10
|
+
// Re-export for backward compatibility
|
|
11
|
+
export { BlockDisableStrategy } from "./blockDisableStrategy.js";
|
|
8
12
|
|
|
9
13
|
/**
|
|
10
14
|
* The interface that describes the disableable block.
|
|
@@ -16,24 +20,6 @@ export interface IDisableableBlock {
|
|
|
16
20
|
disabled: ConnectionPoint<ConnectionPointType.Boolean>;
|
|
17
21
|
}
|
|
18
22
|
|
|
19
|
-
/**
|
|
20
|
-
* The strategy to use for making a block disableable.
|
|
21
|
-
*/
|
|
22
|
-
export enum BlockDisableStrategy {
|
|
23
|
-
/**
|
|
24
|
-
* The shader code is responsible for defining and consulting a uniform named disabled
|
|
25
|
-
* and no-oping (returning texture2D(mainInputTexture, vUV)) if the value is true.
|
|
26
|
-
*/
|
|
27
|
-
Manual = 0,
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* The Smart Filter system will automatically add code to sample the mainInputTexture and return immediately if disabled,
|
|
31
|
-
* and otherwise use the value within the block's shader code. If you need to modify UVs before sampling the default input texture,
|
|
32
|
-
* you'll need to use the Manual strategy instead.
|
|
33
|
-
*/
|
|
34
|
-
AutoSample = 1,
|
|
35
|
-
}
|
|
36
|
-
|
|
37
23
|
/**
|
|
38
24
|
* A ShaderBlock that can be disabled. The optimizer can optionally remove disabled blocks from the graph,
|
|
39
25
|
* or they can be controlled by the disabled connection point at runtime. If disabled, they pass the
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { ConnectionPointType } from "../connection/connectionPointType.js";
|
|
2
|
+
import { Logger } from "core/Misc/logger.js";
|
|
2
3
|
import { HasGlslHeader, ParseFragmentShader } from "../utils/buildTools/shaderConverter.js";
|
|
3
4
|
import type { SerializedBlockDefinition } from "./serializedBlockDefinition.js";
|
|
4
5
|
import type { SerializedShaderBlockDefinition } from "./serializedShaderBlockDefinition.js";
|
|
5
6
|
import type { InputAutoBindV1, SerializedInputConnectionPointV1 } from "./v1/shaderBlockSerialization.types.js";
|
|
7
|
+
import { setLogger } from "../utils/buildTools/buildToolsLogger.js";
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* Imports a serialized custom block definition. Supports either serialized CustomShaderBlock definitions or
|
|
@@ -51,6 +53,7 @@ export function ImportCustomBlockDefinition(serializedData: string): SerializedB
|
|
|
51
53
|
* @returns The serialized block definition
|
|
52
54
|
*/
|
|
53
55
|
function ImportAnnotatedGlsl(fragmentShader: string): SerializedShaderBlockDefinition {
|
|
56
|
+
setLogger(Logger);
|
|
54
57
|
const fragmentShaderInfo = ParseFragmentShader(fragmentShader);
|
|
55
58
|
|
|
56
59
|
if (!fragmentShaderInfo.blockType) {
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/* eslint-disable no-console, @typescript-eslint/naming-convention */
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Log function - defaults to console.log, upgraded to Logger.Log via setLogger.
|
|
5
|
+
*/
|
|
6
|
+
export let log: (message: string) => void = console.log;
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Error function - defaults to console.error, upgraded to Logger.Error via setLogger.
|
|
10
|
+
*/
|
|
11
|
+
export let error: (message: string) => void = console.error;
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Upgrades the build tools logger to use the provided Logger class.
|
|
15
|
+
* Call this synchronously after importing to switch from console to Babylon's Logger.
|
|
16
|
+
* @param LoggerClass - The Logger class (e.g. from core/Misc/logger)
|
|
17
|
+
*/
|
|
18
|
+
export function setLogger(LoggerClass: { Log: (message: string) => void; Error: (message: string) => void }): void {
|
|
19
|
+
log = LoggerClass.Log.bind(LoggerClass);
|
|
20
|
+
error = LoggerClass.Error.bind(LoggerClass);
|
|
21
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import { ExtractShaderProgramFromGlsl } from "./convertGlslIntoShaderProgram.js";
|
|
3
3
|
import { ConnectionPointType } from "../../connection/connectionPointType.js";
|
|
4
|
-
import { BlockDisableStrategy } from "../../blockFoundation/
|
|
4
|
+
import { BlockDisableStrategy } from "../../blockFoundation/blockDisableStrategy.js";
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
7
7
|
const EXTRA_IMPORTS = "@EXTRA_IMPORTS@";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
|
-
import { Logger } from "core/Misc/logger.js";
|
|
3
2
|
import { ParseFragmentShader, type FragmentShaderInfo } from "./shaderConverter.js";
|
|
3
|
+
import { log } from "./buildToolsLogger.js";
|
|
4
4
|
|
|
5
5
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
6
6
|
const TYPE_IMPORT_PATH = "@TYPE_IMPORT_PATH@";
|
|
@@ -115,7 +115,7 @@ export function ExtractShaderProgramFromGlsl(
|
|
|
115
115
|
vertexShader = fs.readFileSync(vertexShaderPath, "utf8");
|
|
116
116
|
}
|
|
117
117
|
if (vertexShader) {
|
|
118
|
-
|
|
118
|
+
log("Found vertex shader");
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
// Read the fragment shader
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import * as path from "path";
|
|
3
|
-
import { Logger } from "core/Misc/logger.js";
|
|
4
3
|
import { ConvertGlslIntoShaderProgram } from "./convertGlslIntoShaderProgram.js";
|
|
5
4
|
import { ConvertGlslIntoBlock } from "./convertGlslIntoBlock.js";
|
|
5
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Converts all GLSL files in a path into blocks for use in the build system.
|
|
@@ -35,7 +35,7 @@ export function ConvertShaders(shaderPath: string, smartFiltersCorePath: string,
|
|
|
35
35
|
// Find all shaders (files with .fragment.glsl or .block.glsl extensions)
|
|
36
36
|
shaderFiles = allFiles.filter((file) => file.isFile() && (file.name.endsWith(".fragment.glsl") || file.name.endsWith(".block.glsl")));
|
|
37
37
|
} else {
|
|
38
|
-
|
|
38
|
+
error(`Error: ${shaderPath} is neither a file nor a directory.`);
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
41
|
|
|
@@ -53,13 +53,13 @@ export function ConvertShaders(shaderPath: string, smartFiltersCorePath: string,
|
|
|
53
53
|
* @param babylonCorePath - The path to import the Babylon core from (optional).
|
|
54
54
|
*/
|
|
55
55
|
export function ConvertShader(fullPathAndFileName: string, smartFiltersCorePath: string, babylonCorePath?: string): void {
|
|
56
|
-
|
|
56
|
+
log(`\nProcessing shader: ${fullPathAndFileName}`);
|
|
57
57
|
|
|
58
58
|
if (fullPathAndFileName.endsWith(".fragment.glsl")) {
|
|
59
|
-
|
|
59
|
+
log("Generating a .ts file that exports a ShaderProgram.");
|
|
60
60
|
ConvertGlslIntoShaderProgram(fullPathAndFileName, smartFiltersCorePath);
|
|
61
61
|
} else if (fullPathAndFileName.endsWith(".block.glsl")) {
|
|
62
|
-
|
|
62
|
+
log("Generating a .ts file that exports the block as a class.");
|
|
63
63
|
ConvertGlslIntoBlock(fullPathAndFileName, smartFiltersCorePath, babylonCorePath);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import type { Nullable } from "core/types.js";
|
|
2
|
-
import { Logger } from "core/Misc/logger.js";
|
|
3
1
|
import type { ShaderCode, ShaderFunction } from "./shaderCode.types.js";
|
|
4
2
|
import { ConnectionPointType } from "../../connection/connectionPointType.js";
|
|
5
|
-
import { BlockDisableStrategy } from "../../blockFoundation/
|
|
3
|
+
import { BlockDisableStrategy } from "../../blockFoundation/blockDisableStrategy.js";
|
|
6
4
|
import type { ConstPropertyMetadata } from "../../serialization/v1/shaderBlockSerialization.types.js";
|
|
7
5
|
import { DecorateSymbol } from "../shaderCodeUtils.js";
|
|
6
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
8
7
|
|
|
9
8
|
// Note: creating a global RegExp object is risky, because it holds state (e.g. lastIndex) that has to be
|
|
10
9
|
// cleared at the right time to ensure correctness, which is easy to forget to do.
|
|
@@ -84,7 +83,7 @@ export type FragmentShaderInfo = {
|
|
|
84
83
|
/**
|
|
85
84
|
* If supplied, the namespace of the block
|
|
86
85
|
*/
|
|
87
|
-
namespace:
|
|
86
|
+
namespace: string | null;
|
|
88
87
|
|
|
89
88
|
/**
|
|
90
89
|
* If true, optimization should be disabled for this shader
|
|
@@ -226,7 +225,7 @@ export function ParseFragmentShader(fragmentShader: string): FragmentShaderInfo
|
|
|
226
225
|
throw new Error(`Consts must have a value: '${constLine}'`);
|
|
227
226
|
}
|
|
228
227
|
|
|
229
|
-
const constProperty:
|
|
228
|
+
const constProperty: ConstPropertyMetadata | null =
|
|
230
229
|
type === "float"
|
|
231
230
|
? {
|
|
232
231
|
name: DecorateSymbol(friendlyName),
|
|
@@ -252,15 +251,15 @@ export function ParseFragmentShader(fragmentShader: string): FragmentShaderInfo
|
|
|
252
251
|
// Collect uniform, const, and function names which need to be decorated
|
|
253
252
|
// eslint-disable-next-line prettier/prettier
|
|
254
253
|
const uniformNames = uniforms.map((uniform) => uniform.name);
|
|
255
|
-
|
|
254
|
+
log(`Uniforms found: ${JSON.stringify(uniforms)}`);
|
|
256
255
|
const consts = [...fragmentShader.matchAll(/\S*const\s+\w*\s+(\w*)\s*=.*;/g)].map((match) => match[1]);
|
|
257
|
-
|
|
256
|
+
log(`Consts found: ${JSON.stringify(consts)}`);
|
|
258
257
|
const constPropertyFriendlyNames = fragmentConstProperties.map((c) => c.friendlyName);
|
|
259
|
-
|
|
258
|
+
log(`Const properties found: ${JSON.stringify(constPropertyFriendlyNames)}`);
|
|
260
259
|
const defineNames = [...fragmentShader.matchAll(new RegExp(GetDefineRegExString, GetDefineRegExOptions))].map((match) => match[1]);
|
|
261
|
-
|
|
260
|
+
log(`Defines found: ${JSON.stringify(defineNames)}`);
|
|
262
261
|
const functionNames = [...fragmentShaderWithNoFunctionBodies.matchAll(new RegExp(GetFunctionHeaderRegExString, GetFunctionHeaderRegExOptions))].map((match) => match[1]);
|
|
263
|
-
|
|
262
|
+
log(`Functions found: ${JSON.stringify(functionNames)}`);
|
|
264
263
|
|
|
265
264
|
// Decorate the uniforms, consts, defines, and functions
|
|
266
265
|
const symbolsToDecorate = [...uniformNames, ...consts, ...constPropertyFriendlyNames, ...defineNames, ...functionNames];
|
|
@@ -275,7 +274,7 @@ export function ParseFragmentShader(fragmentShader: string): FragmentShaderInfo
|
|
|
275
274
|
const regex = new RegExp(`(?<=\\W+)${symbol}(?=\\W+)`, "gs");
|
|
276
275
|
fragmentShaderWithRenamedSymbols = fragmentShaderWithRenamedSymbols.replace(regex, DecorateSymbol(symbol));
|
|
277
276
|
}
|
|
278
|
-
|
|
277
|
+
log(`${symbolsToDecorate.length} symbol(s) renamed`);
|
|
279
278
|
|
|
280
279
|
// Extract all the uniforms
|
|
281
280
|
const finalUniforms = [...fragmentShaderWithRenamedSymbols.matchAll(/^\s*(uniform\s.*)/gm)].map((match) => match[1]);
|
|
@@ -435,7 +434,7 @@ function RemoveFunctionBodies(input: string): string {
|
|
|
435
434
|
}
|
|
436
435
|
|
|
437
436
|
if (depth !== 0) {
|
|
438
|
-
|
|
437
|
+
error("Unbalanced curly braces in shader code");
|
|
439
438
|
}
|
|
440
439
|
|
|
441
440
|
return output;
|
|
@@ -480,7 +479,7 @@ function ReadHeader(fragmentShader: string): {
|
|
|
480
479
|
/**
|
|
481
480
|
* The glsl header, or null if there wasn't one
|
|
482
481
|
*/
|
|
483
|
-
header:
|
|
482
|
+
header: GlslHeader | null;
|
|
484
483
|
|
|
485
484
|
/**
|
|
486
485
|
* The fragment shader code with the header removed if there was one
|
|
@@ -514,7 +513,7 @@ function ReadHeader(fragmentShader: string): {
|
|
|
514
513
|
* @param header - The header string to parse
|
|
515
514
|
* @returns - The GlslHeader if the header is valid, otherwise null
|
|
516
515
|
*/
|
|
517
|
-
function ParseHeader(header: string):
|
|
516
|
+
function ParseHeader(header: string): GlslHeader | null {
|
|
518
517
|
const parsedObject = JSON.parse(header);
|
|
519
518
|
|
|
520
519
|
if (!parsedObject || typeof parsedObject !== "object") {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/* eslint-disable no-console */
|
|
2
1
|
/**
|
|
3
2
|
* Watches all .glsl files under <shaderPath> and rebuilds them when changed.
|
|
4
3
|
* @param shaderPath - The path to the shaders to watch
|
|
@@ -6,10 +5,10 @@
|
|
|
6
5
|
* @param babylonCorePath - The path to import the Babylon core from (optional)
|
|
7
6
|
* @example node watchShaders.js <shaderPath> @babylonjs/smart-filters
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
import { watch } from "chokidar";
|
|
11
9
|
import { extname } from "path";
|
|
12
10
|
import { ConvertShader } from "./convertShaders.js";
|
|
11
|
+
import { log, error } from "./buildToolsLogger.js";
|
|
13
12
|
|
|
14
13
|
const ExternalArguments = process.argv.slice(2);
|
|
15
14
|
if (ExternalArguments.length >= 2 && ExternalArguments[0] && ExternalArguments[1]) {
|
|
@@ -28,17 +27,17 @@ if (ExternalArguments.length >= 2 && ExternalArguments[0] && ExternalArguments[1
|
|
|
28
27
|
return;
|
|
29
28
|
}
|
|
30
29
|
|
|
31
|
-
|
|
30
|
+
log(`Change detected. Starting conversion...`);
|
|
32
31
|
|
|
33
32
|
// Wrap in try-catch to prevent the watcher from crashing
|
|
34
33
|
// if the new shader changes are invalid
|
|
35
34
|
try {
|
|
36
35
|
ConvertShader(file, smartFiltersCorePath, babylonCorePath);
|
|
37
|
-
|
|
38
|
-
} catch (
|
|
39
|
-
|
|
36
|
+
log(`Successfully updated shader ${file}`);
|
|
37
|
+
} catch (err) {
|
|
38
|
+
error(`Failed to convert shader ${file}: ${err}`);
|
|
40
39
|
}
|
|
41
40
|
|
|
42
|
-
|
|
41
|
+
log(`Watching for changes in ${shaderPath}...`);
|
|
43
42
|
});
|
|
44
43
|
}
|
package/src/version.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The version of the SmartFilter core. During publish, this file is overwritten by recordVersionNumber.ts with the same version that is used for the NPM publish.
|
|
3
3
|
*/
|
|
4
|
-
export const SmartFilterCoreVersion = "8.43.
|
|
4
|
+
export const SmartFilterCoreVersion = "8.43.3";
|