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

Move the MaterialX export code into the existing shader node files #18

Merged
Bogdan Nagirniak merged 14 commits from BogdanNagirniak/blender:matx-move-code into matx-export-material 2023-09-12 13:55:27 +02:00
Conversation 0 Commits 14 Files Changed 77 +1321 -1919
Bogdan Nagirniak commented 2023-09-12 10:44:21 +02:00
Collaborator
Copy Link

Purpose

Due to review suggestions, MaterialX export code should be moved to existing node files.

Technical steps

  1. Added bNodeType::materialx_fn function pointer.
  2. Created special macroses NODE_SHADER_MATERIALX_BEGIN, NODE_SHADER_MATERIALX_END for including MaterialX export code into node_shader_<name>.cc files.
  3. Removed ShaderNodeParser as not needed, just NodeParser can be used. Adjusted get_input_link() to work with shader types. Made get_input_link() to call materialx_fn.
  4. Moved node_parser.cc/.h, node_item.cc/.h to materialx folder.
  5. Moved MaterialX node export implementation to corresponded node_shader_<name>.cc files. Removed materialx/nodes/... files.
  6. Created DefaultMaterialNodeParser in material.cc.
### Purpose Due to review suggestions, MaterialX export code should be moved to existing node files. ### Technical steps 1. Added `bNodeType::materialx_fn` function pointer. 2. Created special macroses `NODE_SHADER_MATERIALX_BEGIN`, `NODE_SHADER_MATERIALX_END` for including MaterialX export code into `node_shader_<name>.cc` files. 3. Removed `ShaderNodeParser` as not needed, just `NodeParser` can be used. Adjusted `get_input_link()` to work with shader types. Made `get_input_link()` to call `materialx_fn`. 4. Moved `node_parser.cc/.h`, `node_item.cc/.h` to `materialx` folder. 5. Moved MaterialX node export implementation to corresponded `node_shader_<name>.cc` files. Removed `materialx/nodes/...` files. 6. Created `DefaultMaterialNodeParser` in `material.cc`.
Bogdan Nagirniak added 12 commits 2023-09-12 10:44:44 +02:00
Bogdan Nagirniak requested review from Brian Savery (AMD) 2023-09-12 10:44:58 +02:00
Bogdan Nagirniak requested review from Vasyl Pidhirskyi 2023-09-12 10:44:58 +02:00
Georgiy Markelov was assigned by Bogdan Nagirniak 2023-09-12 10:45:07 +02:00
Bogdan Nagirniak self-assigned this 2023-09-12 10:45:07 +02:00
Bogdan Nagirniak added 2 commits 2023-09-12 10:52:14 +02:00
Georgiy Markelov approved these changes 2023-09-12 12:26:39 +02:00
Georgiy Markelov left a comment
Owner
Copy Link

Works fine.

Works fine.
Vasyl Pidhirskyi approved these changes 2023-09-12 13:47:00 +02:00
Vasyl Pidhirskyi left a comment
Collaborator
Copy Link

Works well.

Works well.
Bogdan Nagirniak merged commit 9e483eace3 into matx-export-material 2023-09-12 13:55:27 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Brian Savery (AMD)
Georgiy Markelov
Vasyl Pidhirskyi
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
Georgiy Markelov
Bogdan Nagirniak
3 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#18
No description provided.
Delete Branch "BogdanNagirniak/blender:matx-move-code"

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?