History

Add Collision metatype to JS script system

Andrew Meadows committed 12 years ago

Commit d9025801 parent 5e2b8bb11 files · +81 −45Browse files

Showing the changes to libraries/shared/src/RegisteredMetaTypes.cpp (1 of 11 files). Show all

Unified · Split

libraries/shared/src/RegisteredMetaTypes.cpp+13−0
@@ -16,6 +16,7 @@ static int vec2MetaTypeId = qRegisterMetaType<glm::vec2>(); · 15 unmodified lines
1616 static int quatMetaTypeId = qRegisterMetaType<glm::quat>();
1717 static int xColorMetaTypeId = qRegisterMetaType<xColor>();
1818 static int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
19+static int collisionMetaTypeId = qRegisterMetaType<CollisionInfo>();
1920
2021 void registerMetaTypes(QScriptEngine* engine) {
2122 qScriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue);
@@ -24,6 +25,7 @@ void registerMetaTypes(QScriptEngine* engine) { · 2 unmodified lines
2425 qScriptRegisterMetaType(engine, quatToScriptValue, quatFromScriptValue);
2526 qScriptRegisterMetaType(engine, xColorToScriptValue, xColorFromScriptValue);
2627 qScriptRegisterMetaType(engine, pickRayToScriptValue, pickRayFromScriptValue);
28+ qScriptRegisterMetaType(engine, collisionToScriptValue, collisionFromScriptValue);
2729 }
2830
2931 QScriptValue vec4toScriptValue(QScriptEngine* engine, const glm::vec4& vec4) {
@@ -122,3 +124,14 @@ void pickRayFromScriptValue(const QScriptValue& object, PickRay& pickRay) { · 92 unmodified lines
122124 }
123125 }
124126
127+QScriptValue collisionToScriptValue(QScriptEngine* engine, const CollisionInfo& collision) {
128+ QScriptValue obj = engine->newObject();
129+ obj.setProperty("penetration", vec3toScriptValue(engine, collision._penetration));
130+ obj.setProperty("contactPoint", vec3toScriptValue(engine, collision._contactPoint));
131+ return obj;
132+}
133+
134+void collisionFromScriptValue(const QScriptValue &object, CollisionInfo& collision) {
135+ // TODO: implement this when we know what it means to accept collision events from JS
136+}
137+

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