Addressing merge conflict in HighlightEffect.cpp

sam gateau committed 8 years ago

Commit 09dae5a2 parents efa1dd0 c1dc0ff43 files · +684 −223Browse files

Showing the changes to libraries/render-utils/src/HighlightEffect.cpp (1 of 43 files). Show all

Unified · Split

libraries/render-utils/src/HighlightEffect.cpp+24−18

 #define OUTLINE_STENCIL_MASK    1
+extern void initZPassPipelines(ShapePlumber& plumber, gpu::StatePointer state);
 HighlightRessources::HighlightRessources() {
 }
             auto maskPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder);
             auto maskSkinnedPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned());
+            auto maskSkinnedDQPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned().withDualQuatSkinned());
             // Setup camera, projection and viewport for all items
             batch.setViewportTransform(args->_viewport);
             batch.setProjectionJitter(jitter.x, jitter.y);
             batch.setViewTransform(viewMat);
-            std::vector<ShapeKey> skinnedShapeKeys{};
+            std::vector<ShapeKey> skinnedShapeKeys;
+            std::vector<ShapeKey> skinnedDQShapeKeys;
             // Iterate through all inShapes and render the unskinned
             args->_shapePipeline = maskPipeline;
             batch.setPipeline(maskPipeline->pipeline);
             for (const auto& items : inShapes) {
                 itemBounds.insert(itemBounds.end(), items.second.begin(), items.second.end());
-                if (items.first.isSkinned()) {
+                if (items.first.isSkinned() && items.first.isDualQuatSkinned()) {
+                    skinnedDQShapeKeys.push_back(items.first);
+                } else if (items.first.isSkinned()) {
                     skinnedShapeKeys.push_back(items.first);
                 } else {
                     renderItems(renderContext, items.second);
             }
             // Reiterate to render the skinned
-            args->_shapePipeline = maskSkinnedPipeline;
+            if (skinnedShapeKeys.size() > 0) {
-            batch.setPipeline(maskSkinnedPipeline->pipeline);
+                args->_shapePipeline = maskSkinnedPipeline;
-            for (const auto& key : skinnedShapeKeys) {
+                batch.setPipeline(maskSkinnedPipeline->pipeline);
-                renderItems(renderContext, inShapes.at(key));
+                for (const auto& key : skinnedShapeKeys) {
+                    renderItems(renderContext, inShapes.at(key));
+                }
+            }
+            // Reiterate to render the DQ skinned
+            if (skinnedDQShapeKeys.size() > 0) {
+                args->_shapePipeline = maskSkinnedDQPipeline;
+                batch.setPipeline(maskSkinnedDQPipeline->pipeline);
+                for (const auto& key : skinnedDQShapeKeys) {
+                    renderItems(renderContext, inShapes.at(key));
+                }
             }
             args->_shapePipeline = nullptr;
         state->setDepthTest(true, true, gpu::LESS_EQUAL);
         state->setColorWriteMask(false, false, false, false);
-        initMaskPipelines(*shapePlumber, state);
+        initZPassPipelines(*shapePlumber, state);
     }
     auto sharedParameters = std::make_shared<HighlightSharedParameters>();
     return task.addJob<SelectItems>("TransparentSelection", selectItemInput);
 }
-void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gpu::StatePointer state) {
-    gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(shader::render_utils::program::model_shadow);
-    shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withoutSkinned(),
-        modelProgram, state);
-    gpu::ShaderPointer deformedProgram = gpu::Shader::createProgram(shader::render_utils::program::deformed_model_shadow);
-    shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned(),
-        deformedProgram, state);
-}