DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

MaterialX: add color nodes #17

Merged
Bogdan Nagirniak merged 10 commits from matx-add-color-nodes into matx-export-material 2023-09-11 18:57:06 +02:00
Conversation 0 Commits 10 Files Changed 9 +23
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 659f14f25e - Show all commits

1
source/blender/nodes/shader/CMakeLists.txt
View File

@ -160,6 +160,7 @@ if(WITH_MATERIALX)
materialx/nodes/bsdf_translucent.cc
materialx/nodes/bsdf_transparent.cc
materialx/nodes/clamp.cc
materialx/nodes/gamma.cc
materialx/nodes/emission.cc
materialx/nodes/huesatval.cc
materialx/nodes/invert.cc

20
source/blender/nodes/shader/materialx/nodes/gamma.cc Normal file
View File

@ -0,0 +1,20 @@
/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "node_parser.h"
namespace blender::nodes::materialx {
NodeItem GammaNodeParser::compute()
{
NodeItem color = get_input_value("Color", NodeItem::Type::Color3);
Bogdan Nagirniak commented 2023-09-11 16:41:17 +02:00
Outdated
Review
Copy Link

Color4 ?

Color4 ?
NodeItem gamma = get_input_value("Gamma", NodeItem::Type::Float);
NodeItem res = create_node("power", NodeItem::Type::Color3);
res.set_input("in1", color);
res.set_input("in2", gamma);
Bogdan Nagirniak commented 2023-09-11 16:41:39 +02:00
Review
Copy Link

color ^ gamma

color ^ gamma
return res;
}
} // namespace blender::nodes::materialx

1
source/blender/nodes/shader/materialx/nodes/node_parser.cc
View File

@ -152,6 +152,7 @@ NodeItem NodeParser::get_input_link(const bNodeSocket &socket, NodeItem::Type to
CASE_NODE_TYPE(SH_NODE_BLACKBODY, BlackbodyNodeParser)
CASE_NODE_TYPE(SH_NODE_BRIGHTCONTRAST, BrightContrastNodeParser)
CASE_NODE_TYPE(SH_NODE_CLAMP, ClampNodeParser)
CASE_NODE_TYPE(SH_NODE_GAMMA, GammaNodeParser)
CASE_NODE_TYPE(SH_NODE_COMBINE_COLOR, CombineColorNodeParser)
CASE_NODE_TYPE(SH_NODE_COMBXYZ, CombineXYZNodeParser)
CASE_NODE_TYPE(SH_NODE_HUE_SAT, HueSatValNodeParser)

1
source/blender/nodes/shader/materialx/nodes/node_parser.h
View File

@ -96,6 +96,7 @@ DECLARE_NODE_PARSER(BrightContrastNodeParser)
DECLARE_NODE_PARSER(ClampNodeParser)
DECLARE_NODE_PARSER(CombineColorNodeParser)
DECLARE_NODE_PARSER(CombineXYZNodeParser)
DECLARE_NODE_PARSER(GammaNodeParser)
DECLARE_NODE_PARSER(HueSatValNodeParser)
DECLARE_NODE_PARSER(InvertNodeParser)
DECLARE_NODE_PARSER(MapRangeNodeParser)