Move node implementations to Basic3DNodes module.

Author: kovacsv

CMakeLists.txt

@@ -182,11 +182,12 @@ target_include_directories (
 	Basic3DNodes PUBLIC
 	${GLMSourcesFolder}
 	${GeometrySourcesFolder}
+	${ModelerSourcesFolder}
 	${Basic3DNodesHeaderFiles}
 	${Basic3DNodesSourceFiles}
+	${VSE_DEVKIT_DIR}/include
 )
-target_include_directories (Basic3DNodes PUBLIC ${GeometrySourcesFolder} ${VSE_DEVKIT_DIR}/include)
-target_link_libraries (Basic3DNodes Geometry)
+target_link_libraries (Basic3DNodes Geometry Modeler)
 SetCompilerOptions (Basic3DNodes)
 
 # VisualScriptCAD

…s/VisualScriptCAD/Nodes/MaterialNode.cpp Sources/Basic3DNodes/MaterialNode.cppSources/VisualScriptCAD/Nodes/MaterialNode.cpp renamed to Sources/Basic3DNodes/MaterialNode.cpp Sources/VisualScriptCAD/Nodes/MaterialNode.cpp renamed to Sources/Basic3DNodes/MaterialNode.cpp

@@ -3,10 +3,8 @@
 #include "NUIE_NodeCommonParameters.hpp"
 #include "BI_BuiltInFeatures.hpp"
 
-#include "PolygonEditor.hpp"
 #include "ModelEvaluationData.hpp"
 #include "TransformationNodes.hpp"
-#include "Triangulation.hpp"
 #include "MaterialNode.hpp"
 
 #include "IncludeGLM.hpp"
