Browse Source

cleaning css

msDestiny14 4 years ago
parent
commit
ce70374ad3

+ 10 - 10
guiEditor/src/diagram/workbench.tsx

@@ -14,7 +14,7 @@ import { Scene } from "babylonjs/scene";
 import { Color4 } from "babylonjs/Maths/math.color";
 import { FreeCamera } from "babylonjs/Cameras/freeCamera";
 
-require("./graphCanvas.scss");
+require("./workbenchCanvas.scss");
 
 export interface IWorkbenchComponentProps {
     globalState: GlobalState
@@ -286,10 +286,10 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
     }
 
     componentDidMount() {
-        this._hostCanvas = this.props.globalState.hostDocument.getElementById("graph-canvas") as HTMLDivElement;
-        this._rootContainer = this.props.globalState.hostDocument.getElementById("graph-container") as HTMLDivElement;
-        this._gridCanvas = this.props.globalState.hostDocument.getElementById("graph-canvas-container") as HTMLDivElement;
-        this._svgCanvas = this.props.globalState.hostDocument.getElementById("graph-svg-container") as HTMLElement;        
+        this._hostCanvas = this.props.globalState.hostDocument.getElementById("workbench-canvas") as HTMLDivElement;
+        this._rootContainer = this.props.globalState.hostDocument.getElementById("workbench-container") as HTMLDivElement;
+        this._gridCanvas = this.props.globalState.hostDocument.getElementById("workbench-canvas-container") as HTMLDivElement;
+        this._svgCanvas = this.props.globalState.hostDocument.getElementById("workbench-svg-container") as HTMLElement;        
         this._selectionContainer = this.props.globalState.hostDocument.getElementById("selection-container") as HTMLDivElement;   
         this._frameContainer = this.props.globalState.hostDocument.getElementById("frame-container") as HTMLDivElement;        
         
@@ -481,7 +481,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
     public createGUICanvas()
     {
         // Get the canvas element from the DOM.
-        const canvas = document.getElementById("graph-canvas") as HTMLCanvasElement;
+        const canvas = document.getElementById("workbench-canvas") as HTMLCanvasElement;
 
         // Associate a Babylon Engine to it.
         const engine = new Engine(canvas);
@@ -520,18 +520,18 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
  
     render() {
  
-        return <canvas id="graph-canvas" 
+        return <canvas id="workbench-canvas" 
         onWheel={evt => this.onWheel(evt)}
         onPointerMove={evt => this.onMove(evt)}
         onPointerDown={evt =>  this.onDown(evt)}   
         onPointerUp={evt =>  this.onUp(evt)} 
         >   
-        <div id="graph-container">
-            <div id="graph-canvas-container">  
+        <div id="workbench-container">
+            <div id="workbench-canvas-container">  
             </div>     
             <div id="frame-container">                        
             </div>
-            <svg id="graph-svg-container">
+            <svg id="workbench-svg-container">
             </svg>                    
             <div id="selection-container">                        
             </div>

+ 4 - 178
guiEditor/src/diagram/graphCanvas.scss

@@ -1,4 +1,4 @@
-#graph-canvas {
+#workbench-canvas {
     width: 100%;
     height: 100%;
     margin: 0;
@@ -22,78 +22,7 @@
         }
     }
 
-    .port {
-        border-radius: 20px;
-        width: 20px;
-        height: 20px;                                                    
-        align-self: center;   
-        
-        .img {
-            width: 100%;
-        }
-
-        img.selected {
-            box-shadow: 0 0 0 2px;
-            border-radius: 50%;
-        }
-        
-        &:hover, &.selected {
-            filter: brightness(2);
-        }
-    }
-
-    .portLine {
-        height: 24px;
-        display: grid;                
-        grid-template-rows: 100%;
-    }
-
-    .port-label {                   
-        align-items: center;
-    }
-
-    .inputsContainer {                        
-        grid-row: 1;
-        grid-column: 1;
-
-        .portLine {
-            grid-template-columns: 12px calc(100% - 15px);
-
-            .port-label {                    
-                grid-row: 1;
-                grid-column: 2;
-            }
-
-            .port {                              
-                grid-row: 1;
-                grid-column: 1;
-                transform: translateX(-12px);     
-            }
-        }
-    }
-
-    .outputsContainer {                  
-        grid-row: 1;
-        grid-column: 2;
-
-        .portLine {
-            grid-template-columns: calc(100% - 10px) 12px;
-
-            .port-label {                    
-                grid-row: 1;
-                grid-column: 1;
-                text-align: right;
-            }
-
-            .port {                              
-                grid-row: 1;
-                grid-column: 2;
-                transform: translateX(2px);                        
-            }        
-        }
-    }
-
-    #graph-container {
+    #workbench-container {
         width: 100%;
         height: 100%;
         left: 0;
@@ -206,19 +135,6 @@
                 }
             }
 
