Explorar o código

removing nme code

msDestiny14 %!s(int64=4) %!d(string=hai) anos
pai
achega
1b8440ccab

+ 1 - 10
guiEditor/src/components/propertyTab/propertyTabComponent.tsx

@@ -6,7 +6,6 @@ import { ButtonLineComponent } from '../../sharedUiComponents/lines/buttonLineCo
 import { LineContainerComponent } from '../../sharedComponents/lineContainerComponent';
 import { FileButtonLineComponent } from '../../sharedUiComponents/lines/fileButtonLineComponent';
 import { Tools } from 'babylonjs/Misc/tools';
-import { SerializationTools } from '../../serializationTools';
 import { CheckBoxLineComponent } from '../../sharedComponents/checkBoxLineComponent';
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
 import { GUINode } from '../../diagram/guiNode';
@@ -15,6 +14,7 @@ import { Engine } from 'babylonjs/Engines/engine';
 import { InputBlock } from 'babylonjs/Materials/Node/Blocks/Input/inputBlock';
 import { Observer } from 'babylonjs/Misc/observable';
 import { TextLineComponent } from "../../sharedUiComponents/lines/textLineComponent";
+import { SerializationTools } from "../../serializationTools";
 
 require("./propertyTab.scss");
 
@@ -67,7 +67,6 @@ export class PropertyTabComponent extends React.Component<IPropertyTabComponentP
             let decoder = new TextDecoder("utf-8");
             SerializationTools.Deserialize(JSON.parse(decoder.decode(data)), this.props.globalState);
 
-
             this.props.globalState.onSelectionChangedObservable.notifyObservers(null);
         }, undefined, true);
     }
@@ -205,14 +204,6 @@ export class PropertyTabComponent extends React.Component<IPropertyTabComponentP
                             this.props.globalState.onResetRequiredObservable.notifyObservers();
                         }} />
                     </LineContainerComponent>
-                    <LineContainerComponent title="UI">
-                        <ButtonLineComponent label="Zoom to fit" onClick={() => {
-                            this.props.globalState.onZoomToFitRequiredObservable.notifyObservers();
-                        }} />
-                        <ButtonLineComponent label="Reorganize" onClick={() => {
-                            this.props.globalState.onReOrganizedRequiredObservable.notifyObservers();
-                        }} />
-                    </LineContainerComponent>
                     <LineContainerComponent title="OPTIONS">
                         <CheckBoxLineComponent label="Embed textures when saving"
                             isSelected={() => DataStorage.ReadBoolean("EmbedTextures", true)}

+ 1 - 1
guiEditor/src/diagram/guiNode.ts

