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

MaterialX: add support for nodes #11

Merged
Bogdan Nagirniak merged 17 commits from matx-add-other-nodes into matx-export-material 2023-09-06 10:37:26 +02:00
Conversation 0 Commits 17 Files Changed 12 +383 -72
Georgiy Markelov commented 2023-09-05 17:06:33 +02:00
Owner
Copy Link

Purpose

Add support for more nodes

Technical steps

Added support for:

  • Separate, Combine XYZ
  • Separate, Combine Color
  • Vector Math (not all operations)
  • Hue/Saturation/Value
  • Normal Map
  • Brightness/Contrast

Implemented NodeItem::extract()
Fixed BSDF Principled node

### Purpose Add support for more nodes ### Technical steps Added support for: * Separate, Combine XYZ * Separate, Combine Color * Vector Math (not all operations) * Hue/Saturation/Value * Normal Map * Brightness/Contrast Implemented `NodeItem::extract()` Fixed BSDF Principled node
Georgiy Markelov added 13 commits 2023-09-05 17:06:51 +02:00 
Also added NodeItem::to_vector3()
Removed Transmission Roughness and added checks for some inputs
Georgiy Markelov requested review from Brian Savery (AMD) 2023-09-05 17:07:04 +02:00
Georgiy Markelov requested review from Bogdan Nagirniak 2023-09-05 17:07:04 +02:00
Georgiy Markelov requested review from Vasyl Pidhirskyi 2023-09-05 17:07:04 +02:00
Bogdan Nagirniak requested changes 2023-09-05 21:49:15 +02:00
source/blender/nodes/shader/CMakeLists.txt Outdated
@ -148,17 +148,22 @@ if(WITH_MATERIALX)
list(APPEND SRC
materialx/material.cc
materialx/nodes/bsdf_principled.cc
materialx/nodes/hueSatVal.cc
Bogdan Nagirniak commented 2023-09-05 21:31:12 +02:00
Collaborator
Copy Link

hue_sat_val.cc

hue_sat_val.cc
DagerD marked this conversation as resolved
source/blender/nodes/shader/materialx/nodes/node_item.h Outdated
@ -77,2 +77,4 @@
const NodeItem &if_val,
const NodeItem &else_val) const;
NodeItem extract(const int index) const;
NodeItem separate_color(const int index) const;
Bogdan Nagirniak commented 2023-09-05 21:40:01 +02:00
Collaborator
Copy Link

This function isn't implemented and seems not needed

This function isn't implemented and seems not needed
DagerD marked this conversation as resolved
Georgiy Markelov added 1 commit 2023-09-06 01:56:29 +02:00
Georgiy Markelov added 1 commit 2023-09-06 09:09:04 +02:00
Georgiy Markelov added 1 commit 2023-09-06 10:16:04 +02:00
Georgiy Markelov added 1 commit 2023-09-06 10:35:34 +02:00
Bogdan Nagirniak approved these changes 2023-09-06 10:36:46 +02:00
Bogdan Nagirniak merged commit bbc3b2614a into matx-export-material 2023-09-06 10:37:26 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Brian Savery (AMD)
Vasyl Pidhirskyi
Bogdan Nagirniak
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: DagerD/blender#11
No description provided.
Delete Branch "matx-add-other-nodes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?