Move editableInPropertyPage to Core and Update Observable Import (#59)

Move editableInPropertyPage from editor to core package so that block libraries don't need to have a dependency on editor. Also, fix an Observable import that was too broad.

packages/editor/src/nodeDecorators/editableInPropertyPage.ts → packages/core/src/editorUtils/editableInPropertyPage.ts

@@ -1,9 +1,9 @@
-import type { Observable } from "@babylonjs/core";
+import type { Observable } from "@babylonjs/core/Misc/observable";
 
 /**
  * Enum defining the type of properties that can be edited in the property pages in the node editor
  */
-export const enum PropertyTypeForEdition {
+export enum PropertyTypeForEdition {
     /** property is a boolean */
     Boolean,
     /** property is a float */

packages/core/src/index.ts

@@ -30,8 +30,9 @@ export { type SmartFilterRuntime } from "./runtime/smartFilterRuntime.js";
 export { InternalSmartFilterRuntime } from "./runtime/smartFilterRuntime.js";
 export { RenderTargetGenerator } from "./runtime/renderTargetGenerator.js";
 
-export { SmartFilter } from "./smartFilter.js";
+export { SmartFilter, type InitializationData } from "./smartFilter.js";
 
 export { SmartFilterOptimizer } from "./optimization/smartFilterOptimizer.js";
 export * from "./utils/textureLoaders.js";
 export * from "./serialization/index.js";
+export * from "./editorUtils/editableInPropertyPage.js";

packages/demo/src/configuration/blocks/effects/blurBlock.ts

@@ -1,9 +1,7 @@
 import type { ConnectionPoint, ConnectionPointType } from "@babylonjs/smart-filters";
-import { AggregateBlock, SmartFilter } from "@babylonjs/smart-filters";
-
+import { AggregateBlock, SmartFilter, editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters";
 import { DirectionalBlurBlock } from "./directionalBlurBlock";
 import { BlockNames } from "../blockNames";
-import { editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters-editor";
 
 const defaultBlurTextureRatioPerPass = 0.5;
 const defaultBlurSize = 2;

packages/demo/src/configuration/blocks/effects/compositionBlock.ts

@@ -1,14 +1,14 @@
 import type { Effect } from "@babylonjs/core/Materials/effect";
-
 import type { SmartFilter, IDisableableBlock, RuntimeData, ShaderProgram } from "@babylonjs/smart-filters";
 import {
     ConnectionPointType,
     createStrongRef,
+    editableInPropertyPage,
+    PropertyTypeForEdition,
     DisableableShaderBinding,
     DisableableShaderBlock,
 } from "@babylonjs/smart-filters";
 import { BlockNames } from "../blockNames";
-import { editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters-editor";
 
 /** Defines that alpha blending is disabled */
 export const ALPHA_DISABLE = 0;

packages/demo/src/configuration/blocks/effects/directionalBlurBlock.ts

@@ -1,9 +1,13 @@
 import type { Effect } from "@babylonjs/core/Materials/effect";
-
 import type { SmartFilter, RuntimeData, ShaderProgram } from "@babylonjs/smart-filters";
-import { ConnectionPointType, ShaderBinding, ShaderBlock } from "@babylonjs/smart-filters";
+import {
+    ShaderBlock,
+    ConnectionPointType,
+    ShaderBinding,
+    editableInPropertyPage,
+    PropertyTypeForEdition,
+} from "@babylonjs/smart-filters";
 import { BlockNames } from "../blockNames";
-import { editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters-editor";
 
 const shaderProgram: ShaderProgram = {
     fragment: {

packages/demo/src/configuration/blocks/inputs/webCamInputBlock.ts

@@ -1,12 +1,15 @@
 import type { ThinEngine } from "@babylonjs/core/Engines/thinEngine.js";
 import { WebCamRuntime } from "./webCamRuntime";
-import { ConnectionPointType, type SmartFilter, InputBlock, createStrongRef } from "@babylonjs/smart-filters";
-import type { InitializationData } from "core/src/smartFilter";
 import {
+    ConnectionPointType,
+    type SmartFilter,
+    type InitializationData,
+    InputBlock,
+    createStrongRef,
     editableInPropertyPage,
     PropertyTypeForEdition,
     type IEditablePropertyListOption,
-} from "@babylonjs/smart-filters-editor";
+} from "@babylonjs/smart-filters";
 import { Observable } from "@babylonjs/core/Misc/observable";
 
 export type WebCamSource = {

packages/demo/src/configuration/blocks/transitions/tileBlock.ts

@@ -1,15 +1,15 @@
 import type { Effect } from "@babylonjs/core/Materials/effect";
-
 import {
     type SmartFilter,
     type IDisableableBlock,
     type RuntimeData,
     DisableableShaderBinding,
     type ShaderProgram,
+    editableInPropertyPage,
+    PropertyTypeForEdition,
 } from "@babylonjs/smart-filters";
 import { ConnectionPointType, DisableableShaderBlock } from "@babylonjs/smart-filters";
 import { BlockNames } from "../blockNames";
-import { editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters-editor";
 
 const shaderProgram: ShaderProgram = {
     fragment: {

packages/demo/src/configuration/blocks/transitions/wipeBlock.ts

@@ -1,16 +1,16 @@
 import type { Effect } from "@babylonjs/core/Materials/effect";
-
 import {
     type SmartFilter,
     type IDisableableBlock,
     type RuntimeData,
     DisableableShaderBinding,
     DisableableShaderBlock,
     type ShaderProgram,
+    editableInPropertyPage,
+    PropertyTypeForEdition,
 } from "@babylonjs/smart-filters";
 import { ConnectionPointType } from "@babylonjs/smart-filters";
 import { BlockNames } from "../blockNames";
-import { editableInPropertyPage, PropertyTypeForEdition } from "@babylonjs/smart-filters-editor";
 
 const shaderProgram: ShaderProgram = {
     fragment: {

packages/demo/src/helpers/createThinEngine.ts

@@ -1,5 +1,4 @@
 import { ThinEngine } from "@babylonjs/core/Engines/thinEngine";
-import "@babylonjs/core/Engines/Extensions/engine.alpha.js";
 
 export function createThinEngine(canvas: HTMLCanvasElement) {
     const antialias = false;

packages/editor/src/graphSystem/properties/genericNodePropertyComponent.tsx

@@ -1,15 +1,14 @@
 import * as react from "react";
 import { LineContainerComponent } from "../../sharedComponents/lineContainerComponent.js";
-
 import { TextInputLineComponent } from "@babylonjs/shared-ui-components/lines/textInputLineComponent.js";
 import { TextLineComponent } from "@babylonjs/shared-ui-components/lines/textLineComponent.js";
 import type { IPropertyComponentProps } from "@babylonjs/shared-ui-components/nodeGraphSystem/interfaces/propertyComponentProps";
-import type { BaseBlock } from "@babylonjs/smart-filters";
 import {
+    type BaseBlock,
     PropertyTypeForEdition,
     type IEditablePropertyOption,
     type IPropertyDescriptionForEdition,
-} from "../../nodeDecorators/editableInPropertyPage.js";
+} from "@babylonjs/smart-filters";
 import { CheckBoxLineComponent } from "../../sharedComponents/checkBoxLineComponent.js";
 import { FloatSliderComponent } from "../../sharedComponents/floatSliderComponent.js";
 import { FloatLineComponent } from "@babylonjs/shared-ui-components/lines/floatLineComponent.js";

packages/editor/src/index.ts

@@ -7,4 +7,3 @@ export { createDefaultValue } from "./graphSystem/registerDefaultInput.js";
 
 export type { TexturePreset } from "./globalState.js";
 export * from "./helpers/serializationTools.js";
-export * from "./nodeDecorators/editableInPropertyPage.js";