diff --git a/media/button_close_black.svg b/media/button_close_black.svg deleted file mode 100644 index 0743e48c..00000000 --- a/media/button_close_black.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/media/button_close_white.svg b/media/button_close_white.svg deleted file mode 100644 index 66e6bb2d..00000000 --- a/media/button_close_white.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/media/button_maximize_black.svg b/media/button_maximize_black.svg deleted file mode 100644 index 28ed556b..00000000 --- a/media/button_maximize_black.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/button_maximize_white.svg b/media/button_maximize_white.svg deleted file mode 100644 index a892dc78..00000000 --- a/media/button_maximize_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/button_minimize_black.svg b/media/button_minimize_black.svg deleted file mode 100644 index d48db114..00000000 --- a/media/button_minimize_black.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/button_minimize_white.svg b/media/button_minimize_white.svg deleted file mode 100644 index b46afc90..00000000 --- a/media/button_minimize_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/button_restore_black.svg b/media/button_restore_black.svg deleted file mode 100644 index 9d4e17a1..00000000 --- a/media/button_restore_black.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/media/button_restore_white.svg b/media/button_restore_white.svg deleted file mode 100644 index af2605da..00000000 --- a/media/button_restore_white.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/resources/resources.qrc b/resources/resources.qrc index 80cdb726..603c7658 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -11,14 +11,6 @@ ../media/noggit_icon.png ../media/splash.png - ../media/button_minimize_black.svg - ../media/button_minimize_white.svg - ../media/button_maximize_black.svg - ../media/button_maximize_white.svg - ../media/button_restore_black.svg - ../media/button_restore_white.svg - ../media/button_close_black.svg - ../media/button_close_white.svg ../src/glsl/m2_vert.glsl diff --git a/src/noggit/MapView.cpp b/src/noggit/MapView.cpp index 4bbe32cb..dc554ca2 100644 --- a/src/noggit/MapView.cpp +++ b/src/noggit/MapView.cpp @@ -42,6 +42,8 @@ #include #include +#include + #include "revision.h" #include @@ -237,6 +239,12 @@ void MapView::createGUI() overlay->setMouseTracking(true); overlay->setGeometry(0,0, width(), height()); + _viewport_overlay_ui->gizmoVisibleButton->setIcon(noggit::ui::font_noggit_icon(noggit::ui::font_noggit::icons::GIZMO_VISIBILITY)); + _viewport_overlay_ui->gizmoModeButton->setIcon(noggit::ui::font_noggit_icon(noggit::ui::font_noggit::icons::GIZMO_LOCAL)); + _viewport_overlay_ui->gizmoRotateButton->setIcon(noggit::ui::font_noggit_icon(noggit::ui::font_noggit::icons::GIZMO_ROTATE)); + _viewport_overlay_ui->gizmoScaleButton->setIcon(noggit::ui::font_noggit_icon(noggit::ui::font_noggit::icons::GIZMO_SCALE)); + _viewport_overlay_ui->gizmoTranslateButton->setIcon(noggit::ui::font_noggit_icon(noggit::ui::font_noggit::icons::GIZMO_TRANSLATE)); + connect(this, &MapView::resized ,[this, overlay]() { diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/DataListNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/DataListNode.cpp index 97265987..3e096cfc 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/DataListNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/DataListNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; DataListNode::DataListNode() : ListNodeBase() { - setName("DataListNode"); - setCaption("List[Integer]"); + setName("List :: Create"); + setCaption("List :: Create"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -83,5 +83,3 @@ void DataListNode::restore(const QJsonObject& json_obj) _type->setCurrentText(list_type); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListAddNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListAddNode.cpp index 03c6ae4f..2580d71d 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListAddNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListAddNode.cpp @@ -15,8 +15,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListAddNode::ListAddNode() : LogicNodeBase() { - setName("ListAddNode"); - setCaption("Append"); + setName("List :: Add"); + setCaption("List :: Add"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -224,4 +224,3 @@ void ListAddNode::inputConnectionDeleted(const Connection& connection) } } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListClearNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListClearNode.cpp index 032f713a..e0ae4206 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListClearNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListClearNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListClearNode::ListClearNode() : LogicNodeBase() { - setName("ListSizeNode"); - setCaption("List Size"); + setName("List :: Clear"); + setCaption("List :: Clear"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListDeclareNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListDeclareNode.cpp index a86c5838..f03dbaae 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListDeclareNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListDeclareNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListDeclareNode::ListDeclareNode() : ListNodeBase() { - setName("ListDeclareNode"); - setCaption("List Declare"); + setName("List :: Declare"); + setCaption("List :: Declare"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "List[Integer]", true); @@ -103,4 +103,3 @@ NodeValidationState ListDeclareNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListEraseNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListEraseNode.cpp index 5deacc16..d3a659c2 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListEraseNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListEraseNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListEraseNode::ListEraseNode() : LogicNodeBase() { - setName("ListEraseNode"); - setCaption("List Erase"); + setName("List :: Erase"); + setCaption("List :: Erase"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -86,4 +86,3 @@ void ListEraseNode::restore(const QJsonObject& json_obj) BaseNode::restore(json_obj); _in_ports[2].data_type->from_json(_in_ports[2].default_widget, json_obj, "index"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListGetNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListGetNode.cpp index 39131b92..86c88ccd 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListGetNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListGetNode.cpp @@ -15,8 +15,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListGetNode::ListGetNode() : LogicNodeBase() { - setName("ListGetNode"); - setCaption("Get"); + setName("List :: Get"); + setCaption("List :: Get"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -167,4 +167,3 @@ void ListGetNode::inputConnectionDeleted(const Connection& connection) } } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListReserveNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListReserveNode.cpp index c8f170f1..7c767e89 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListReserveNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListReserveNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListReserveNode::ListReserveNode() : LogicNodeBase() { - setName("ListReserveNode"); - setCaption("List Reserve"); + setName("List :: Reserve"); + setCaption("List :: Reserve"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListSizeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListSizeNode.cpp index 5f39802c..9f5829ad 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListSizeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Containers/List/ListSizeNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ListSizeNode::ListSizeNode() : LogicNodeBase() { - setName("ListSizeNode"); - setCaption("List Size"); + setName("List :: Size"); + setCaption("List :: Size"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -57,4 +57,3 @@ NodeValidationState ListSizeNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/DataConstantNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/DataConstantNode.cpp index b5374589..24a15369 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/DataConstantNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/DataConstantNode.cpp @@ -10,7 +10,7 @@ using namespace noggit::Red::NodeEditor::Nodes; DataConstantNode::DataConstantNode() : BaseNode() { - setName("DataConstantNode"); + setName("Data :: Constant"); setCaption("Integer"); _validation_state = NodeValidationState::Valid; @@ -86,4 +86,3 @@ void DataConstantNode::restore(const QJsonObject& json_obj) _in_ports[0].data_type->from_json(_in_ports[0].default_widget, json_obj, "value"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/DeleteVariableNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/DeleteVariableNode.cpp index 065af16d..d7b5d9c1 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/DeleteVariableNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/DeleteVariableNode.cpp @@ -74,8 +74,8 @@ void DeleteVariableNodeBase::restore(const QJsonObject& json_obj) DeleteVariableNode::DeleteVariableNode() : DeleteVariableNodeBase() { - setName("DeleteVariableNode"); - setCaption("Delete Variable"); + setName("Data :: DeleteVariable"); + setCaption("Data :: DeleteVariable"); } VariableMap* DeleteVariableNode::getVariableMap() @@ -88,12 +88,11 @@ VariableMap* DeleteVariableNode::getVariableMap() DeleteContextVariableNode::DeleteContextVariableNode() : DeleteVariableNodeBase() { - setName("DeleteContextVariableNode"); - setCaption("Delete Context Variable"); + setName("Data :: DeleteContextVariable"); + setCaption("Data :: DeleteContextVariable"); } VariableMap* DeleteContextVariableNode::getVariableMap() { return gCurrentContext->getVariableMap(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp index cafe642c..e8f1f5ec 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableLazyNode.cpp @@ -100,8 +100,8 @@ void GetVariableLazyNodeBase::outputConnectionDeleted(const Connection& connecti GetVariableLazyNode::GetVariableLazyNode() : GetVariableLazyNodeBase() { - setName("GetVariableLazyNode"); - setCaption("Get Variable"); + setName("Data :: GetVariableLazy"); + setCaption("Data :: GetVariableLazy"); } VariableMap* GetVariableLazyNode::getVariableMap() @@ -114,12 +114,11 @@ VariableMap* GetVariableLazyNode::getVariableMap() GetContextVariableLazyNode::GetContextVariableLazyNode() : GetVariableLazyNodeBase() { - setName("GetContextVariableLazyNode"); - setCaption("Get Context Variable"); + setName("Data :: GetContextVariableLazy"); + setCaption("Data :: GetContextVariableLazy"); } VariableMap* GetContextVariableLazyNode::getVariableMap() { return gCurrentContext->getVariableMap(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableNode.cpp index 0c30ae20..4916621c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/GetVariableNode.cpp @@ -124,8 +124,8 @@ NodeValidationState GetVariableNodeBase::validate() GetVariableNode::GetVariableNode() : GetVariableNodeBase() { - setName("GetVariableNode"); - setCaption("Get Variable"); + setName("Data :: GetVariable"); + setCaption("Data :: GetVariable"); } VariableMap* GetVariableNode::getVariableMap() @@ -138,12 +138,11 @@ VariableMap* GetVariableNode::getVariableMap() GetContextVariableNode::GetContextVariableNode() : GetVariableNodeBase() { - setName("GetContextVariableNode"); - setCaption("Get Context Variable"); + setName("Data :: GetContextVariable"); + setCaption("Data :: GetContextVariable"); } VariableMap* GetContextVariableNode::getVariableMap() { return gCurrentContext->getVariableMap(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageBlendOpenGLNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageBlendOpenGLNode.cpp index 8345a599..f6c26311 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageBlendOpenGLNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageBlendOpenGLNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageBlendOpenGLNode::ImageBlendOpenGLNode() : LogicNodeBase() { - setName("ImageBlendOpenGLNode"); - setCaption("Image Blend OpenGL"); + setName("Image :: BlendOpenGL"); + setCaption("Image :: BlendOpenGL"); _validation_state = NodeValidationState::Valid; _blend_func = new QComboBox(&_embedded_widget); @@ -239,4 +239,3 @@ void ImageBlendOpenGLNode::restore(const QJsonObject& json_obj) _sfactor->setCurrentIndex(json_obj["s_factor"].toInt()); _dfactor->setCurrentIndex(json_obj["d_factor"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageCreateNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageCreateNode.cpp index 5c70050e..093259b9 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageCreateNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageCreateNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageCreateNode::ImageCreateNode() : LogicNodeBase() { - setName("ImageCreateNode"); - setCaption("Image Create"); + setName("Image :: Create"); + setCaption("Image :: Create"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -60,5 +60,3 @@ void ImageCreateNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "height"); defaultWidgetFromJson(PortType::In, 3, json_obj, "fill_color"); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageFillNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageFillNode.cpp index 651762f5..794de18b 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageFillNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageFillNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageFillNode::ImageFillNode() : LogicNodeBase() { - setName("ImageFillNode"); - setCaption("Image Fill"); + setName("Image :: Fill"); + setCaption("Image :: Fill"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -62,4 +62,3 @@ void ImageFillNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "color"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGaussianBlurNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGaussianBlurNode.cpp index b0085634..73dcfc9a 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGaussianBlurNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGaussianBlurNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageGaussianBlurNode::ImageGaussianBlurNode() : LogicNodeBase() { - setName("ImageGaussianBlurNode"); - setCaption("Image Gaussian Blur"); + setName("Image :: GaussianBlur"); + setCaption("Image :: GaussianBlur"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -77,4 +77,3 @@ void ImageGaussianBlurNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "sigma"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetPixelNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetPixelNode.cpp index 096074d2..7d3b37ca 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetPixelNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetPixelNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageGetPixelNode::ImageGetPixelNode() : LogicNodeBase() { - setName("ImageGetPixelNode"); - setCaption("Image Get Pixel"); + setName("Image :: GetPixel"); + setCaption("Image :: GetPixel"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -70,4 +70,3 @@ void ImageGetPixelNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "pixel_xy"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetRegionNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetRegionNode.cpp index 357c96a4..5f527159 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetRegionNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageGetRegionNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageGetRegionNode::ImageGetRegionNode() : LogicNodeBase() { - setName("ImageGetRegionNode"); - setCaption("Image Get Region"); + setName("Image :: GetRegion"); + setCaption("Image :: GetRegion"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -92,4 +92,3 @@ void ImageGetRegionNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "pos"); defaultWidgetFromJson(PortType::In, 3, json_obj, "dimensions"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInfoNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInfoNode.cpp index b3e9ec18..67c72138 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInfoNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInfoNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageInfoNode::ImageInfoNode() : BaseNode() { - setName("ImageInfoNode"); - setCaption("Image Info"); + setName("Image :: Info"); + setCaption("Image :: Info"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Image", true); @@ -76,4 +76,3 @@ NodeValidationState ImageInfoNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInvertNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInvertNode.cpp index c41fcb75..838f2833 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInvertNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageInvertNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageInvertNode::ImageInvertNode() : LogicNodeBase() { - setName("ImageInvertNode"); - setCaption("Image Invert"); + setName("Image :: Invert"); + setCaption("Image :: Invert"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -46,5 +46,3 @@ NodeValidationState ImageInvertNode::validate() return LogicNodeBase::validate(); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMaskRandomPointsNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMaskRandomPointsNode.cpp index 5af938c0..7bd948c4 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMaskRandomPointsNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMaskRandomPointsNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageMaskRandomPointsNode::ImageMaskRandomPointsNode() : LogicNodeBase() { - setName("ImageMaskRandomPointsNode"); - setCaption("Image Mask Random Points"); + setName("Image :: MaskRandomPoints"); + setCaption("Image :: MaskRandomPoints"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -91,4 +91,3 @@ void ImageMaskRandomPointsNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "seed"); defaultWidgetFromJson(PortType::In, 3, json_obj, "density"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMirrorNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMirrorNode.cpp index 7604d43f..3f10938e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMirrorNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageMirrorNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageMirrorNode::ImageMirrorNode() : LogicNodeBase() { - setName("ImageMirrorNode"); - setCaption("Image Mirror"); + setName("Image :: Mirror"); + setCaption("Image :: Mirror"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -67,4 +67,3 @@ void ImageMirrorNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "mirror_u"); defaultWidgetFromJson(PortType::In, 3, json_obj, "mirror_v"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageResizeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageResizeNode.cpp index 2b48402e..da82f07e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageResizeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageResizeNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageResizeNode::ImageResizeNode() : LogicNodeBase() { - setName("ImageResizeNode"); - setCaption("Image Resize"); + setName("Image :: Resize"); + setCaption("Image :: Resize"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -74,4 +74,3 @@ void ImageResizeNode::restore(const QJsonObject& json_obj) BaseNode::restore(json_obj); defaultWidgetFromJson(PortType::In, 2, json_obj, "size"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageRotateNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageRotateNode.cpp index fc848b7d..dd59004e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageRotateNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageRotateNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageRotateNode::ImageRotateNode() : LogicNodeBase() { - setName("ImageRotateNode"); - setCaption("Image Rotate"); + setName("Image :: Rotate"); + setCaption("Image :: Rotate"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -65,4 +65,4 @@ NodeValidationState ImageRotateNode::validate() } return LogicNodeBase::validate(); -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSaveNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSaveNode.cpp index d0ebb561..d3d58351 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSaveNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSaveNode.cpp @@ -13,8 +13,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageSaveNode::ImageSaveNode() : LogicNodeBase() { - setName("ImageSaveNode"); - setCaption("Image Save"); + setName("Image :: Save"); + setCaption("Image :: Save"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -73,5 +73,3 @@ void ImageSaveNode::restore(const QJsonObject& json_obj) BaseNode::restore(json_obj); _in_ports[2].data_type->from_json(_in_ports[2].default_widget, json_obj, "path"); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageScaleNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageScaleNode.cpp index d6f33a66..b5fdb02e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageScaleNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageScaleNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageScaleNode::ImageScaleNode() : LogicNodeBase() { - setName("ImageScaleNode"); - setCaption("Image Scale"); + setName("Image :: Scale"); + setCaption("Image :: Scale"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -70,4 +70,3 @@ void ImageScaleNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "scale_vec"); _mode->setCurrentIndex(json_obj["mode"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetPixelNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetPixelNode.cpp index 5c0029e9..7360f762 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetPixelNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetPixelNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageSetPixelNode::ImageSetPixelNode() : LogicNodeBase() { - setName("ImageSetPixelNode"); - setCaption("Image Set Pixel"); + setName("Image :: SetPixel"); + setCaption("Image :: SetPixel"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -74,4 +74,3 @@ void ImageSetPixelNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "pixel_xy"); defaultWidgetFromJson(PortType::In, 3, json_obj, "color"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetRegionNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetRegionNode.cpp index e8ef4581..ba39275c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetRegionNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageSetRegionNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageSetRegionNode::ImageSetRegionNode() : LogicNodeBase() { - setName("ImageSetRegionNode"); - setCaption("Image Set Region"); + setName("Image :: SetRegion"); + setCaption("Image :: SetRegion"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -90,4 +90,3 @@ void ImageSetRegionNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 3, json_obj, "pos"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageToGrayscaleNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageToGrayscaleNode.cpp index 9e68c5e0..c928cc71 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageToGrayscaleNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageToGrayscaleNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageToGrayscaleNode::ImageToGrayscaleNode() : LogicNodeBase() { - setName("ImageToGrayscaleNode"); - setCaption("Image to Grayscale"); + setName("Image :: ToGrayscale"); + setCaption("Image :: ToGrayscale"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -58,4 +58,3 @@ NodeValidationState ImageToGrayscaleNode::validate() return LogicNodeBase::validate(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageTranslateNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageTranslateNode.cpp index c2aaf54d..72a6acde 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageTranslateNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/ImageTranslateNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ImageTranslateNode::ImageTranslateNode() : LogicNodeBase() { - setName("ImageTranslateNode"); - setCaption("Image Translate"); + setName("Image :: Translate"); + setCaption("Image :: Translate"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -68,4 +68,3 @@ void ImageTranslateNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 2, json_obj, "translate_vec"); _mode->setCurrentIndex(json_obj["mode"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp index 43a5a388..48ce2c20 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp @@ -13,8 +13,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LoadImageNode::LoadImageNode() : LogicNodeBase() { - setName("LoadImageNode"); - setCaption("Load Image"); + setName("Load :: Image"); + setCaption("Load :: Image"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseAbsNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseAbsNode.cpp index 85fc4a04..d8e8bf2c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseAbsNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseAbsNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseAbsNode::NoiseAbsNode() : BaseNode() { - setName("NoiseAbsNode"); - setCaption("Noise Abs"); + setName("Noise :: Abs"); + setCaption("Noise :: Abs"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Noise", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBillowNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBillowNode.cpp index 513ed21d..719307a6 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBillowNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBillowNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseBillowNode::NoiseBillowNode() : NoiseGeneratorBase() { - setName("NoiseBillowNode"); - setCaption("Billow Noise"); + setName("Noise :: Billow"); + setCaption("Noise :: Billow"); _validation_state = NodeValidationState::Valid; _quality = new QComboBox(&_embedded_widget); @@ -95,4 +95,3 @@ void NoiseBillowNode::restore(const QJsonObject& json_obj) _quality->setCurrentIndex(json_obj["quality"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBlendNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBlendNode.cpp index 37fee73f..33422a7b 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBlendNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseBlendNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseBlendNode::NoiseBlendNode() : BaseNode() { - setName("NoiseBlendNode"); - setCaption("Noise Blend"); + setName("Noise :: Blend"); + setCaption("Noise :: Blend"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); @@ -48,4 +48,4 @@ NodeValidationState NoiseBlendNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCacheNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCacheNode.cpp index 7c340b02..3c8cbf45 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCacheNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCacheNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseCacheNode::NoiseCacheNode() : BaseNode() { - setName("NoiseCacheNode"); - setCaption("Noise Cache"); + setName("Noise :: Cache"); + setCaption("Noise :: Cache"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Noise", true); @@ -41,4 +41,3 @@ NodeValidationState NoiseCacheNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCheckerboardNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCheckerboardNode.cpp index 8174fcf8..28a8257a 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCheckerboardNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCheckerboardNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseCheckerboardNode::NoiseCheckerboardNode() : NoiseGeneratorBase() { - setName("NoiseCheckerboardNode"); - setCaption("Checkerboard Noise"); + setName("Noise :: Checkerboard"); + setCaption("Noise :: Checkerboard"); _validation_state = NodeValidationState::Valid; addPort(PortType::Out, "Noise", true); @@ -27,6 +27,3 @@ void NoiseCheckerboardNode::compute() Q_EMIT dataUpdated(0); } - - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseClampNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseClampNode.cpp index fec8bbeb..d13d26e3 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseClampNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseClampNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseClampNode::NoiseClampNode() : BaseNode() { - setName("NoiseClampNode"); - setCaption("Noise Clamp"); + setName("Noise :: Clamp"); + setCaption("Noise :: Clamp"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); @@ -61,4 +61,3 @@ void NoiseClampNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 1, json_obj, "bounds"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseConstValueNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseConstValueNode.cpp index 8ed399f5..778765ee 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseConstValueNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseConstValueNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseConstValueNode::NoiseConstValueNode() : NoiseGeneratorBase() { - setName("NoiseConstValueNode"); - setCaption("Const Value Noise"); + setName("Noise :: ConstValue"); + setCaption("Noise :: ConstValue"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Value", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCurveNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCurveNode.cpp index cb2f1269..1fbe04fc 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCurveNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCurveNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseCurveNode::NoiseCurveNode() : BaseNode() { - setName("NoiseCurveNode"); - setCaption("Noise Curve"); + setName("Noise :: Curve"); + setCaption("Noise :: Curve"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); @@ -74,4 +74,4 @@ NodeValidationState NoiseCurveNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCylindersNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCylindersNode.cpp index 3d4d2765..f8eb6011 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCylindersNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseCylindersNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseCylindersNode::NoiseCylindersNode() : NoiseGeneratorBase() { - setName("NoiseCylindersNode"); - setCaption("Cylinders Noise"); + setName("Noise :: Cylinders"); + setCaption("Noise :: Cylinders"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Frequency", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseDisplaceNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseDisplaceNode.cpp index 14b8ae86..2751efc8 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseDisplaceNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseDisplaceNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseDisplaceNode::NoiseDisplaceNode() : BaseNode() { - setName("NoiseDisplaceNode"); - setCaption("Noise Displace"); + setName("Noise :: Displace"); + setCaption("Noise :: Displace"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseExponentNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseExponentNode.cpp index 8904f0bd..13927e14 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseExponentNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseExponentNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseExponentNode::NoiseExponentNode() : BaseNode() { - setName("NoiseExponentNode"); - setCaption("Noise Exponent"); + setName("Noise :: Exponent"); + setCaption("Noise :: Exponent"); _validation_state = NodeValidationState::Valid; diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseInvertNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseInvertNode.cpp index 3f817979..8c1bf660 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseInvertNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseInvertNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseInvertNode::NoiseInvertNode() : BaseNode() { - setName("NoiseInvertNode"); - setCaption("Noise Invert"); + setName("Noise :: Invert"); + setCaption("Noise :: Invert"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Noise", true); @@ -41,4 +41,3 @@ NodeValidationState NoiseInvertNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseMathNode.cpp index 16a7f601..c49e07c4 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseMathNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseMathNode::NoiseMathNode() : BaseNode() { - setName("NoiseMathNode"); - setCaption("Noise Math"); + setName("Noise :: Math"); + setCaption("Noise :: Math"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -98,4 +98,3 @@ void NoiseMathNode::restore(const QJsonObject& json_obj) _operation->setCurrentIndex(json_obj["operation"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoisePerlinNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoisePerlinNode.cpp index 4b96bd7f..dffb062d 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoisePerlinNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoisePerlinNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoisePerlinNode::NoisePerlinNode() : NoiseGeneratorBase() { - setName("NoisePerlinNode"); - setCaption("Perlin Noise"); + setName("Noise :: Perlin"); + setCaption("Noise :: Perlin"); _validation_state = NodeValidationState::Valid; _quality = new QComboBox(&_embedded_widget); @@ -98,4 +98,3 @@ void NoisePerlinNode::restore(const QJsonObject& json_obj) _quality->setCurrentIndex(json_obj["quality"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseRidgedMultiNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseRidgedMultiNode.cpp index cacf81f8..3b6fcb8b 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseRidgedMultiNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseRidgedMultiNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseRidgedMultiNode::NoiseRidgedMultiNode() : NoiseGeneratorBase() { - setName("NoiseRidgedMultiNode"); - setCaption("Ridged Multi Noise"); + setName("Noise :: RidgedMulti"); + setCaption("Noise :: RidgedMulti"); _validation_state = NodeValidationState::Valid; _quality = new QComboBox(&_embedded_widget); @@ -85,4 +85,3 @@ void NoiseRidgedMultiNode::restore(const QJsonObject& json_obj) _quality->setCurrentIndex(json_obj["quality"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseScaleBiasNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseScaleBiasNode.cpp index 2557c8dc..b3e7b2be 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseScaleBiasNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseScaleBiasNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseScaleBiasNode::NoiseScaleBiasNode() : BaseNode() { - setName("NoiseScaleBiasNode"); - setCaption("Noise Scale Bias"); + setName("Noise :: ScaleBias"); + setCaption("Noise :: ScaleBias"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); @@ -67,5 +67,3 @@ NodeValidationState NoiseScaleBiasNode::validate() return _validation_state; } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSelectNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSelectNode.cpp index b960c13a..33cce9a8 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSelectNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSelectNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseSelectNode::NoiseSelectNode() : BaseNode() { - setName("NoiseSelectNode"); - setCaption("Noise Select"); + setName("Noise :: Select"); + setCaption("Noise :: Select"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSpheresNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSpheresNode.cpp index 6e7f13a9..920ba990 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSpheresNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseSpheresNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseSpheresNode::NoiseSpheresNode() : NoiseGeneratorBase() { - setName("NoiseSpheresNode"); - setCaption("Spheres Noise"); + setName("Noise :: Spheres"); + setCaption("Noise :: Spheres"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Frequency", true); @@ -37,4 +37,3 @@ void NoiseSpheresNode::compute() Q_EMIT dataUpdated(0); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTerraceNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTerraceNode.cpp index 554651a3..dbc57428 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTerraceNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTerraceNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseTerraceNode::NoiseTerraceNode() : BaseNode() { - setName("NoiseTerraceNode"); - setCaption("Noise Terrace"); + setName("Noise :: Terrace"); + setCaption("Noise :: Terrace"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseToImageNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseToImageNode.cpp index acfdefdd..f9a521a2 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseToImageNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseToImageNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseToImageNode::NoiseToImageNode() : LogicNodeBase() { - setName("NoiseToImageNode"); - setCaption("Noise To Image"); + setName("Noise :: ToImage"); + setCaption("Noise :: ToImage"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -99,4 +99,3 @@ void NoiseToImageNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 4, json_obj, "bounds_upper"); defaultWidgetFromJson(PortType::In, 5, json_obj, "seamless"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTransformPointNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTransformPointNode.cpp index bc35eac8..15b2d0b3 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTransformPointNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTransformPointNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseTransformPointNode::NoiseTransformPointNode() : BaseNode() { - setName("NoiseTransformPointNode"); - setCaption("Noise Transform Point"); + setName("Noise :: TransformPoint"); + setCaption("Noise :: TransformPoint"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTurbulenceNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTurbulenceNode.cpp index c197b850..fff426d6 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTurbulenceNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseTurbulenceNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseTurbulenceNode::NoiseTurbulenceNode() : BaseNode() { - setName("NoiseTurbulenceNode"); - setCaption("Noise Turbulence"); + setName("Noise :: Turbulence"); + setCaption("Noise :: Turbulence"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Noise", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseViewerNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseViewerNode.cpp index a399d02f..a886bbb6 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseViewerNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseViewerNode.cpp @@ -14,8 +14,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseViewerNode::NoiseViewerNode() : BaseNode() { - setName("NoiseViewerNode"); - setCaption("Noise Viewer"); + setName("Noise :: Viewer"); + setCaption("Noise :: Viewer"); _validation_state = NodeValidationState::Valid; _image = new QLabel(&_embedded_widget); @@ -82,4 +82,3 @@ NodeValidationState NoiseViewerNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseVoronoiNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseVoronoiNode.cpp index f83e3ad8..ebc06814 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseVoronoiNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Noise/NoiseVoronoiNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; NoiseVoronoiNode::NoiseVoronoiNode() : NoiseGeneratorBase() { - setName("NoiseVoronoiNode"); - setCaption("Voronoi Noise"); + setName("Noise :: Voronoi"); + setCaption("Noise :: Voronoi"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Frequency", true); @@ -53,5 +53,3 @@ void NoiseVoronoiNode::compute() Q_EMIT dataUpdated(0); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalNode.cpp index 6c76b8e0..bb6e5e4d 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RandomDecimalNode::RandomDecimalNode() : BaseNode() { - setName("RandomDecimalNode"); - setCaption("Random Decimal"); + setName("Random :: Decimal"); + setCaption("Random :: Decimal"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Seed", true); @@ -45,4 +45,3 @@ void RandomDecimalNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 0, json_obj, "seed"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalRangeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalRangeNode.cpp index 5cc0cc44..4c45bdb3 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalRangeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalRangeNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RandomDecimalRangeNode::RandomDecimalRangeNode() : BaseNode() { - setName("RandomDecimalRangeNode"); - setCaption("Random Decimal Range"); + setName("Random :: DecimalRange"); + setCaption("Random :: DecimalRange"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Seed", true); @@ -48,4 +48,3 @@ void RandomDecimalRangeNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 0, json_obj, "seed"); defaultWidgetFromJson(PortType::In, 1, json_obj, "highest"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerNode.cpp index 504ff967..d3a45411 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RandomIntegerNode::RandomIntegerNode() : BaseNode() { - setName("RandomIntegerNode"); - setCaption("Random Integer"); + setName("Random :: Integer"); + setCaption("Random :: Integer"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Seed", true); @@ -45,4 +45,3 @@ void RandomIntegerNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 0, json_obj, "seed"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerRangeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerRangeNode.cpp index c4ea7779..bd510ec9 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerRangeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerRangeNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RandomIntegerRangeNode::RandomIntegerRangeNode() : BaseNode() { - setName("RandomIntegerRangeNode"); - setCaption("Random Integer Range"); + setName("Random :: IntegerRange"); + setCaption("Random :: IntegerRange"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Seed", true); @@ -59,4 +59,3 @@ void RandomIntegerRangeNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::In, 1, json_obj, "min_inclusive"); defaultWidgetFromJson(PortType::In, 2, json_obj, "max_exclusive"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.cpp index ce4e9592..fec37ee5 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RandomSeedNode::RandomSeedNode() : LogicNodeBase() { - setName("RandomSeedNode"); - setCaption("Random Seed"); + setName("Random :: Seed"); + setCaption("Random :: Seed"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -34,6 +34,3 @@ void RandomSeedNode::compute() _out_ports[1].out_value = std::make_shared(uniform_dist(e1)); Q_EMIT dataUpdated(1); } - - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/SetVariableNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/SetVariableNode.cpp index 7b032207..f192c5a9 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/SetVariableNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/SetVariableNode.cpp @@ -118,8 +118,8 @@ NodeValidationState SetVariableNodeBase::validate() SetVariableNode::SetVariableNode() : SetVariableNodeBase() { - setName("SetVariableNode"); - setCaption("Set Variable"); + setName("Data :: SetVariable"); + setCaption("Data :: SetVariable"); } VariableMap* SetVariableNode::getVariableMap() @@ -132,14 +132,11 @@ VariableMap* SetVariableNode::getVariableMap() SetContextVariableNode::SetContextVariableNode() : SetVariableNodeBase() { - setName("SetContextVariableNode"); - setCaption("Set Context Variable"); + setName("Data :: SetContextVariable"); + setCaption("Data :: SetContextVariable"); } VariableMap* SetContextVariableNode::getVariableMap() { return gCurrentContext->getVariableMap(); } - - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/String/StringEndsWithNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/String/StringEndsWithNode.cpp index 0d990f1d..7e99d8da 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/String/StringEndsWithNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/String/StringEndsWithNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; StringEndsWithNode::StringEndsWithNode() : BaseNode() { - setName("StringEndsWithNode"); - setCaption("String Ends With"); + setName("String :: EndsWith"); + setCaption("String :: EndsWith"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "String", true); @@ -40,4 +40,4 @@ NodeValidationState StringEndsWithNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/String/StringSizeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/String/StringSizeNode.cpp index 98f472d4..f625b4e1 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/String/StringSizeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/String/StringSizeNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; StringSizeNode::StringSizeNode() : BaseNode() { - setName("StringSizeNode"); - setCaption("String Size"); + setName("String :: Size"); + setCaption("String :: Size"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "String", true); @@ -35,4 +35,4 @@ NodeValidationState StringSizeNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Data/TypeParameterNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Data/TypeParameterNode.cpp index c91b231d..c867f3bd 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Data/TypeParameterNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Data/TypeParameterNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TypeParameterNode::TypeParameterNode() : BaseNode() { - setName("TypeParameterNode"); - setCaption("Type Parameter"); + setName("Data :: TypeParameter"); + setCaption("Data :: TypeParameter"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Any", true); @@ -39,4 +39,3 @@ NodeValidationState TypeParameterNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Functions/PrintNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Functions/PrintNode.cpp index 58b9301c..d12f8ed6 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Functions/PrintNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Functions/PrintNode.cpp @@ -9,7 +9,7 @@ using namespace noggit::Red::NodeEditor::Nodes; PrintNode::PrintNode() : LogicNodeBase() { - setName("PrintNode"); + setName("Functions :: Print"); setCaption("Print()"); _validation_state = NodeValidationState::Valid; @@ -76,5 +76,3 @@ NodeValidationState PrintNode::validate() return _validation_state; } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/ConditionNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/ConditionNode.cpp index 8fa3784a..9f640bb9 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/ConditionNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/ConditionNode.cpp @@ -10,7 +10,7 @@ using namespace noggit::Red::NodeEditor::Nodes; ConditionNode::ConditionNode() : BaseNode() { - setName("ConditionNode"); + setName("Logic :: Condition"); setCaption("Equal"); _validation_state = NodeValidationState::Valid; @@ -108,6 +108,3 @@ void ConditionNode::restore(const QJsonObject& json_obj) _second->setValue(json_obj["default_second"].toDouble()); _operation->setCurrentIndex(json_obj["operation"].toInt()); } - - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBeginNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBeginNode.cpp index 81f8d112..b7050bef 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBeginNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBeginNode.cpp @@ -9,8 +9,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicBeginNode::LogicBeginNode() : LogicNodeBase() { - setName("LogicBeginNode"); - setCaption("Begin"); + setName("Logic :: Begin"); + setCaption("Logic :: Begin"); setValidationState(NodeValidationState::Valid); addPort(PortType::Out, "Logic", true, ConnectionPolicy::One); diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBreakNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBreakNode.cpp index 8c23bf05..231c245c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBreakNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicBreakNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicBreakNode::LogicBreakNode() : LogicNodeBase() { - setName("LogicBreakNode"); - setCaption("Break"); + setName("Logic :: Break"); + setCaption("Logic :: Break"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -37,5 +37,3 @@ NodeValidationState LogicBreakNode::validate() return _validation_state; } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicChainNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicChainNode.cpp index 280dfaa4..48ea2b88 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicChainNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicChainNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicChainNode::LogicChainNode() : LogicNodeBase() { - setName("LogicChainNode"); - setCaption("Chain"); + setName("Logic :: Chain"); + setCaption("Logic :: Chain"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -127,4 +127,3 @@ void LogicChainNode::restorePostConnection(const QJsonObject& json_obj) } } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicContinueNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicContinueNode.cpp index 5c85656a..ab4408fe 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicContinueNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicContinueNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicContinueNode::LogicContinueNode() : LogicNodeBase() { - setName("LogicContinueNode"); - setCaption("Continue"); + setName("Logic :: Continue"); + setCaption("Logic :: Continue"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -37,5 +37,3 @@ NodeValidationState LogicContinueNode::validate() return _validation_state; } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicForLoopNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicForLoopNode.cpp index c69d62b4..a8da2452 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicForLoopNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicForLoopNode.cpp @@ -10,7 +10,7 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicForLoopNode::LogicForLoopNode() : LogicNodeBase() { - setName("LogicForLoopNode"); + setName("Logic :: ForLoop"); setCaption("Repeat"); _validation_state = NodeValidationState::Valid; @@ -108,4 +108,3 @@ NodeValidationState LogicForLoopNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicIfNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicIfNode.cpp index 20c836fb..400ee264 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicIfNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicIfNode.cpp @@ -8,8 +8,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicIfNode::LogicIfNode() : LogicNodeBase() { - setName("LogicIfNode"); - setCaption("Branch"); + setName("Logic :: If"); + setCaption("Logic :: If"); setValidationState(NodeValidationState::Valid); addPort(PortType::In, "Logic", true); @@ -90,5 +90,3 @@ NodeValidationState LogicIfNode::validate() return _validation_state; } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicProcedureNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicProcedureNode.cpp index 4a3b095f..2c3beb39 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicProcedureNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicProcedureNode.cpp @@ -19,8 +19,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicProcedureNode::LogicProcedureNode() : LogicNodeBase() { - setName("LogicProcedureNode"); - setCaption("Call Procedure"); + setName("Logic :: Procedure"); + setCaption("Logic :: Procedure"); setValidationState(NodeValidationState::Valid); addPort(PortType::In, "Logic", true); @@ -284,7 +284,7 @@ void LogicProcedureNode::setProcedure(const QString& path) addPort(PortType::In, port.caption, true); - int port_idx = _in_ports.size() - 1; + int port_idx = _in_ports.size() - 1; _in_ports[port_idx].data_type = port.data_type->instantiate(); _in_ports[port_idx].data_type->set_parameter_type(port.data_type->type().parameter_type_id); emit portAdded(PortType::In, port_idx); @@ -315,4 +315,3 @@ void LogicProcedureNode::setProcedure(const QString& path) emit visualsNeedUpdate(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNoDataNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNoDataNode.cpp index b2c33083..6ada2dce 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNoDataNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNoDataNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicReturnNoDataNode::LogicReturnNoDataNode() : LogicNodeBase() { - setName("LogicReturnNoDataNode"); - setCaption("Return"); + setName("Logic :: ReturnNoData"); + setCaption("Logic :: Return"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -35,7 +35,3 @@ NodeValidationState LogicReturnNoDataNode::validate() return _validation_state; } - - - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNode.cpp index f53340ed..4bad0359 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicReturnNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicReturnNode::LogicReturnNode() : LogicNodeBase() { - setName("LogicReturnNode"); - setCaption("Return Data"); + setName("Logic :: Return"); + setCaption("Logic :: Return"); setValidationState(NodeValidationState::Valid); addPort(PortType::In, "Logic", true); @@ -144,5 +144,3 @@ void LogicReturnNode::inputConnectionDeleted(const Connection& connection) } } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicWhileLoopNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicWhileLoopNode.cpp index 8859f250..4690fd0c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Logic/LogicWhileLoopNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Logic/LogicWhileLoopNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; LogicWhileLoopNode::LogicWhileLoopNode() : LogicNodeBase() { - setName("LogicWhileLoopNode"); - setCaption("Repeat While"); + setName("Logic :: WhileLoop"); + setCaption("Logic :: WhileLoop"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Logic", true); @@ -78,4 +78,4 @@ NodeValidationState LogicWhileLoopNode::validate() setNIterations(1); return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorMathNode.cpp index 7b2f0d28..ed6ff730 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorMathNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ColorMathNode::ColorMathNode() : BaseNode() { - setName("ColorMathNode"); - setCaption("Color Math"); + setName("Color :: Math"); + setCaption("Color :: Math"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -127,4 +127,3 @@ void ColorMathNode::restore(const QJsonObject& json_obj) } } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorToRGBANode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorToRGBANode.cpp index 81cce5ea..16c694d1 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorToRGBANode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Color/ColorToRGBANode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ColorToRGBANode::ColorToRGBANode() : BaseNode() { - setName("ColorToRGBANode"); - setCaption("Color To RGBA"); + setName("Color :: ColorToRGBA"); + setCaption("Color :: ColorToRGBA"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Color", true); @@ -47,4 +47,3 @@ NodeValidationState ColorToRGBANode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Color/RGBAtoColorNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Color/RGBAtoColorNode.cpp index 8a867e20..363943ad 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Color/RGBAtoColorNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Color/RGBAtoColorNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; RGBAtoColorNode::RGBAtoColorNode() : BaseNode() { - setName("RGBAtoColorNode"); - setCaption("RGBA To Color"); + setName("Color :: RGBAtoColor"); + setCaption("Color :: RGBAToColor"); _validation_state = NodeValidationState::Valid; } @@ -40,4 +40,3 @@ NodeValidationState RGBAtoColorNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/MathUnaryNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/MathUnaryNode.cpp index 3610a41b..ff5da140 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/MathUnaryNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/MathUnaryNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; MathUnaryNode::MathUnaryNode() : BaseNode() { - setName("MathUnaryNode"); - setCaption("Math Unary"); + setName("Math :: Unary"); + setCaption("Math :: Unary"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -112,4 +112,3 @@ NodeValidationState MathUnaryNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixDecomposeNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixDecomposeNode.cpp index 2ecbe252..ceec8be7 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixDecomposeNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixDecomposeNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixDecomposeNode::MatrixDecomposeNode() : BaseNode() { - setName("MatrixDecomposeNode"); - setCaption("Matrix Decompose"); + setName("Matrix :: Decompose"); + setCaption("Matrix :: Decompose"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Matrix4x4", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixMathNode.cpp index 5e511528..f1922d4a 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixMathNode.cpp @@ -10,7 +10,7 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixMathNode::MatrixMathNode() : BaseNode() { - setName("MatrixMathNode"); + setName("Matrix :: Math"); setCaption("Multiply"); _validation_state = NodeValidationState::Valid; @@ -88,4 +88,3 @@ NodeValidationState MatrixMathNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixNode.cpp index b2810fb7..34ef9f60 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixNode::MatrixNode() : BaseNode() { - setName("MatrixNode"); - setCaption("Matrix"); + setName("Matrix :: Create"); + setCaption("Matrix :: Create"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -41,4 +41,3 @@ void MatrixNode::restore(const QJsonObject& json_obj) _operation->setCurrentIndex(json_obj["operation"].toInt()); BaseNode::restore(json_obj); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixRotateQuaternionNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixRotateQuaternionNode.cpp index f98cf74d..83d75293 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixRotateQuaternionNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixRotateQuaternionNode.cpp @@ -13,8 +13,8 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixRotateQuaternionNode::MatrixRotateQuaternionNode() : BaseNode() { - setName("MatrixRotateQuaternionNode"); - setCaption("Matrix Rotate Quaternion"); + setName("Matrix :: RotateQuaternion"); + setCaption("Matrix :: RotateQuaternion"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Matrix4x4", true); @@ -51,4 +51,3 @@ NodeValidationState MatrixRotateQuaternionNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixTransformNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixTransformNode.cpp index dee5b571..f4200a17 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixTransformNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixTransformNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixTransformNode::MatrixTransformNode() : BaseNode() { - setName("MatrixTransformNode"); - setCaption("Matrix Transform"); + setName("Matrix :: Transform"); + setCaption("Matrix :: Transform"); _validation_state = NodeValidationState::Valid; _operation = new QComboBox(&_embedded_widget); @@ -79,4 +79,3 @@ NodeValidationState MatrixTransformNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixUnaryMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixUnaryMathNode.cpp index fbe3663f..f24d21bf 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixUnaryMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixUnaryMathNode.cpp @@ -10,7 +10,7 @@ using namespace noggit::Red::NodeEditor::Nodes; MatrixUnaryMathNode::MatrixUnaryMathNode() : BaseNode() { - setName("MatrixUnaryMathNode"); + setName("Matrix :: UnaryMath"); setCaption("Invert"); _validation_state = NodeValidationState::Valid; diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp index 04ed79d0..09847102 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector2DToXYNode::Vector2DToXYNode() : BaseNode() { - setName("Vector2DToXYNode"); - setCaption("Vector2D To XY"); + setName("Vector :: 2DToXY"); + setCaption("Vector :: 2DToXY"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector2D", true); @@ -43,4 +43,3 @@ NodeValidationState Vector2DToXYNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp index cfe2d46a..e299c639 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector3DToXYZNode::Vector3DToXYZNode() : BaseNode() { - setName("Vector3DToXYZNode"); - setCaption("Vector3D To XYZ"); + setName("Vector :: 3DToXYZ"); + setCaption("Vector :: 3DToXYZ"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector3D", true); @@ -45,4 +45,3 @@ NodeValidationState Vector3DToXYZNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp index cc77dde3..a710bbc7 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector4DToXYZWNode::Vector4DToXYZWNode() : BaseNode() { - setName("Vector4DToXYZWNode"); - setCaption("Vector4D To XYZW"); + setName("Vector :: 4DToXYZW"); + setCaption("Vector :: 4DToXYZW"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "Vector4D", true); @@ -48,4 +48,3 @@ NodeValidationState Vector4DToXYZWNode::validate() return _validation_state; } - diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorMathNode.cpp index a63ab868..7cec5394 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorMathNode.cpp @@ -8,15 +8,15 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector3DMathNode::Vector3DMathNode() { - setName("Vector3DMathNode"); + setName("Vector :: Vector3DMath"); } Vector2DMathNode::Vector2DMathNode() { - setName("Vector2DMathNode"); + setName("Vector :: Vector2DMath"); } Vector4DMathNode::Vector4DMathNode() { - setName("Vector4DMathNode"); + setName("Vector :: Vector4DMath"); } diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorScalarMathNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorScalarMathNode.cpp index c774a00c..2cf9b7fc 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorScalarMathNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/VectorScalarMathNode.cpp @@ -8,15 +8,15 @@ using namespace noggit::Red::NodeEditor::Nodes; Vector3DScalarMathNode::Vector3DScalarMathNode() { - setName("Vector3DScalarMathNode"); + setName("Vector :: Vector3DScalarMath"); } Vector2DScalarMathNode::Vector2DScalarMathNode() { - setName("Vector2DScalarMathNode"); + setName("Vector :: Vector2DScalarMath"); } Vector4DScalarMathNode::Vector4DScalarMathNode() { - setName("Vector4DScalarMathNode"); + setName("Vector :: Vector4DScalarMath"); } diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZWtoVector4DNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZWtoVector4DNode.cpp index 7764ef9c..e8af62f9 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZWtoVector4DNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZWtoVector4DNode.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; XYZWtoVector4DNode::XYZWtoVector4DNode() : BaseNode() { - setName("XYZWtoVector4DNode"); - setCaption("XYZW To Vector4D"); + setName("Vector :: XYZWtoVector4D"); + setCaption("Vector :: XYZWToVector4D"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "X", true); @@ -47,4 +47,4 @@ NodeValidationState XYZWtoVector4DNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZtoVector3DNode.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZtoVector3DNode.cpp index 3f251364..c3ba6347 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZtoVector3DNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYZtoVector3DNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; XYZtoVector3DNode::XYZtoVector3DNode() : BaseNode() { - setName("XYZtoVector3DNode"); - setCaption("XYZ To Vector3D"); + setName("Vector :: XYZtoVector3D"); + setCaption("Vector :: XYZtoVector3D"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "X", true); @@ -45,4 +45,4 @@ NodeValidationState XYZtoVector3DNode::validate() } return _validation_state; -} \ No newline at end of file +} diff --git a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYtoVector2D.cpp b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYtoVector2D.cpp index 4155c947..8c633e24 100644 --- a/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYtoVector2D.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/Math/Vector/XYtoVector2D.cpp @@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes; XYtoVector2DNode::XYtoVector2DNode() : BaseNode() { - setName("XYtoVector2DNode"); - setCaption("XY To Vector2D"); + setName("Vector :: XYtoVector2D"); + setCaption("Vector :: XYtoVector2D"); _validation_state = NodeValidationState::Valid; addPort(PortType::In, "X", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunk.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunk.cpp index d0615c27..06c55b2f 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunk.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunk.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetChunkNode::GetChunkNode() : ContextLogicNodeBase() { - setName("GetChunkNode"); - setCaption("Get Chunk"); + setName("Coordinates :: GetChunk"); + setCaption("Coordinates :: GetChunk"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -47,4 +47,3 @@ void GetChunkNode::compute() Q_EMIT dataUpdated(1); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunkFromPos.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunkFromPos.cpp index 8ff00d18..00a73ce5 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunkFromPos.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunkFromPos.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetChunkFromPosNode::GetChunkFromPosNode() : ContextLogicNodeBase() { - setName("GetChunkFromPosNode"); - setCaption("Get Chunk From Pos"); + setName("Coordinates :: GetChunkFromPos"); + setCaption("Coordinates :: GetChunkFromPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunksInRange.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunksInRange.cpp index df733288..3e2f893b 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunksInRange.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetChunksInRange.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetChunksInRangeNode::GetChunksInRangeNode() : ContextLogicNodeBase() { - setName("GetChunksInRangeNode"); - setCaption("Get Chunks in Range"); + setName("Coordinates :: GetChunksInRange"); + setCaption("Coordinates :: GetChunksInRange"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -60,4 +60,3 @@ void GetChunksInRangeNode::compute() Q_EMIT dataUpdated(1); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTile.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTile.cpp index a0fdce68..ae6cba0c 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTile.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTile.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetTileNode::GetTileNode() : ContextLogicNodeBase() { - setName("GetTileNode"); - setCaption("Get Tile"); + setName("Coordinates :: GetTile"); + setCaption("Coordinates :: GetTile"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -55,5 +55,3 @@ void GetTileNode::compute() } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileChunks.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileChunks.cpp index 07a4e035..d0646691 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileChunks.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileChunks.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetTileChunksNode::GetTileChunksNode() : ContextLogicNodeBase() { - setName("GetTileChunksNode"); - setCaption("Get Tile Chunks"); + setName("Coordinates :: GetTileChunks"); + setCaption("Coordinates :: GetTileChunks"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileFromPos.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileFromPos.cpp index 2adf9728..180bac78 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileFromPos.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTileFromPos.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetTileFromPosNode::GetTileFromPosNode() : ContextLogicNodeBase() { - setName("GetTileFromPosNode"); - setCaption("Get Tile From Pos"); + setName("Coordinates :: GetTileFromPos"); + setCaption("Coordinates :: GetTileFromPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTilesInRange.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTilesInRange.cpp index 68688f5c..5b2da885 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTilesInRange.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/GetTilesInRange.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; GetTilesInRangeNode::GetTilesInRangeNode() : ContextLogicNodeBase() { - setName("GetTilesInRangeNode"); - setCaption("Get Tiles in Range"); + setName("Coordinates :: GetTilesInRange"); + setCaption("Coordinates :: GetTilesInRange"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -56,4 +56,3 @@ void GetTilesInRangeNode::compute() Q_EMIT dataUpdated(1); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAt.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAt.cpp index 6b3db616..90c517a6 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAt.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAt.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; HasTileAtNode::HasTileAtNode() : ContextLogicNodeBase() { - setName("HasTileAtNode"); - setCaption("Has Tile at"); + setName("Coordinates :: HasTileAt"); + setCaption("Coordinates :: HasTileAt"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAtPos.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAtPos.cpp index ba9fb1af..d5e4c41b 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAtPos.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Coordinates/HasTileAtPos.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; HasTileAtPosNode::HasTileAtPosNode() : ContextLogicNodeBase() { - setName("HasTileAtPosNode"); - setCaption("Has Tile at Pos"); + setName("Coordinates :: HasTileAtPos"); + setCaption("Coordinates :: HasTileAtPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -37,5 +37,3 @@ void HasTileAtPosNode::compute() Q_EMIT dataUpdated(1); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Misc/WorldConstantsNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Misc/WorldConstantsNode.cpp index ee7d10f4..866017bb 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Misc/WorldConstantsNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Misc/WorldConstantsNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; WorldConstantsNode::WorldConstantsNode() : ContextNodeBase() { - setName("WorldConstantsNode"); - setCaption("World Constants"); + setName("Misc :: WorldConstants"); + setCaption("Misc :: WorldConstants"); _validation_state = NodeValidationState::Valid; addPort(PortType::Out, "TileSize", true); @@ -47,5 +47,3 @@ void WorldConstantsNode::compute() } } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPaintColorNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPaintColorNode.cpp index d46fc5e9..1456f4a4 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPaintColorNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPaintColorNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ShadingPaintColorNode::ShadingPaintColorNode() : ContextLogicNodeBase() { - setName("ShadingPaintColorNode"); - setCaption("Shading Paint Color"); + setName("Shading :: PaintColor"); + setCaption("Shading :: PaintColor"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPickColorNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPickColorNode.cpp index 6e4c5861..577bb911 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPickColorNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Shading/ShadingPickColorNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ShadingPickColorNode::ShadingPickColorNode() : ContextLogicNodeBase() { - setName("ShadingPickColorNode"); - setCaption("Shading Pick Color"); + setName("Shading :: PickColor"); + setCaption("Shading :: PickColor"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -40,5 +40,3 @@ void ShadingPickColorNode::compute() Q_EMIT dataUpdated(1); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainBlurNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainBlurNode.cpp index 783d931a..b18625e7 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainBlurNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainBlurNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TerrainBlurNode::TerrainBlurNode() : ContextLogicNodeBase() { - setName("TerrainBlurNode"); - setCaption("Terrain Blur"); + setName("Terrain :: Blur"); + setCaption("Terrain :: Blur"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -67,4 +67,3 @@ void TerrainBlurNode::restore(const QJsonObject& json_obj) ContextLogicNodeBase::restore(json_obj); _mode->setCurrentIndex(json_obj["mode"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainFlattenNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainFlattenNode.cpp index de5d620f..fbd8cd1e 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainFlattenNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainFlattenNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TerrainFlattenNode::TerrainFlattenNode() : ContextLogicNodeBase() { - setName("TerrainFlattenNode"); - setCaption("Terrain Flatten"); + setName("Terrain :: Flatten"); + setCaption("Terrain :: Flatten"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -73,4 +73,3 @@ void TerrainFlattenNode::restore(const QJsonObject& json_obj) ContextLogicNodeBase::restore(json_obj); _mode->setCurrentIndex(json_obj["mode"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainRaiseLowerNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainRaiseLowerNode.cpp index cb36fd92..418950e8 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainRaiseLowerNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Terrain/TerrainRaiseLowerNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TerrainRaiseLowerNode::TerrainRaiseLowerNode() : ContextLogicNodeBase() { - setName("TerrainRaiseLowerNode"); - setCaption("Terrain Raise/Lower"); + setName("Terrain :: RaiseLower"); + setCaption("Terrain :: RaiseLower"); _validation_state = NodeValidationState::Valid; _mode = new QComboBox(&_embedded_widget); @@ -67,4 +67,3 @@ void TerrainRaiseLowerNode::restore(const QJsonObject& json_obj) ContextLogicNodeBase::restore(json_obj); _mode->setCurrentIndex(json_obj["mode"].toInt()); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingClearTexturesAdtAtPosNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingClearTexturesAdtAtPosNode.cpp index 3e1dfabc..1ecb12e8 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingClearTexturesAdtAtPosNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingClearTexturesAdtAtPosNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingClearTexturesAdtAtPosNode::TexturingClearTexturesAdtAtPosNode() : ContextLogicNodeBase() { - setName("TexturingClearTexturesAdtAtPosNode"); - setCaption("Clear Textures ADT at Pos"); + setName("Texturing :: ClearTexturesADTatPos"); + setCaption("Texturing :: ClearTexturesADTatPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -36,4 +36,3 @@ void TexturingClearTexturesAdtAtPosNode::compute() Q_EMIT dataUpdated(0); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingPaintTextureNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingPaintTextureNode.cpp index 3bf1ac52..bbadf3fb 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingPaintTextureNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingPaintTextureNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingPaintTextureNode::TexturingPaintTextureNode() : ContextLogicNodeBase() { - setName("TexturingPaintTextureNode"); - setCaption("Paint Texture"); + setName("Texturing :: PaintTexture"); + setCaption("Texturing :: PaintTexture"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingRemoveTexDuplisAdtAtPosNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingRemoveTexDuplisAdtAtPosNode.cpp index 5d98b0bc..d0d0e64f 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingRemoveTexDuplisAdtAtPosNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingRemoveTexDuplisAdtAtPosNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingRemoveTexDuplisAdtAtPosNode::TexturingRemoveTexDuplisAdtAtPosNode() : ContextLogicNodeBase() { - setName("TexturingRemoveTexDuplisAdtAtPosNode"); - setCaption("Remove Texture Duplicates ADT at Pos"); + setName("Texturing :: RemoveTexDuplisADTAtPos"); + setCaption("Texturing :: RemoveTexDuplisADTAtPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -35,5 +35,3 @@ void TexturingRemoveTexDuplisAdtAtPosNode::compute() Q_EMIT dataUpdated(0); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSetAdtBaseTextureAtPosNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSetAdtBaseTextureAtPosNode.cpp index 050ed40a..bbbee257 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSetAdtBaseTextureAtPosNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSetAdtBaseTextureAtPosNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingSetAdtBaseTextureAtPosNode::TexturingSetAdtBaseTextureAtPosNode() : ContextLogicNodeBase() { - setName("TexturingSetAdtBaseTextureAtPosNode"); - setCaption("Set ADT Base Texture at Pos"); + setName("Texturing :: SetADTBaseTextureAtPos"); + setCaption("Texturing :: SetADTBaseTextureAtPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -45,5 +45,3 @@ void TexturingSetAdtBaseTextureAtPosNode::compute() Q_EMIT dataUpdated(0); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSprayTextureNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSprayTextureNode.cpp index cafad23a..ae319424 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSprayTextureNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSprayTextureNode.cpp @@ -12,8 +12,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingSprayTextureNode::TexturingSprayTextureNode() : ContextLogicNodeBase() { - setName("TexturingSprayTextureNode"); - setCaption("Spray Texture"); + setName("Texturing :: SprayTexture"); + setCaption("Texturing :: SprayTexture"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -95,4 +95,3 @@ void TexturingSprayTextureNode::compute() Q_EMIT dataUpdated(0); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosNode.cpp index 74c54bf2..32db6d02 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingSwapTextureAtPosNode::TexturingSwapTextureAtPosNode() : ContextLogicNodeBase() { - setName("TexturingSwapTextureAtPosNode"); - setCaption("Swap Texture at Pos"); + setName("Texturing :: SwapTextureAtPos"); + setCaption("Texturing :: SwapTextureAtPos"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -45,5 +45,3 @@ void TexturingSwapTextureAtPosNode::compute() Q_EMIT dataUpdated(0); } - - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosRadiusNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosRadiusNode.cpp index 9b81b78c..0c4ab64f 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosRadiusNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingSwapTextureAtPosRadiusNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingSwapTextureAtPosRadiusNode::TexturingSwapTextureAtPosRadiusNode() : ContextLogicNodeBase() { - setName("TexturingSwapTextureAtPosRadiusNode"); - setCaption("Swap Texture at Pos Radius"); + setName("Texturing :: SwapTextureAtPosRadius"); + setCaption("Texturing :: SwapTextureAtPosRadius"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingTilesetNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingTilesetNode.cpp index 6c8f586f..1f668e8d 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingTilesetNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Texturing/TexturingTilesetNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TexturingTilesetNode::TexturingTilesetNode() : ContextNodeBase() { - setName("TexturingTilesetNode"); - setCaption("Tileset"); + setName("Texturing :: Tileset"); + setCaption("Texturing :: Tileset"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::Out, "Path", true); @@ -63,4 +63,3 @@ void TexturingTilesetNode::restore(const QJsonObject& json_obj) defaultWidgetFromJson(PortType::Out, 0, json_obj, "path"); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Tile/ReloadTileNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Tile/ReloadTileNode.cpp index 79625d78..7c76252a 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Tile/ReloadTileNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Tile/ReloadTileNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; ReloadTileNode::ReloadTileNode() : ContextLogicNodeBase() { - setName("ReloadTileNode"); - setCaption("Reload Tile"); + setName("Tile :: Reload"); + setCaption("Tile :: Reload"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -43,4 +43,3 @@ void ReloadTileNode::compute() Q_EMIT dataUpdated(0); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetMaxHeightNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetMaxHeightNode.cpp index 8244f267..32488465 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetMaxHeightNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetMaxHeightNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TileGetMaxHeightNode::TileGetMaxHeightNode() : ContextLogicNodeBase() { - setName("TileGetMaxHeightNode"); - setCaption("Tile Get Max Height"); + setName("Tile :: GetMaxHeight"); + setCaption("Tile :: GetMaxHeight"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -48,4 +48,3 @@ NodeValidationState TileGetMaxHeightNode::validate() return ContextLogicNodeBase::validate(); } - diff --git a/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetVertexNode.cpp b/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetVertexNode.cpp index e72647ba..fcf03679 100644 --- a/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetVertexNode.cpp +++ b/src/noggit/Red/NodeEditor/Nodes/World/Tile/TileGetVertexNode.cpp @@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes; TileGetVertexNode::TileGetVertexNode() : ContextLogicNodeBase() { - setName("TileGetVertexNode"); - setCaption("Tile Get Vertex"); + setName("Tile :: GetVertex"); + setCaption("Tile :: GetVertex"); _validation_state = NodeValidationState::Valid; addPortDefault(PortType::In, "Logic", true); @@ -55,6 +55,3 @@ NodeValidationState TileGetVertexNode::validate() return ContextLogicNodeBase::validate(); } - - - diff --git a/src/noggit/ui/MapViewOverlay.ui b/src/noggit/ui/MapViewOverlay.ui index 7f80451f..b1995970 100644 --- a/src/noggit/ui/MapViewOverlay.ui +++ b/src/noggit/ui/MapViewOverlay.ui @@ -42,7 +42,7 @@ - 0 + 6 QLayout::SetDefaultConstraint @@ -71,7 +71,7 @@ Enable gizmo - V + @@ -111,7 +111,7 @@ Gizmo mode - M + @@ -151,7 +151,7 @@ Translate - T + @@ -194,7 +194,7 @@ Rotate - R + @@ -236,46 +236,6 @@ Scale - - S - - - - 26 - 26 - - - - true - - - buttonGroup - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - 32 - 32 - - - - Draw grid - @@ -288,9 +248,6 @@ true - - false - buttonGroup @@ -360,14 +317,20 @@ - 0 + 6 - 24 - 24 + 32 + 32 + + + + + 32 + 32 @@ -379,8 +342,14 @@ - 24 - 24 + 32 + 32 + + + + + 32 + 32 @@ -392,8 +361,14 @@ - 24 - 24 + 32 + 32 + + + + + 32 + 32 diff --git a/src/noggit/ui/TitleBar.ui b/src/noggit/ui/TitleBar.ui index c4bdb6b0..d00eaf87 100644 --- a/src/noggit/ui/TitleBar.ui +++ b/src/noggit/ui/TitleBar.ui @@ -109,10 +109,6 @@ Minimize - - - :./media/button_minimize_black.svg:./media/button_minimize_black.svg - 32 @@ -150,11 +146,6 @@ Maximize - - - :./media/button_maximize_black.svg - :./media/button_restore_black.svg:./media/button_maximize_black.svg - 32 @@ -192,10 +183,6 @@ Close - - - :./media/button_close_black.svg:./media/button_close_black.svg - 32