History

Merge branch 'master' into stt_parenting2

sabrina-shanman committed 8 years ago

Commit 2ef85df2 parents 67dc526 4805d3573 files · +3173 −1221Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+2−1
@@ -220,6 +220,7 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 219 unmodified lines
220* @property {number} alpha=1.0 The alpha of the parabola.220* @property {number} alpha=1.0 The alpha of the parabola.
221* @property {number} width=0.01 The width of the parabola, in meters.221* @property {number} width=0.01 The width of the parabola, in meters.
222* @property {boolean} isVisibleInSecondaryCamera=false The width of the parabola, in meters.222* @property {boolean} isVisibleInSecondaryCamera=false The width of the parabola, in meters.
223* @property {boolean} drawInFront=false If <code>true</code>, the parabola is rendered in front of other items in the scene.
223*/224*/
224/**jsdoc225/**jsdoc
225* A set of properties used to define the visual aspect of a Parabola Pointer in the case that the Pointer is not intersecting something. Same as a {@link Pointers.ParabolaPointerRenderState},226* A set of properties used to define the visual aspect of a Parabola Pointer in the case that the Pointer is not intersecting something. Same as a {@link Pointers.ParabolaPointerRenderState},
@@ -397,4 +398,4 @@ QVariantMap PointerScriptingInterface::getPrevPickResult(unsigned int uid) const · 171 unmodified lines
397 398
398QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const {399QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const {
399 return DependencyManager::get<PointerManager>()->getPointerProperties(uid);400 return DependencyManager::get<PointerManager>()->getPointerProperties(uid);
400}401}