-            .port-container {
-                margin-top: 6px;      
-                margin-bottom: 6px; 
-                margin-left: 4px;     
-                margin-right: 4px;     
-                color: white;
-                grid-row: 2;
-                grid-column: 1;
-                display: grid;
-                grid-template-rows: 100%;
-                grid-template-columns: 50% 50%; 
-                z-index: 2;
-            }
 
             .frame-comments.has-comments{
                 display: grid;
@@ -407,7 +323,7 @@
             }
         }
 
-        #graph-svg-container {
+        #workbench-svg-container {
             grid-row: 1;
             grid-column: 1;
             position: relative;
@@ -448,7 +364,7 @@
             }
         }
 
-        #graph-canvas-container {
+        #workbench-canvas-container {
             grid-row: 1;
             grid-column: 1;
             position: relative;
@@ -530,96 +446,6 @@
                         background: #66491b;
                     }
                 }
-
-                .connections {
-                    grid-row: 2;
-                    grid-column: 1;
-
-                    display: grid;
-                    grid-template-columns: 50% 50%;                  
-                }
-
-                .content {
-                    min-height: 20px;
-                    grid-row: 3;
-                    grid-column: 1;
-
-                    &.input-block {
-                        grid-row: 2;
-                        min-height: 34px;
-                        text-align: center;
-                        font-size: 18px;
-                        font-weight: bold;
-                        margin: 0 10px 5px;
-                        display: grid;
-                        align-content: center;
-
-                        &.small-font {                            
-                            font-size: 17px;
-                        }
-                    }
-
-                    &.output-block {
-                        min-height: 0px;
-                        height: 5px;
-                    }
-
-                    &.clamp-block {                    
-                        grid-row: 2;
-                        height: 34px;
-                        text-align: center;
-                        font-size: 18px;
-                        font-weight: bold;
-                        margin: 0 10px;
-                    }
-
-                    &.gradient-block {                    
-                        grid-row: 2;
-                        height: 34px;
-                    }
-
-                    &.texture-block {                    
-                        grid-row: 3;
-                        height: 140px;
-                        width: 140px;
-                        overflow: hidden;
-                        border-bottom-left-radius: 7px;
-                        border: black 4px solid;
-                        border-left: 0px;
-                        border-bottom: 0px;
-
-                        img {
-                            width: 100%;
-                            height: 100%;
-                            pointer-events: none;
-
-                            &.empty {
-                                display: none;
-                            }
-                        }
-                    }
-
-                    &.regular-texture-block {  
-                        margin-top: -115px;                        
-                    }
-
-                    &.remap-block {                    
-                        height: 34px;
-                        text-align: center;
-                        font-size: 18px;
-                        font-weight: bold;
-                        margin: 0 10px;
-                    }      
-                    
-                    &.trigonometry-block {                    
-                        grid-row: 2;
-                        height: 34px;
-                        text-align: center;
-                        font-size: 18px;
-                        font-weight: bold;
-                        margin: 0 10px;
-                    }
-                }
             }
         }
     }

+ 2 - 2
guiEditor/src/workbenchEditor.tsx

@@ -200,7 +200,7 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
         }
 
         const deltaX = evt.clientX - this._startX;
-        const rootElement = evt.currentTarget.ownerDocument!.getElementById("node-editor-graph-root") as HTMLDivElement;
+        const rootElement = evt.currentTarget.ownerDocument!.getElementById("workbench-editor-workbench-root") as HTMLDivElement;
 
         if (forLeft) {
             this._leftWidth += deltaX;
@@ -287,7 +287,7 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
         parentControl.style.padding = "0";
         parentControl.style.display = "grid";
         parentControl.style.gridTemplateRows = "40px auto";
-        parentControl.id = "node-editor-graph-root";
+        parentControl.id = "gui-editor-workbench-root";
         parentControl.className = "right-panel";
 
         popupWindow.document.body.appendChild(parentControl);