History

first pass creating Qt <-> QtScript interface

Heather Anderson committed 4 years ago

Commit bc6eaf21 parent bd0455463 files · +1707 −294Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 63 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−1
@@ -1690,7 +1690,7 @@ ScriptValue RayToEntityIntersectionResultToScriptValue(ScriptEngine* engine, con · 1689 unmodified lines
16901690 return obj;
16911691 }
16921692
1693−void RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, RayToEntityIntersectionResult& value) {
1693+bool RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, RayToEntityIntersectionResult& value) {
16941694 value.intersects = object.property("intersects").toVariant().toBool();
16951695 value.accurate = object.property("accurate").toVariant().toBool();
16961696 ScriptValue entityIDValue = object.property("entityID");
@@ -1707,6 +1707,7 @@ void RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, Ray · 10 unmodified lines
17071707 vec3FromScriptValue(surfaceNormal, value.surfaceNormal);
17081708 }
17091709 value.extraInfo = object.property("extraInfo").toVariant().toMap();
1710+ return true;
17101711 }
17111712
17121713 bool EntityScriptingInterface::polyVoxWorker(QUuid entityID, std::function<bool(PolyVoxEntityItem&)> actor) {

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