فهرست منبع

Fix several issues with NME

David Catuhe 5 سال پیش
والد
کامیت
38a4999121

+ 1 - 1
nodeEditor/src/diagram/graphCanvas.scss

@@ -146,7 +146,7 @@
 
                     transition: border-color 100ms;
 
-                    border: 4px solid transparent;
+                    border: 4px solid black;
                     border-radius: 12px;
                 }
 

+ 6 - 7
nodeEditor/src/diagram/graphNode.ts

@@ -201,6 +201,11 @@ export class GraphNode {
             this._header.innerHTML = this._displayManager.getHeaderText(this.block);
             this._displayManager.updatePreviewContent(this.block, this._content);
             this._visual.style.background = this._displayManager.getBackgroundColor(this.block);
+            let additionalClass = this._displayManager.getHeaderClass(this.block);
+            if (additionalClass) {
+                this._header.classList.value = "header";
+                this._header.classList.add(additionalClass);
+            }
         } else {
             this._header.innerHTML = this.block.name;
         }
@@ -215,6 +220,7 @@ export class GraphNode {
 
         this._comments.innerHTML = this.block.comments || "";
         this._comments.title = this.block.comments || "";
+
     }
 
     private _appendConnection(connectionPoint: NodeMaterialConnectionPoint, root: HTMLDivElement, displayManager: Nullable<IDisplayManager>) {
@@ -326,13 +332,6 @@ export class GraphNode {
 
         this._visual.appendChild(this._header);      
 
-        if (this._displayManager) {
-            let additionalClass = this._displayManager.getHeaderClass(this.block);
-            if (additionalClass) {
-                this._header.classList.add(additionalClass);
-            }
-        }
-
         this._connections = root.ownerDocument!.createElement("div");
         this._connections.classList.add("connections");
         this._visual.appendChild(this._connections);        

+ 8 - 6
src/Materials/Node/Blocks/Fragment/fragmentOutputBlock.ts

@@ -67,14 +67,16 @@ export class FragmentOutputBlock extends NodeMaterialBlock {
                 state.compilationString += `gl_FragColor = ${rgba.associatedVariableName};\r\n`;
             }
         } else if (rgb.connectedPoint) {
+            let aValue = "1.0";
+
             if (a.connectedPoint) {
-                state.compilationString += `gl_FragColor = vec4(${rgb.associatedVariableName}, ${a.associatedVariableName});\r\n`;
+                aValue = a.associatedVariableName;
+            }
+
+            if (rgb.connectedPoint.type === NodeMaterialBlockConnectionPointTypes.Float) {
+                state.compilationString += `gl_FragColor = vec4(${rgb.associatedVariableName}, ${rgb.associatedVariableName}, ${rgb.associatedVariableName}, ${aValue});\r\n`;
             } else {
-                if (rgb.connectedPoint.type === NodeMaterialBlockConnectionPointTypes.Float) {
-                    state.compilationString += `gl_FragColor = vec4(${rgb.associatedVariableName}, ${rgb.associatedVariableName}, ${rgb.associatedVariableName}, 1.0);\r\n`;
-                } else {
-                    state.compilationString += `gl_FragColor = vec4(${rgb.associatedVariableName}, 1.0);\r\n`;
-                }
+                state.compilationString += `gl_FragColor = vec4(${rgb.associatedVariableName}, ${aValue});\r\n`;
             }
         } else {
             state.sharedData.checks.notConnectedNonOptionalInputs.push(rgba);