--Render skinning with PBR shader #2204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
the
CLA Signed
jturner65
force-pushed
the
PBR_SkinRendering
branch
from
e1f6f22
to
309f886
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
7 times, most recently
from
965fa47
to
00be243
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
8 times, most recently
from
8bc3ff1
to
5c0af5a
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
2 times, most recently
from
96f23e6
to
21081c3
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
2 times, most recently
from
ec12341
to
83c789a
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
from
83c789a
to
d317f5c
Compare
jturner65
force-pushed
the
PBR_SkinRendering
branch
2 times, most recently
from
c624ff9
to
17d2224
Compare
jturner65
changed the title
jturner65
force-pushed
the
PBR_SkinRendering
branch
from
47eccb8
to
c88e64b
Compare
0mdc
reviewed
Nov 19, 2023
| {Mn::Trade::MaterialAttribute::Shininess, 80.0f}}}; | ||
| return materialData; | ||
| } // ResourceManager::buildDefaultPhongMaterial | ||
|
|
| jointCount_, perVertexJointCount_, secondaryPerVertexJointCount_ | ||
| #ifndef MAGNUM_TARGET_WEBGL | ||
| , | ||
| ("mat4(1.0), "_s * jointCount_).exceptSuffix(2) |
There was a problem hiding this comment.
I'm not sure that I understand what's going on here. Could you add a comment above?
| @@ -25,8 +25,8 @@ ArticulatedObjectAttributes::ArticulatedObjectAttributes( | |||
| // Set render mode to be default - skin if present, otherwise link | |||
| // meshes/primitives | |||
| setRenderMode(getAORenderModeName(ArticulatedObjectRenderMode::Default)); | |||
| // Set default to be to use Phong shader | |||
| setShaderType(getShaderTypeName(ObjectInstanceShaderType::Phong)); | |||
| // Set default to be to use the best shader for the material | |||
--override assetInfo defaults that force flat and shadertype==flat --address missing shader uniforms.
--loading a scene might change simconfig values - ground truth simconfig is in MM and simulator always.
-- we no longer force skins to be flat/unlit.
jturner65
force-pushed
the
PBR_SkinRendering
branch
from
c88e64b
to
94162e8
Compare
0mdc
approved these changes
Nov 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
This PR adds the capability of rendering skinned meshes using the PBR shader, making changes to the PBR vertex and fragment shaders to support the functionality, along with the loading pipeline. This PR is subsequent to this PR which promoted all the skin handling done by the drawables to the base Drawable class to make it available to both Generic(Phong/Flat) and PBR drawables.
Support of the various skin-related quantities used by the shader is being added in the PBRShader class, and the correct processing of these quantities by pbr.vert is also being added, using Magnum's Flat and Phong shaders' handling of skinning as a guide.
This PR also modifies viewer.cpp functionality to be more flexible and accept either urdf or ao_config.json files to load an Articulated Object.
Here's an example of some results on humanoid
female_3.glbSince we're generating normals in the PBR shader already, no more tessellation artifacts and poly outlines.
...compared to flat rendered
Here's some interesting modifications I made in engine using some functionality I've been working on.
How Has This Been Tested
All c++ and python tests pass *
*(Had to modify existing test since we no longer force skins to be unlit. New test images are included in this PR)
Types of changes
Checklist