History

address Sam's concerns

Brad Hefta-Gaub committed 11 years ago

Commit 9a0e5b91 parent 62c1e4013 files · +29 −68Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp (1 of 13 files). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp+1−2
@@ -16,7 +16,6 @@ · 15 unmodified lines
16#include "GeometryCache.h"16#include "GeometryCache.h"
17#include <gpu/Batch.h>17#include <gpu/Batch.h>
18#include <gpu/Context.h>18#include <gpu/Context.h>
19#include <gpu/DoInBatch.h>
20#include <DeferredLightingEffect.h>19#include <DeferredLightingEffect.h>
21#include <display-plugins/openvr/OpenVrHelpers.h>20#include <display-plugins/openvr/OpenVrHelpers.h>
22#include "NumericalConstants.h"21#include "NumericalConstants.h"
@@ -174,7 +173,7 @@ void ViveControllerManager::updateRendering(RenderArgs* args, render::ScenePoint · 151 unmodified lines
174 UserInputMapper::PoseValue leftHand = _poseStateMap[makeInput(JointChannel::LEFT_HAND).getChannel()];173 UserInputMapper::PoseValue leftHand = _poseStateMap[makeInput(JointChannel::LEFT_HAND).getChannel()];
175 UserInputMapper::PoseValue rightHand = _poseStateMap[makeInput(JointChannel::RIGHT_HAND).getChannel()];174 UserInputMapper::PoseValue rightHand = _poseStateMap[makeInput(JointChannel::RIGHT_HAND).getChannel()];
176 175
177 doInBatch(args, [=](gpu::Batch& batch) {176 doInBatch(args->_context, [=](gpu::Batch& batch) {
178 auto geometryCache = DependencyManager::get<GeometryCache>();177 auto geometryCache = DependencyManager::get<GeometryCache>();
179 geometryCache->useSimpleDrawPipeline(batch);178 geometryCache->useSimpleDrawPipeline(batch);
180 DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch, true);179 DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch, true);