|
5 | 5 | */ |
6 | 6 |
|
7 | 7 | #include <ranges> |
| 8 | +#include <string> |
8 | 9 |
|
9 | 10 | #include <OvCore/ECS/Components/CMaterialRenderer.h> |
| 11 | +#include <OvCore/ECS/Components/CSkinnedMeshRenderer.h> |
10 | 12 | #include <OvCore/Rendering/EngineDrawableDescriptor.h> |
11 | 13 | #include <OvCore/Rendering/FramebufferUtil.h> |
| 14 | +#include <OvCore/Rendering/SkinningUtils.h> |
12 | 15 |
|
13 | 16 | #include <OvEditor/Core/EditorActions.h> |
14 | 17 | #include <OvEditor/Rendering/DebugModelRenderFeature.h> |
|
20 | 23 |
|
21 | 24 | namespace |
22 | 25 | { |
| 26 | + const std::string kPickingPassName = "PICKING_PASS"; |
| 27 | + |
23 | 28 | void PreparePickingMaterial( |
24 | 29 | const OvCore::ECS::Actor& p_actor, |
25 | 30 | OvRendering::Data::Material& p_material, |
@@ -161,30 +166,42 @@ void OvEditor::Rendering::PickingRenderPass::DrawPickableModels( |
161 | 166 | auto drawPickableModels = [&](auto drawables) { |
162 | 167 | for (auto& drawable : drawables) |
163 | 168 | { |
164 | | - const std::string pickingPassName = "PICKING_PASS"; |
| 169 | + const auto& actor = drawable.template GetDescriptor<OvCore::Rendering::SceneRenderer::SceneDrawableDescriptor>().actor; |
| 170 | + const auto skinnedRenderer = actor.GetComponent<OvCore::ECS::Components::CSkinnedMeshRenderer>(); |
| 171 | + const bool hasSkinning = OvCore::Rendering::SkinningUtils::IsSkinningActive(skinnedRenderer); |
| 172 | + |
| 173 | + if (hasSkinning) |
| 174 | + { |
| 175 | + auto& targetMaterial = m_actorPickingFallbackMaterial; |
| 176 | + |
| 177 | + PreparePickingMaterial(actor, targetMaterial); |
| 178 | + |
| 179 | + OvRendering::Entities::Drawable finalDrawable = drawable; |
| 180 | + finalDrawable.material = &targetMaterial; |
| 181 | + finalDrawable.stateMask = targetMaterial.GenerateStateMask(); |
| 182 | + finalDrawable.stateMask.frontfaceCulling = false; |
| 183 | + finalDrawable.stateMask.backfaceCulling = false; |
| 184 | + finalDrawable.pass = kPickingPassName; |
| 185 | + |
| 186 | + OvCore::Rendering::SkinningUtils::ApplyToDrawable(finalDrawable, *skinnedRenderer, &targetMaterial.GetFeatures()); |
| 187 | + m_renderer.DrawEntity(p_pso, finalDrawable); |
| 188 | + continue; |
| 189 | + } |
165 | 190 |
|
166 | | - // If the material has picking pass, use it, otherwise use the picking fallback material |
167 | 191 | auto& targetMaterial = |
168 | | - (drawable.material && drawable.material->IsValid() && drawable.material->HasPass(pickingPassName)) ? |
| 192 | + drawable.material && |
| 193 | + drawable.material->IsValid() && |
| 194 | + drawable.material->HasPass(kPickingPassName) ? |
169 | 195 | drawable.material.value() : |
170 | 196 | m_actorPickingFallbackMaterial; |
171 | 197 |
|
172 | | - const auto& actor = drawable.template GetDescriptor<OvCore::Rendering::SceneRenderer::SceneDrawableDescriptor>().actor; |
173 | | - |
174 | 198 | PreparePickingMaterial(actor, targetMaterial); |
175 | 199 |
|
176 | | - // Prioritize using the actual material state mask. |
177 | | - auto stateMask = |
178 | | - drawable.material && drawable.material->IsValid() ? |
179 | | - drawable.material->GenerateStateMask() : |
180 | | - targetMaterial.GenerateStateMask(); |
181 | | - |
182 | 200 | OvRendering::Entities::Drawable finalDrawable = drawable; |
183 | | - finalDrawable.material = targetMaterial; |
184 | | - finalDrawable.stateMask = stateMask; |
185 | | - finalDrawable.stateMask.frontfaceCulling = false; |
186 | | - finalDrawable.stateMask.backfaceCulling = false; |
187 | | - finalDrawable.pass = pickingPassName; |
| 201 | + finalDrawable.material = &targetMaterial; |
| 202 | + finalDrawable.stateMask = targetMaterial.GenerateStateMask(); |
| 203 | + finalDrawable.pass = kPickingPassName; |
| 204 | + finalDrawable.featureSetOverride = std::nullopt; |
188 | 205 |
|
189 | 206 | m_renderer.DrawEntity(p_pso, finalDrawable); |
190 | 207 | } |
|
0 commit comments