@@ -179,7 +179,7 @@ export class GUINode {
 
     public dispose() {
         // notify frame observers that this node is being deleted
-        this._globalState.onGraphNodeRemovalObservable.notifyObservers(this);
+        this._globalState.onGuiNodeRemovalObservable.notifyObservers(this);
 
         if (this._onSelectionChangedObserver) {
             this._globalState.onSelectionChangedObservable.remove(this._onSelectionChangedObserver);

+ 0 - 4
guiEditor/src/diagram/workbench.tsx

@@ -165,10 +165,6 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         });
 
 
-        props.globalState.onGridSizeChanged.add(() => {
-            this.gridSize = DataStorage.ReadNumber("GridSize", 20);
-        });
-
         this.props.globalState.hostDocument!.addEventListener("keyup", () => this.onKeyUp(), false);
         this.props.globalState.hostDocument!.addEventListener("keydown", evt => {
             this._altKeyIsPressed = evt.altKey;            

+ 3 - 20
guiEditor/src/globalState.ts

@@ -1,13 +1,11 @@
 import { Nullable } from "babylonjs/types";
 import { Observable } from "babylonjs/Misc/observable";
-import { LogEntry } from "./components/log/logComponent";
-import { NodeMaterialBlock } from "babylonjs/Materials/Node/nodeMaterialBlock";
 import { DataStorage } from "babylonjs/Misc/dataStorage";
 import { Color4 } from "babylonjs/Maths/math.color";
 import { GUINode } from "./diagram/guiNode";
-import { Vector2 } from "babylonjs/Maths/math.vector";
 import { FramePortData, WorkbenchComponent } from "./diagram/workbench";
 import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
+import { LogEntry } from "./components/log/logComponent";
 
 export class GlobalState {
     guiTexture: AdvancedDynamicTexture;
@@ -24,20 +22,9 @@ export class GlobalState {
     onLogRequiredObservable = new Observable<LogEntry>();
     onErrorMessageDialogRequiredObservable = new Observable<string>();
     onIsLoadingChanged = new Observable<boolean>();
-    onPreviewCommandActivated = new Observable<boolean>();
-    onLightUpdated = new Observable<void>();
-    onPreviewBackgroundChanged = new Observable<void>();
-    onBackFaceCullingChanged = new Observable<void>();
-    onDepthPrePassChanged = new Observable<void>();
-    onAnimationCommandActivated = new Observable<void>();
-    onCandidateLinkMoved = new Observable<Nullable<Vector2>>();
     onSelectionBoxMoved = new Observable<ClientRect | DOMRect>();
-    onImportFrameObservable = new Observable<any>();
-    onGraphNodeRemovalObservable = new Observable<GUINode>();
-    onGetNodeFromBlock: (block: NodeMaterialBlock) => GUINode;
+    onGuiNodeRemovalObservable = new Observable<GUINode>();
     onGridSizeChanged = new Observable<void>();
-    onExposePortOnFrameObservable = new Observable<GUINode>();
-    previewFile: File;
     listOfCustomPreviewFiles: File[] = [];
     rotatePreview: boolean;
     backgroundColor: Color4;
@@ -51,14 +38,10 @@ export class GlobalState {
     workbench: WorkbenchComponent;
     storeEditorData: (serializationObject: any, frame?: Nullable<null>) => void;
 
+
     customSave?: { label: string; action: (data: string) => Promise<void> };
 
     public constructor() {
-        this.backFaceCulling = DataStorage.ReadBoolean("BackFaceCulling", true);
-        this.depthPrePass = DataStorage.ReadBoolean("DepthPrePass", false);
-        this.hemisphericLight = DataStorage.ReadBoolean("HemisphericLight", true);
-        this.directionalLight0 = DataStorage.ReadBoolean("DirectionalLight0", false);
-        this.directionalLight1 = DataStorage.ReadBoolean("DirectionalLight1", false);
         this.controlCamera = DataStorage.ReadBoolean("ControlCamera", true);
 
         let r = DataStorage.ReadNumber("BackgroundColorR", 0.12549019607843137);

+ 0 - 34
guiEditor/src/serializationTools.ts

@@ -1,42 +1,8 @@
-import { NodeMaterial } from 'babylonjs/Materials/Node/nodeMaterial';
 import { GlobalState } from './globalState';
-import { Texture } from 'babylonjs/Materials/Textures/texture';
-import { DataStorage } from 'babylonjs/Misc/dataStorage';
-
 
 export class SerializationTools {
 
-    public static UpdateLocations(material: NodeMaterial, globalState: GlobalState) {
-        material.editorData = {
-            locations: []
-        };
-        
-
-        globalState.storeEditorData(material.editorData);
-    }
-
-    public static Serialize(material: NodeMaterial, globalState: GlobalState) {
-        let bufferSerializationState = Texture.SerializeBuffers;
-        Texture.SerializeBuffers = DataStorage.ReadBoolean("EmbedTextures", true);
-
-
-        const selectedBlocks = undefined;
-
-        let serializationObject = material.serialize(selectedBlocks);
-
-        Texture.SerializeBuffers = bufferSerializationState;
-
-        return JSON.stringify(serializationObject, undefined, 2);
-    }
-
     public static Deserialize(serializationObject: any, globalState: GlobalState) {
         globalState.onIsLoadingChanged.notifyObservers(true);
-
-    }
-
-    public static AddFrameToMaterial(serializationObject: any, globalState: GlobalState, currentMaterial: NodeMaterial) {
-        globalState.onIsLoadingChanged.notifyObservers(true);
-        this.UpdateLocations(currentMaterial, globalState);
-        globalState.onImportFrameObservable.notifyObservers(serializationObject);
     }
 }

+ 2 - 16
guiEditor/src/workbenchEditor.tsx

@@ -3,7 +3,7 @@ import { GlobalState } from "./globalState";
 import { GuiListComponent } from "./components/nodeList/guiListComponent";
 import { PropertyTabComponent } from "./components/propertyTab/propertyTabComponent";
 import { Portal } from "./portal";
-import { LogComponent, LogEntry } from "./components/log/logComponent";
+import { LogComponent } from "./components/log/logComponent";
 import { DataStorage } from "babylonjs/Misc/dataStorage";
 import { Nullable } from "babylonjs/types";
 import { GuiNodeTools } from "./guiNodeTools";
@@ -79,14 +79,6 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
             showPreviewPopUp: false,
         };
 
-        this.props.globalState.onZoomToFitRequiredObservable.add(() => {
-            this.zoomToFit();
-        });
-
-        this.props.globalState.onReOrganizedRequiredObservable.add(() => {
-            this.reOrganize();
-        });
-
         this.props.globalState.hostDocument!.addEventListener(
             "keydown",
             (evt) => {
@@ -99,7 +91,6 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
                     }
 
                     this.props.globalState.onSelectionChangedObservable.notifyObservers(null);
-                    this.props.globalState.onRebuildRequiredObservable.notifyObservers();
                     return;
                 }
 
@@ -155,12 +146,7 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
     zoomToFit() {
         this._workbenchCanvas.zoomToFit();
     }
-
-    buildMaterial() {
-        this.props.globalState.onLogRequiredObservable.notifyObservers(new LogEntry("Node material build successful", false));
-        this.props.globalState.onBuiltObservable.notifyObservers();
-    }
-
+    
     showWaitScreen() {
         this.props.globalState.hostDocument.querySelector(".wait-screen")?.classList.remove("hidden");
     }