Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 11:29:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move Vec2 and Vec4 JSDoc

Browse source
This commit is contained in:
David Rowe 2018-04-20 12:47:53 +12:00
parent 11f509e57a
commit 0a7cccc3f7
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/script-engine/src/Vec3.h
View file

@ -21,14 +21,6 @@
#include "GLMHelpers.h"
/**jsdoc
* A 2-dimensional vector.
*
* @typedef {object} Vec2
* @property {number} x - X-coordinate of the vector.
* @property {number} y - Y-coordinate of the vector.
*/
/**jsdoc
* A 3-dimensional vector.
*
@ -38,16 +30,6 @@
* @property {number} z - Z-coordinate of the vector.
*/
/**jsdoc
* A 4-dimensional vector.
*
* @typedef {object} Vec4
* @property {number} x - X-coordinate of the vector.
* @property {number} y - Y-coordinate of the vector.
* @property {number} z - Z-coordinate of the vector.
* @property {number} w - W-coordinate of the vector.
*/
/**jsdoc
* A color vector.
*

16
libraries/shared/src/RegisteredMetaTypes.h
View file

@ -44,6 +44,15 @@ void registerMetaTypes(QScriptEngine* engine);
QScriptValue mat4toScriptValue(QScriptEngine* engine, const glm::mat4& mat4);
void mat4FromScriptValue(const QScriptValue& object, glm::mat4& mat4);
/**jsdoc
* A 4-dimensional vector.
*
* @typedef {object} Vec4
* @property {number} x - X-coordinate of the vector.
* @property {number} y - Y-coordinate of the vector.
* @property {number} z - Z-coordinate of the vector.
* @property {number} w - W-coordinate of the vector.
*/
// Vec4
QScriptValue vec4toScriptValue(QScriptEngine* engine, const glm::vec4& vec4);
void vec4FromScriptValue(const QScriptValue& object, glm::vec4& vec4);
@ -59,6 +68,13 @@ QVariant vec3toVariant(const glm::vec3& vec3);
glm::vec3 vec3FromVariant(const QVariant &object, bool& valid);
glm::vec3 vec3FromVariant(const QVariant &object);
/**jsdoc
* A 2-dimensional vector.
*
* @typedef {object} Vec2
* @property {number} x - X-coordinate of the vector.
* @property {number} y - Y-coordinate of the vector.
*/
// Vec2
QScriptValue vec2toScriptValue(QScriptEngine* engine, const glm::vec2 &vec2);
void vec2FromScriptValue(const QScriptValue &object, glm::vec2 &vec2);