History

cleaning compilation warnings and tuning the FBX material mapping pass

samcake committed 10 years ago

Commit 307243d1 parent 2c584f75 files · +31 −15Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+15−1
@@ -217,6 +217,8 @@ void DrawDeferred::run(const SceneContextPointer& sceneContext, const RenderCont · 216 unmodified lines
217 217
218 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {218 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
219 args->_batch = &batch;219 args->_batch = &batch;
220
221 // Setup camera, projection and viewport for all items
220 batch.setViewportTransform(args->_viewport);222 batch.setViewportTransform(args->_viewport);
221 batch.setStateScissorRect(args->_viewport);223 batch.setStateScissorRect(args->_viewport);
222 224
@@ -228,6 +230,9 @@ void DrawDeferred::run(const SceneContextPointer& sceneContext, const RenderCont · 5 unmodified lines
228 batch.setProjectionTransform(projMat);230 batch.setProjectionTransform(projMat);
229 batch.setViewTransform(viewMat);231 batch.setViewTransform(viewMat);
230 232
233 // Setup lighting model for all items;
234 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());
235
231 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);236 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);
232 args->_batch = nullptr;237 args->_batch = nullptr;
233 });238 });
@@ -248,6 +253,8 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 14 unmodified lines
248 253
249 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {254 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
250 args->_batch = &batch;255 args->_batch = &batch;
256
257 // Setup camera, projection and viewport for all items
251 batch.setViewportTransform(args->_viewport);258 batch.setViewportTransform(args->_viewport);
252 batch.setStateScissorRect(args->_viewport);259 batch.setStateScissorRect(args->_viewport);
253 260
@@ -259,6 +266,9 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 5 unmodified lines
259 batch.setProjectionTransform(projMat);266 batch.setProjectionTransform(projMat);
260 batch.setViewTransform(viewMat);267 batch.setViewTransform(viewMat);
261 268
269 // Setup lighting model for all items;
270 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());
271
262 if (_stateSort) {272 if (_stateSort) {
263 renderStateSortShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);273 renderStateSortShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);
264 } else {274 } else {
@@ -315,6 +325,9 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 50 unmodified lines
315 batch.setProjectionTransform(projMat);325 batch.setProjectionTransform(projMat);
316 batch.setViewTransform(viewMat);326 batch.setViewTransform(viewMat);
317 327
328 // Setup lighting model for all items;
329 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());
330
318 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);331 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn);
319 args->_batch = nullptr;332 args->_batch = nullptr;
320 });333 });
@@ -361,7 +374,8 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const · 40 unmodified lines
361 assert(renderContext->args->hasViewFrustum());374 assert(renderContext->args->hasViewFrustum());
362 375
363 const auto& inItems = inputs.get0();376 const auto& inItems = inputs.get0();
364 const auto& lightingModel = inputs.get1();377 // Not used yet
378 // const auto& lightingModel = inputs.get1();
365 379
366 RenderArgs* args = renderContext->args;380 RenderArgs* args = renderContext->args;
367 doInBatch(args->_context, [&](gpu::Batch& batch) {381 doInBatch(args->_context, [&](gpu::Batch& batch) {