interface decides on entityIDs rather than bouncing a temporary id through the entity server

Seth Alves committed 11 years ago

Commit f9d46b01 parent f188078104 files · +490 −1235Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 104 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−2

@@ -319,9 +319,8 @@ void ScriptEngine::init() { · 318 unmodified lines
319	registerAudioMetaTypes(this);	319	registerAudioMetaTypes(this);
320		320
321	qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);	321	qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
322	qScriptRegisterMetaType(this, EntityItemIDtoScriptValue, EntityItemIDfromScriptValue);
323	qScriptRegisterMetaType(this, RayToEntityIntersectionResultToScriptValue, RayToEntityIntersectionResultFromScriptValue);	322	qScriptRegisterMetaType(this, RayToEntityIntersectionResultToScriptValue, RayToEntityIntersectionResultFromScriptValue);
324	qScriptRegisterSequenceMetaType<QVector<EntityItemID> >(this);	323	qScriptRegisterSequenceMetaType<QVector<QUuid> >(this);
325		324
326	qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(this);	325	qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(this);
327	qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);	326	qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);