bug fix

deleteSelection when an output node had multiple connections only the first one was deleted, needed a new function to return a vector of connections that are now looped and deleted at the end of delete selection.

few other minor additions and fixes.

Engine/source/gui/shaderEditor/nodes/materialOutputNode.cpp

@@ -22,15 +22,19 @@
 #include "platform/platform.h"
 #include "gui/shaderEditor/nodes/materialOutputNode.h"
 
-IMPLEMENT_CONOBJECT(MaterialOutputNode);
+//-----------------------------------------------------------------
+// BRDF Output Node.
+//-----------------------------------------------------------------
 
-ConsoleDocClass(MaterialOutputNode,
+IMPLEMENT_CONOBJECT(BRDFOutputNode);
+
+ConsoleDocClass(BRDFOutputNode,
    "@brief Deferred Material output.\n\n"
    "Editor use only.\n\n"
    "@internal"
 );
 
-MaterialOutputNode::MaterialOutputNode()
+BRDFOutputNode::BRDFOutputNode()
    : GuiShaderNode()
 {
    mNodeType = NodeTypes::Output;

Engine/source/gui/shaderEditor/nodes/materialOutputNode.h

@@ -22,14 +22,18 @@
 
 #include "gui/shaderEditor/guiShaderNode.h"
 
-class MaterialOutputNode : public GuiShaderNode
+//-----------------------------------------------------------------
+// Put all material output nodes here.
+//-----------------------------------------------------------------
+
+class BRDFOutputNode : public GuiShaderNode
 {
    typedef GuiShaderNode Parent;
 public:
-   MaterialOutputNode();
+   BRDFOutputNode();
 
    // is the parent that all other nodes are derived from.
-   DECLARE_CONOBJECT(MaterialOutputNode);
+   DECLARE_CONOBJECT(BRDFOutputNode);
    DECLARE_CATEGORY("Shader Output");
    DECLARE_DESCRIPTION("Deferred Material output.");
 };

Engine/source/gui/shaderEditor/nodes/mathNode.cpp

@@ -0,0 +1,50 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+#include "platform/platform.h"
+
+#include "gui/shaderEditor/nodes/mathNode.h"
+
+//-----------------------------------------------------------------
+// Math addition Node.
+//-----------------------------------------------------------------
+
+IMPLEMENT_CONOBJECT(MathAddNode);
+
+ConsoleDocClass(MathAddNode,
+   "@brief Math addition node.\n\n"
+   "Editor use only.\n\n"
+   "@internal"
+);
+
+
+MathAddNode::MathAddNode()
+   : GuiShaderNode()
+{
+   mNodeType = NodeTypes::MathOperation;
+
+   mInputNodes.push_back(new NodeInput("A", DataDimensions::Dynamic));
+   mInputNodes.push_back(new NodeInput("B", DataDimensions::Dynamic));
+
+   mOutputNodes.push_back(new NodeOutput("Result", DataDimensions::Dynamic));
+
+   mTitle = "Math Node";
+}

Engine/source/gui/shaderEditor/nodes/mathNode.h

@@ -0,0 +1,39 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+#include "gui/shaderEditor/guiShaderNode.h"
+
+//-----------------------------------------------------------------
+// Put all Math nodes here.
+//-----------------------------------------------------------------
+
+class MathAddNode : public GuiShaderNode
+{
+   typedef GuiShaderNode Parent;
+public:
+   MathAddNode();
+
+   // is the parent that all other nodes are derived from.
+   DECLARE_CONOBJECT(MathAddNode);
+   DECLARE_CATEGORY("Shader Math");
+   DECLARE_DESCRIPTION("Math addition node.");
+};