Skip to content
Snippets Groups Projects
Commit 37ca3b5b authored by Mathias Paulin's avatar Mathias Paulin :speech_balloon:
Browse files

[nodeEditor] delegates uuid generation to the libRender Node

parent f46df105
No related branches found
No related tags found
No related merge requests found
......@@ -104,7 +104,7 @@ public Q_SLOTS: // data propagation
private:
// addressing
friend class FlowScene;
QUuid _uid;
// data
......
......@@ -200,6 +200,10 @@ createNode(std::unique_ptr<NodeDataModel> && dataModel)
auto node = detail::make_unique<Node>(std::move(dataModel));
auto ngo = detail::make_unique<NodeGraphicsObject>(*this, *node);
// generates the uuid of the node (delegated to nodeDataModel implementation)
node->_uid = QUuid(node->nodeDataModel()->uuid());
std::cout << "Generating an uuid for newly created node : " << node->_uid.toString().toStdString() << std::endl;
node->setGraphicsObject(std::move(ngo));
auto nodePtr = node.get();
......
......@@ -28,7 +28,6 @@ std::string Node::getUuid() const {
// generates the uuid (need to remove const attribute ...
const_cast<Node*>(this)->generateUuid();
std::string guuid = "{" + uuids::to_string(m_uuid) + "}";
std::cout << "###*** UUId generated for node" << getName() << " : " << guuid << std::endl;
}
std::string struuid = "{" + uuids::to_string(m_uuid) + "}";
return struuid;
......@@ -50,9 +49,7 @@ void Node::fromJson( const nlohmann::json& data ) {
// get the common content of the Node from the json data
std::string struuid = data["id"];
m_uuid = uuids::uuid::from_string(struuid).value();
std::string struuidstored = "{" + uuids::to_string(m_uuid) + "}";
std::cerr << "Radium Node::fromJson : " << struuidstored << " -- uuid from file : " << struuid << std::endl;
std::string readTypeName = data["model"]["name"];
std::string readTypeName = data["model"]["name"];
if ( readTypeName != m_typeName )
{
LOG( logERROR ) << "Node::fromJson : incoherent type names : json data : " << readTypeName
......@@ -89,8 +86,9 @@ void Node::toJson( nlohmann::json& data ) const {
{
if ( key != "id" && key != "model" ) { data.emplace( key, value ); }
}
/*
std::cout << "Node::toJson -- generated json is : \n";
for ( auto& [key, value] : data.items() )
{ std::cout << "\t" << key << " : " << value << "\n"; }
*/
}
......@@ -108,7 +108,10 @@ class NodeBasedRenderer_LIBRARY_API Node
Ra::Engine::Rendering::RenderTechnique& rt ) const {}
/// Gets the name of the node.
const std::string& getName() const { return m_typeName; }
const std::string& getTypeName() const { return m_typeName; }
/// Gets the instance name of the node.
const std::string& getInstanceName() const { return m_instanceName; }
/// Generates the uuid of the node
void generateUuid();
......@@ -147,7 +150,7 @@ class NodeBasedRenderer_LIBRARY_API Node
bool m_initialized{ false };
/// Two nodes are considered equal if there names are the same.
bool operator==( const Node& o_node ) { return m_typeName == o_node.getName(); }
bool operator==( const Node& o_node ) { return m_typeName == o_node.getTypeName(); }
protected:
/// @param instanceName The name of the node
......
{
"connections": [
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 0,
"out_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"out_index": 0
},
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 3,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
"in_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 3,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 5,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 0
},
{
"in_id": "{aa0f14a1-bb34-43a6-a11d-5b88404d254d}",
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 0,
"out_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"out_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"out_index": 0
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_index": 4,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
"in_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_index": 1,
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 2,
"out_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"out_index": 0
},
{
"in_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 2
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 0,
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 1
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 0,
"out_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 2,
"out_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 5,
"out_id": "{c6d4682c-2a02-467a-9c5c-5511b63b17ba}",
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 0,
"out_id": "{62ad7aec-1ea4-4f10-85cb-4be1ecda4263}",
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 3,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 0,
"out_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 2,
"out_id": "{ab3678ab-f0fd-4815-8fa7-7cd08bb239fd}",
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 0,
"out_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 3,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
......@@ -109,9 +85,9 @@
"out_index": 0
},
{
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 2,
"out_id": "{9579a8e2-d2d0-4107-b7b5-32b4aa1e7ce9}",
"in_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_index": 0,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
......@@ -120,58 +96,70 @@
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
"in_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 0,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 1
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 0,
"out_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"out_index": 0
},
{
"in_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 2,
"out_id": "{ab3678ab-f0fd-4815-8fa7-7cd08bb239fd}",
"in_index": 0,
"out_id": "{62ad7aec-1ea4-4f10-85cb-4be1ecda4263}",
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 3,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 3,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 2,
"out_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"out_index": 0
},
{
"in_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 0,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"out_index": 0
},
{
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 4,
"in_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 3,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 3,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
"in_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 2
},
{
"in_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_index": 2,
"out_id": "{9579a8e2-d2d0-4107-b7b5-32b4aa1e7ce9}",
"out_index": 0
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 2,
"out_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 5,
"out_id": "{c6d4682c-2a02-467a-9c5c-5511b63b17ba}",
"out_index": 0
},
{
......@@ -181,119 +169,139 @@
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 0
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 4,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"in_id": "{aa0f14a1-bb34-43a6-a11d-5b88404d254d}",
"in_index": 0,
"out_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"out_index": 0
},
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 0,
"out_id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"in_index": 2,
"out_id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"out_index": 0
},
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"out_index": 0
},
{
"in_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"in_index": 1,
"out_id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"in_index": 3,
"out_id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"out_index": 0
},
{
"in_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"in_id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"in_index": 0,
"out_id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"out_id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"out_index": 0
},
{
"in_id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"in_index": 5,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
},
{
"in_id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"in_index": 4,
"out_id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"out_index": 0
}
],
"nodes": [
{
"id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"id": "{ab3678ab-f0fd-4815-8fa7-7cd08bb239fd}",
"model": {
"instance": "AccessibilityBufferNode4",
"name": "Accessibility Buffer Pass"
"files": "/Users/mathias/Professionnel/Data/skyboxes/Spherical/spiaggia_di_mondello.jpg",
"instance": "EnvMapTextureSource14",
"name": "Source std::shared_ptr<RadiumNBR::EnvMap>",
"strength": 100,
"type": 2
},
"position": {
"x": 460.73280000000034,
"y": 391.6895999999998
"x": -495.6287999999997,
"y": -42.998399999999975
}
},
{
"id": "{aa0f14a1-bb34-43a6-a11d-5b88404d254d}",
"id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"model": {
"instance": "display",
"name": "Display Sink"
"activated": false,
"instance": "WireframeNode13",
"name": "Wireframe Pass"
},
"position": {
"x": 2139.9160319999987,
"y": 65.31194879999975
"x": 1659.9455999999996,
"y": 309.31199999999995
}
},
{
"id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"id": "{62ad7aec-1ea4-4f10-85cb-4be1ecda4263}",
"model": {
"instance": "TransparencyNode5",
"name": "Transparency Pass"
"instance": "ColorTextureNode12",
"name": "Color Texture"
},
"position": {
"x": 1362.3552,
"y": 159.9552000000001
"x": -438.7775999999999,
"y": -589.4207999999999
}
},
{
"id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"model": {
"instance": "EmissivityNode6",
"name": "Emissivity Pass"
"instance": "renderObjects",
"name": "RenderObjects"
},
"position": {
"x": 462.06719999999984,
"y": -292.3775999999999
"x": -138.44544000000042,
"y": -589.9622399999997
}
},
{
"id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"model": {
"instance": "EnvLightNode8",
"name": "Environment Light Pass"
"instance": "cameras",
"name": "Cameras"
},
"position": {
"x": 761.1129600000002,
"y": -145.65696
"x": -140.15999999999977,
"y": 387.9264000000001
}
},
{
"id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"model": {
"instance": "ZGeomPrepassNode7",
"name": "Z Geometry Prepass"
"instance": "LocalLightNode11",
"name": "Local Light Pass"
},
"position": {
"x": 109.49759999999998,
"y": -19.007999999999967
"x": 1059.4128,
"y": 0.4959999999999809
}
},
{
"id": "{9579a8e2-d2d0-4107-b7b5-32b4aa1e7ce9}",
"id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"model": {
"filteredType": "Transparent",
"instance": "FilterROByTypeNode9",
"name": "Filter RenderObjects By Type"
"clearColor": [
0.15294116735458374,
0.15294116735458374,
0.15294116735458374
],
"instance": "ClearColorNode10",
"name": "Clear Color Pass"
},
"position": {
"x": 1062.6623999999997,
"y": -295.8911999999997
"x": 7.430399999999992,
"y": -444.0959999999998
}
},
{
......@@ -308,89 +316,81 @@
}
},
{
"id": "{4eabb57e-6858-49aa-bfe2-c6a0a20850c3}",
"id": "{9654598f-d4d4-494d-9f14-65d75606f1af}",
"model": {
"clearColor": [
0.15686273574829102,
0.15686273574829102,
0.15686273574829102
],
"instance": "ClearColorNode10",
"name": "Clear Color Pass"
"instance": "ZGeomPrepassNode7",
"name": "Z Geometry Prepass"
},
"position": {
"x": 7.430399999999992,
"y": -444.0959999999998
"x": 109.49759999999998,
"y": -19.007999999999967
}
},
{
"id": "{bdfe05be-3655-4d56-924d-ff3b1bbd709b}",
"id": "{c66eb0ff-d015-4974-b729-a272678bce05}",
"model": {
"instance": "LocalLightNode11",
"name": "Local Light Pass"
"instance": "EnvLightNode8",
"name": "Environment Light Pass"
},
"position": {
"x": 1059.4128,
"y": 0.4959999999999809
"x": 761.1129600000002,
"y": -145.65696
}
},
{
"id": "{6ceda554-f6d1-4cf0-a36d-e811fc0ad3f1}",
"id": "{9579a8e2-d2d0-4107-b7b5-32b4aa1e7ce9}",
"model": {
"instance": "cameras",
"name": "Cameras"
"filteredType": "Transparent",
"instance": "FilterROByTypeNode9",
"name": "Filter RenderObjects By Type"
},
"position": {
"x": -140.15999999999977,
"y": 387.9264000000001
"x": 1062.6623999999997,
"y": -295.8911999999997
}
},
{
"id": "{d07939d8-46d5-4d48-90fa-4ab2a4eebf30}",
"id": "{d79d27a4-64c1-4fa1-adc8-c39fd9da3008}",
"model": {
"instance": "renderObjects",
"name": "RenderObjects"
"instance": "EmissivityNode6",
"name": "Emissivity Pass"
},
"position": {
"x": -138.44544000000042,
"y": -589.9622399999997
"x": 462.06719999999984,
"y": -292.3775999999999
}
},
{
"id": "{62ad7aec-1ea4-4f10-85cb-4be1ecda4263}",
"id": "{34e8d2d1-a2de-4ebe-a18f-4dcd5b440d1c}",
"model": {
"instance": "ColorTextureNode12",
"name": "Color Texture"
"instance": "TransparencyNode5",
"name": "Transparency Pass"
},
"position": {
"x": -438.7775999999999,
"y": -589.4207999999999
"x": 1362.3552,
"y": 159.9552000000001
}
},
{
"id": "{c4f37638-3568-46cd-acbe-622013f79c13}",
"id": "{aa0f14a1-bb34-43a6-a11d-5b88404d254d}",
"model": {
"activated": false,
"instance": "WireframeNode13",
"name": "Wireframe Pass"
"instance": "display",
"name": "Display Sink"
},
"position": {
"x": 1659.9455999999996,
"y": 309.31199999999995
"x": 2139.9160319999987,
"y": 65.31194879999975
}
},
{
"id": "{ab3678ab-f0fd-4815-8fa7-7cd08bb239fd}",
"id": "{cb6e4c08-38bf-48fd-8cf2-392a5491751b}",
"model": {
"files": "/Users/mathias/Professionnel/Data/skyboxes/Spherical/spiaggia_di_mondello.jpg",
"instance": "EnvMapTextureSource14",
"name": "Source std::shared_ptr<RadiumNBR::EnvMap>",
"strength": 100,
"type": 2
"instance": "AccessibilityBufferNode4",
"name": "Accessibility Buffer Pass"
},
"position": {
"x": -495.6287999999997,
"y": -42.998399999999975
"x": 460.73280000000034,
"y": 391.6895999999998
}
}
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment