History

initial code review

SamGondelman committed 9 years ago

Commit 55a025b1 parent 298faa910 files · +55 −63Browse files

Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 10 files). Show all

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+2−7
@@ -17,11 +17,6 @@ · 16 unmodified lines
1717
1818 #include "Application.h"
1919
20−LaserPointerScriptingInterface* LaserPointerScriptingInterface::getInstance() {
21− static LaserPointerScriptingInterface instance;
22− return &instance;
23−}
24−
2520 uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& properties) {
2621 QVariantMap propertyMap = properties.toMap();
2722
@@ -104,7 +99,7 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 76 unmodified lines
10499 dirOffset = vec3FromVariant(propertyMap["dirOffset"]);
105100 }
106101
107− return LaserPointerManager::getInstance().createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
102+ return DependencyManager::get<LaserPointerManager>()->createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
108103 } else if (propertyMap["position"].isValid()) {
109104 glm::vec3 position = vec3FromVariant(propertyMap["position"]);
110105
@@ -113,7 +108,7 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 2 unmodified lines
113108 direction = vec3FromVariant(propertyMap["direction"]);
114109 }
115110
116− return LaserPointerManager::getInstance().createLaserPointer(position, direction, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
111+ return DependencyManager::get<LaserPointerManager>()->createLaserPointer(position, direction, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled);
117112 }
118113
119114 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t