History

addressing code review feedback

Dante Ruiz committed 8 years ago

Commit f6644211 parent 501746b10 files · +155 −147Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+9−1
@@ -56,8 +56,16 @@ unsigned int PointerScriptingInterface::createPointer(const PickQuery::PickType& · 55 unmodified lines
56 * @property {boolean} [hover=false] If this pointer should generate hover events.56 * @property {boolean} [hover=false] If this pointer should generate hover events.
57 * @property {boolean} [enabled=false]57 * @property {boolean} [enabled=false]
58 * @property {Vec3} [tipOffset] The specified offset of the from the joint index.58 * @property {Vec3} [tipOffset] The specified offset of the from the joint index.
59 * @property {object} [model] Data to replace the default model url, positionOffset and rotationOffset.59 * @property {Pointers.StylusPointerProperties.model} [model] Data to replace the default model url, positionOffset and rotationOffset. {@link Pointers.StylusPointerProperties.model}
60 */60 */
61 /**jsdoc
62 * properties defining stylus pick model that can be included to {@link Pointers.StylusPointerProperties}
63 * @typedef {object} Pointers.StylusPointerProperties.model
64 * @property {string} [url] url to the model
65 * @property {Vec3} [dimensions] the dimensions of the model
66 * @property {Vec3} [positionOffset] the position offset of the model from the parent joint index
67 * @property {Vec3} [rotationOffset] the rotation offset of the model from the parent joint index
68 */
61unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) const {69unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) const {
62 QVariantMap propertyMap = properties.toMap();70 QVariantMap propertyMap = properties.toMap();
63 71