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

implement node styles

Browse Source
This commit is contained in:
sshumakov3
2021-01-15 15:02:57 +03:00
parent 2587c74d42
commit 54297eb255
4 changed files with 141 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/noggit/Red/NodeEditor/NodeRegistry.hpp
View File

@@ -62,6 +62,12 @@
#include <noggit/Red/NodeEditor/Nodes/Data/String/StringSizeNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Math/Matrix/MatrixNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Random/RandomDecimalRangeNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Random/RandomIntegerRangeNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Image/LoadImageNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Image/ImageInfoNode.hpp>
#include <noggit/Red/NodeEditor/Nodes/Data/Image/ImageSaveNode.hpp>
@@ -107,6 +113,10 @@
#include <noggit/Red/NodeEditor/Nodes/DataTypes/GenericTypeConverter.hpp>
#include <noggit/Red/NodeEditor/Nodes/Scene/NodeScene.hpp>
#include <QSettings>
#include <QDir>
#include <QByteArray>
using QtNodes::DataModelRegistry;
using QtNodes::FlowScene;
using QtNodes::FlowView;
@@ -192,6 +202,14 @@ namespace noggit
ret->registerModel<StringEndsWithNode>("Data//String");
ret->registerModel<StringSizeNode>("Data//String");
// Random
ret->registerModel<RandomDecimalNode>("Data//Random");
ret->registerModel<RandomDecimalRangeNode>("Data//Random");
ret->registerModel<RandomIntegerNode>("Data//Random");
ret->registerModel<RandomIntegerRangeNode>("Data//Random");
ret->registerModel<RandomSeedNode>("Data//Random");
// Noise
ret->registerModel<NoisePerlinNode>("Data//Noise//Generators");
ret->registerModel<NoiseBillowNode>("Data//Noise//Generators");
@@ -281,51 +299,67 @@ namespace noggit
static void setStyle()
{
ConnectionStyle::setConnectionStyle(
R"(
{
"FlowViewStyle": {
"BackgroundColor": [53, 53, 53],
"FineGridColor": [60, 60, 60],
"CoarseGridColor": [25, 25, 25]
},
"NodeStyle": {
"NormalBoundaryColor": [255, 255, 255],
"SelectedBoundaryColor": [255, 165, 0],
"GradientColor0": "gray",
"GradientColor1": [80, 80, 80],
"GradientColor2": [64, 64, 64],
"GradientColor3": [58, 58, 58],
"ShadowColor": [20, 20, 20],
"FontColor" : "white",
"FontColorFaded" : "gray",
"ConnectionPointColor": [169, 169, 169],
"FilledConnectionPointColor": "cyan",
"ErrorColor": "red",
"WarningColor": [128, 128, 0],
QSettings settings;
QString theme = settings.value("theme", 1).toString();
QDir theme_dir = QDir("./themes/");
"PenWidth": 1.0,
"HoveredPenWidth": 1.5,
if (theme != "System" && theme_dir.exists() && QDir(theme_dir.path() + "/" + theme).exists("nodes_theme.json"))
{
QFile json_file = QFile(QDir(theme_dir.path() + "/" + theme).filePath("nodes_theme.json"));
json_file.open(QIODevice::ReadOnly);
"ConnectionPointDiameter": 8.0,
QByteArray save_data = json_file.readAll();
"Opacity": 0.8
},
"ConnectionStyle": {
"ConstructionColor": "gray",
"NormalColor": "darkcyan",
"SelectedColor": [100, 100, 100],
"SelectedHaloColor": "orange",
"HoveredColor": "lightcyan",
ConnectionStyle::setConnectionStyle(save_data);
}
else
{
ConnectionStyle::setConnectionStyle(
R"(
{
"FlowViewStyle": {
"BackgroundColor": [53, 53, 53],
"FineGridColor": [60, 60, 60],
"CoarseGridColor": [25, 25, 25]
},
"NodeStyle": {
"NormalBoundaryColor": [255, 255, 255],
"SelectedBoundaryColor": [255, 165, 0],
"GradientColor0": "gray",
"GradientColor1": [80, 80, 80],
"GradientColor2": [64, 64, 64],
"GradientColor3": [58, 58, 58],
"ShadowColor": [20, 20, 20],
"FontColor" : "white",
"FontColorFaded" : "gray",
"ConnectionPointColor": [169, 169, 169],
"FilledConnectionPointColor": "cyan",
"ErrorColor": "red",
"WarningColor": [128, 128, 0],
"LineWidth": 3.0,
"ConstructionLineWidth": 2.0,
"PointDiameter": 10.0,
"PenWidth": 1.0,
"HoveredPenWidth": 1.5,
"UseDataDefinedColors": true
"ConnectionPointDiameter": 8.0,
"Opacity": 0.8
},
"ConnectionStyle": {
"ConstructionColor": "gray",
"NormalColor": "darkcyan",
"SelectedColor": [100, 100, 100],
"SelectedHaloColor": "orange",
"HoveredColor": "lightcyan",
"LineWidth": 3.0,
"ConstructionLineWidth": 2.0,
"PointDiameter": 10.0,
"UseDataDefinedColors": true
}
}
}
)");
}
}
}
}

34
src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.cpp Normal file
View File

@@ -0,0 +1,34 @@
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
#include "RandomSeedNode.hpp"
#include <noggit/Red/NodeEditor/Nodes/BaseNode.inl>
#include <noggit/Red/NodeEditor/Nodes/DataTypes/GenericData.hpp>
#include <random>
#include <ctime>
using namespace noggit::Red::NodeEditor::Nodes;
RandomSeedNode::RandomSeedNode()
: LogicNodeBase()
{
setName("RandomSeedNode");
setCaption("Random Seed");
_validation_state = NodeValidationState::Valid;
addPort<LogicData>(PortType::In, "Logic", true);
addPort<LogicData>(PortType::Out, "Logic", true);
addPort<IntegerData>(PortType::Out, "Seed", true);
}
void RandomSeedNode::compute()
{
_out_ports[0].out_value = std::make_shared<LogicData>(true);
Q_EMIT dataUpdated(0);
std::srand(time(nullptr));
_out_ports[1].out_value = std::make_shared<IntegerData>(std::rand());
Q_EMIT dataUpdated(1);
}

33
src/noggit/Red/NodeEditor/Nodes/Data/Random/RandomSeedNode.hpp Normal file
View File

@@ -0,0 +1,33 @@
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
#ifndef NOGGIT_RANDOMSEEDNODE_HPP
#define NOGGIT_RANDOMSEEDNODE_HPP
#include <noggit/Red/NodeEditor/Nodes/LogicNodeBase.hpp>
using QtNodes::PortType;
using QtNodes::PortIndex;
using QtNodes::NodeData;
using QtNodes::NodeDataType;
using QtNodes::NodeDataModel;
using QtNodes::NodeValidationState;
namespace noggit
{
namespace Red::NodeEditor::Nodes
{
class RandomSeedNode : public LogicNodeBase
{
Q_OBJECT
public:
RandomSeedNode();
void compute() override;
};
}
}
#endif //NOGGIT_RANDOMSEEDNODE_HPP

3
src/noggit/ui/SettingsPanel.cpp
View File

@@ -149,7 +149,8 @@ namespace noggit
ui->_theme->addItem(dir);
}
}
} else
}
else
{
LogError
<< "Failed to load themes. The \"themes/\" folder does not exist in Noggit directory. Using system theme."