@@ -16,7 +14,6 @@ NE::DynamicSerializationInfo	CylinderNode::serializationInfo (NE::ObjectId ("{6C
 NE::DynamicSerializationInfo	ConeNode::serializationInfo (NE::ObjectId ("{586F0D6E-CBEB-4C19-8B9E-7358E3E75FD2}"), NE::ObjectVersion (1), ConeNode::CreateSerializableInstance);
 NE::DynamicSerializationInfo	SphereNode::serializationInfo (NE::ObjectId ("{686712CE-BF1B-438E-8C0A-B687A158A0BB}"), NE::ObjectVersion (1), SphereNode::CreateSerializableInstance);
 NE::DynamicSerializationInfo	TorusNode::serializationInfo (NE::ObjectId ("{E17CF103-A4B6-4498-BB7E-7A566C1F7D26}"), NE::ObjectVersion (1), TorusNode::CreateSerializableInstance);
-NE::DynamicSerializationInfo	PrismNode::serializationInfo (NE::ObjectId ("{9D1E49DE-FD64-4079-A75B-DE1900FD2C2F}"), NE::ObjectVersion (1), PrismNode::CreateSerializableInstance);
 NE::DynamicSerializationInfo	PlatonicNode::serializationInfo (NE::ObjectId ("{F7321055-D370-4468-A895-32FA3AD1BF40}"), NE::ObjectVersion (1), PlatonicNode::CreateSerializableInstance);
 
 static bool IsSmooth (int segmentation)
@@ -433,155 +430,6 @@ NE::Stream::Status TorusNode::Write (NE::OutputStream& outputStream) const
 	return outputStream.GetStatus ();
 }
 
-PrismNode::PrismNode () :
-	PrismNode (L"", NUIE::Point ())
-{
-
-}
-
-PrismNode::PrismNode (const std::wstring& name, const NUIE::Point& position) :
-	ShapeNode (name, position)
-{
-
-}
-
-void PrismNode::Initialize ()
-{
-	ShapeNode::Initialize ();
-
-	NE::ListValuePtr basePointsDefaultValue (new NE::ListValue ());
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (0.0, 0.0))));
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (2.0, 0.0))));
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (2.0, 2.0))));
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (1.0, 2.0))));
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (1.0, 1.0))));
-	basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (glm::vec2 (0.0, 1.0))));
-
-	RegisterUIInputSlot (NUIE::UIInputSlotPtr (new NUIE::UIInputSlot (NE::SlotId ("material"), L"Material", NE::ValuePtr (new MaterialValue (Modeler::DefaultMaterial)), NE::OutputSlotConnectionMode::Single)));
-	RegisterUIInputSlot (NUIE::UIInputSlotPtr (new NUIE::UIInputSlot (NE::SlotId ("transformation"), L"Transformation", NE::ValuePtr (new TransformationValue (glm::dmat4 (1.0))), NE::OutputSlotConnectionMode::Single)));
-	RegisterUIInputSlot (NUIE::UIInputSlotPtr (new NUIE::UIInputSlot (NE::SlotId ("basepoints"), L"Base Points", basePointsDefaultValue, NE::OutputSlotConnectionMode::Multiple)));
-	RegisterUIInputSlot (NUIE::UIInputSlotPtr (new NUIE::UIInputSlot (NE::SlotId ("height"), L"Height", NE::ValuePtr (new NE::FloatValue (1.0f)), NE::OutputSlotConnectionMode::Single)));
-	RegisterUIOutputSlot (NUIE::UIOutputSlotPtr (new NUIE::UIOutputSlot (NE::SlotId ("shape"), L"Shape")));
-}
-
-NE::ValueConstPtr PrismNode::Calculate (NE::EvaluationEnv& env) const
-{
-	class CGALTriangulator : public Modeler::Triangulator
-	{
-	public:
-		virtual bool TriangulatePolygon (const std::vector<glm::dvec2>& points, std::vector<std::array<size_t, 3>>& result) override
-		{
-			return CGALOperations::TriangulatePolygon (points, result);
-		}
-	};
-
-	NE::ValueConstPtr material = EvaluateInputSlot (NE::SlotId ("material"), env);
-	NE::ValueConstPtr transformation = EvaluateInputSlot (NE::SlotId ("transformation"), env);
-	NE::ValueConstPtr basePointsValue = NE::FlattenValue (EvaluateInputSlot (NE::SlotId ("basepoints"), env));
-	NE::ValueConstPtr heightValue = EvaluateInputSlot (NE::SlotId ("height"), env);
-
-	if (!NE::IsComplexType<MaterialValue> (material) || !NE::IsComplexType<TransformationValue> (transformation) || !NE::IsComplexType<Point2DValue> (basePointsValue) || !NE::IsComplexType<NE::NumberValue> (heightValue)) {
-		return nullptr;
-	}
-
-	Modeler::TriangulatorPtr triangulator (new CGALTriangulator ());
-	std::vector<glm::dvec2> basePoints;
-	NE::FlatEnumerate (basePointsValue, [&] (const NE::ValueConstPtr& value) {
-		basePoints.push_back (Point2DValue::Get (value));
-	});
-
-	NE::ListValuePtr result (new NE::ListValue ());
-	bool isValid = BI::CombineValues (this, {material, transformation, heightValue}, [&] (const NE::ValueCombination& combination) {
-		Modeler::ShapePtr shape (new Modeler::PrismShape (
-			MaterialValue::Get (combination.GetValue (0)),
-			TransformationValue::Get (combination.GetValue (1)),
-			basePoints,
-			NE::NumberValue::ToDouble (combination.GetValue (2)),
-			triangulator
-		));
-		if (!shape->Check ()) {
-			return false;
-		}
-		result->Push (NE::ValuePtr (new ShapeValue (shape)));
-		return true;
-	});
-
-	if (!isValid) {
-		return nullptr;
-	}
-	return result;
-}
-
-void PrismNode::RegisterCommands (NUIE::NodeCommandRegistrator& commandRegistrator) const
-{
-	class SetBasePolygonCommand : public NUIE::NodeCommand
-	{
-	public:
-		SetBasePolygonCommand () :
-			NUIE::NodeCommand (L"Set Base Polygon", false)
-		{
-
-		}
-
-		virtual bool IsApplicableTo (const NUIE::UINodeConstPtr& uiNode) override
-		{
-			return NE::Node::IsTypeConst<PrismNode> (uiNode);
-		}
-
-		virtual void Do (NUIE::NodeUIManager& uiManager, NUIE::NodeUIEnvironment& /*uiEnvironment*/, NUIE::UINodePtr& uiNode) override
-		{
-			std::shared_ptr<PrismNode> prismNode = std::dynamic_pointer_cast<PrismNode> (uiNode);
-			NE::InputSlotPtr inputSlot = prismNode->GetInputSlot (NE::SlotId ("basepoints"));
-			
-			std::vector<glm::dvec2> initPolygon;
-			NE::ValueConstPtr defaultPolygon = NE::FlattenValue (inputSlot->GetDefaultValue ());
-			if (NE::IsComplexType<Point2DValue> (defaultPolygon)) {
-				NE::FlatEnumerate (defaultPolygon, [&] (const NE::ValueConstPtr& value) {
-					initPolygon.push_back (Point2DValue::Get (value));
-				});
-			}
-
-			PolygonEditorDialog polygonEditor (nullptr, initPolygon);
-			if (polygonEditor.ShowModal () == wxID_OK && polygonEditor.HasPolygon ()) {
-				NE::ListValuePtr basePointsDefaultValue (new NE::ListValue ());
-				for (const glm::dvec2& point : polygonEditor.GetPolygon ()) { 
-					basePointsDefaultValue->Push (NE::ValuePtr (new Point2DValue (point)));
-				}
-				inputSlot->SetDefaultValue (basePointsDefaultValue);
-
-				uiManager.InvalidateNodeValue (prismNode);
-				uiManager.InvalidateNodeDrawing (prismNode);
-			}
-		}
-
-	private:
-		bool enable;
-	};
-
-	ShapeNode::RegisterCommands (commandRegistrator);
-	commandRegistrator.RegisterNodeCommand (NUIE::NodeCommandPtr (new SetBasePolygonCommand ()));
-}
-
-void PrismNode::RegisterParameters (NUIE::NodeParameterList& parameterList) const
-{
-	ShapeNode::RegisterParameters (parameterList);
-	NUIE::RegisterSlotDefaultValueNodeParameter<PrismNode, NE::FloatValue> (parameterList, L"Height", NUIE::ParameterType::Float, NE::SlotId ("height"));
-}
-
-NE::Stream::Status PrismNode::Read (NE::InputStream& inputStream)
-{
-	NE::ObjectHeader header (inputStream);
-	ShapeNode::Read (inputStream);
-	return inputStream.GetStatus ();
-}
-
-NE::Stream::Status PrismNode::Write (NE::OutputStream& outputStream) const
-{
-	NE::ObjectHeader header (outputStream, serializationInfo);
-	ShapeNode::Write (outputStream);
-	return outputStream.GetStatus ();
-}
-
 static void SetPlatonicNodeType (Modeler::PlatonicSolidType type, NUIE::NodeUIManager& uiManager, std::shared_ptr<PlatonicNode>& platonicNode)
 {
 	platonicNode->SetType (type);

…s/VisualScriptCAD/Nodes/MaterialNode.hpp Sources/Basic3DNodes/MaterialNode.hppSources/VisualScriptCAD/Nodes/MaterialNode.hpp renamed to Sources/Basic3DNodes/MaterialNode.hpp Sources/VisualScriptCAD/Nodes/MaterialNode.hpp renamed to Sources/Basic3DNodes/MaterialNode.hpp

@@ -86,23 +86,6 @@ class TorusNode : public ShapeNode
 	virtual NE::Stream::Status	Write (NE::OutputStream& outputStream) const override;
 };
 
-class PrismNode : public ShapeNode
-{
-	DYNAMIC_SERIALIZABLE (PrismNode);
-
-public:
-	PrismNode ();
-	PrismNode (const std::wstring& name, const NUIE::Point& position);
-
-	virtual void				Initialize () override;
-	virtual NE::ValueConstPtr	Calculate (NE::EvaluationEnv& env) const override;
-	virtual void				RegisterCommands (NUIE::NodeCommandRegistrator& commandRegistrator) const;
-	virtual void				RegisterParameters (NUIE::NodeParameterList& parameterList) const;
-
-	virtual NE::Stream::Status	Read (NE::InputStream& inputStream) override;
-	virtual NE::Stream::Status	Write (NE::OutputStream& outputStream) const override;
-};
-
 class PlatonicNode : public ShapeNode
 {
 	DYNAMIC_SERIALIZABLE (PlatonicNode);