History

Working on JSON parsing and cleanup

Brad Davis committed 11 years ago

Commit bea6fdd1 parent ef6c4f649 files · +1927 −2118Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 49 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+0−25
@@ -167,31 +167,6 @@ void ControllerScriptingInterface::releaseInputController(controller::InputContr · 166 unmodified lines
167167 _inputControllers.erase(input->getKey());
168168 }
169169
170−void ControllerScriptingInterface::update() {
171− static float last = secTimestampNow();
172− float now = secTimestampNow();
173− float delta = now - last;
174− last = now;
175−
176− DependencyManager::get<UserInputMapper>()->update(delta);
177−
178− bool jointsCaptured = false;
179− for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
180− if (inputPlugin->isActive()) {
181− inputPlugin->pluginUpdate(delta, jointsCaptured);
182− if (inputPlugin->isJointController()) {
183− jointsCaptured = true;
184− }
185− }
186− }
187−
188− for (auto entry : _inputControllers) {
189− entry.second->update();
190− }
191−
192− controller::ScriptingInterface::update();
193−}
194−
195170 InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :
196171 _deviceTrackerId(deviceTrackerId),
197172 _subTrackerId(subTrackerId),