natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sshumakov3
2021-01-22 23:57:57 +03:00
parent ce1c4ea736 b603e473ed
commit 56e4b6bfee
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/resources.qrc
View File

@@ -7,6 +7,8 @@
<qresource prefix="/fonts">
<file>font_awesome.otf</file>
<file>noggit_font.ttf</file>
<file>OpenSans-Regular.ttf</file>
<file>OpenSans-SemiBold.ttf</file>
</qresource>
<qresource prefix="/">
<file alias="icon">../media/noggit_icon.png</file>

4
src/noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.cpp
View File

@@ -13,8 +13,8 @@ using namespace noggit::Red::NodeEditor::Nodes;
LoadImageNode::LoadImageNode()
: LogicNodeBase()
{
setName("Load :: Image");
setCaption("Load :: Image");
setName("Image :: Load");
setCaption("Image :: Load");
_validation_state = NodeValidationState::Valid;
addPort<LogicData>(PortType::In, "Logic", true);

4
src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector2DToXYNode.cpp
View File

@@ -11,8 +11,8 @@ using namespace noggit::Red::NodeEditor::Nodes;
Vector2DToXYNode::Vector2DToXYNode()
: BaseNode()
{
setName("Vector :: 2DToXY");
setCaption("Vector :: 2DToXY");
setName("Vector :: Vector2DToXY");
setCaption("Vector :: Vector2DToXY");
_validation_state = NodeValidationState::Valid;
addPort<Vector2DData>(PortType::In, "Vector2D", true);

4
src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector3DToXYZNode.cpp
View File

@@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes;
Vector3DToXYZNode::Vector3DToXYZNode()
: BaseNode()
{
setName("Vector :: 3DToXYZ");
setCaption("Vector :: 3DToXYZ");
setName("Vector :: Vector3DToXYZ");
setCaption("Vector :: Vector3DToXYZ");
_validation_state = NodeValidationState::Valid;
addPort<Vector3DData>(PortType::In, "Vector3D", true);

4
src/noggit/Red/NodeEditor/Nodes/Math/Vector/Vector4DToXYZWNode.cpp
View File

@@ -10,8 +10,8 @@ using namespace noggit::Red::NodeEditor::Nodes;
Vector4DToXYZWNode::Vector4DToXYZWNode()
: BaseNode()
{
setName("Vector :: 4DToXYZW");
setCaption("Vector :: 4DToXYZW");
setName("Vector :: Vector4DToXYZW");
setCaption("Vector :: Vector4DToXYZW");
_validation_state = NodeValidationState::Valid;
addPort<Vector4DData>(PortType::In, "Vector4D", true);

3
src/noggit/Red/NodeEditor/Nodes/RewiringPointNode.cpp
View File

@@ -13,7 +13,7 @@ using QtNodes::Node;
RewiringPointNode::RewiringPointNode()
: BaseNode()
{
setName("RewiringPointNode");
setName("RewiringPoint");
_validation_state = NodeValidationState::Valid;
addPort<AnyData>(PortType::In, "", false);
@@ -92,4 +92,3 @@ void RewiringPointNode::restore(const QJsonObject& json_obj)
_in_ports[0].data_type.reset(TypeFactory::create(type_id));
_in_ports[0].data_type->set_parameter_type(param_type_id);
}