History

Cleanup entity dependencies

Brad Davis committed 9 years ago

Commit 8130a911 parent 20f713a40 files · +391 −438Browse files

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

Unified · Split

libraries/script-engine/src/ModelScriptingInterface.cpp+6−6
@@ -9,17 +9,17 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include "ModelScriptingInterface.h"
12#include <QScriptEngine>13#include <QScriptEngine>
13#include <QScriptValueIterator>14#include <QScriptValueIterator>
14#include <QtScript/QScriptValue>15#include <QtScript/QScriptValue>
15#include <model-networking/MeshFace.h>16#include <model-networking/SimpleMeshProxy.h>
16#include "ScriptEngine.h"17#include "ScriptEngine.h"
17#include "ScriptEngineLogging.h"18#include "ScriptEngineLogging.h"
18#include "ModelScriptingInterface.h"
19#include "OBJWriter.h"19#include "OBJWriter.h"
20 20
21ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {21ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
22 _modelScriptEngine = qobject_cast<ScriptEngine*>(parent);22 _modelScriptEngine = qobject_cast<QScriptEngine*>(parent);
23 23
24 qScriptRegisterSequenceMetaType<QList<MeshProxy*>>(_modelScriptEngine);24 qScriptRegisterSequenceMetaType<QList<MeshProxy*>>(_modelScriptEngine);
25 qScriptRegisterMetaType(_modelScriptEngine, meshFaceToScriptValue, meshFaceFromScriptValue);25 qScriptRegisterMetaType(_modelScriptEngine, meshFaceToScriptValue, meshFaceFromScriptValue);
@@ -118,7 +118,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) { · 92 unmodified lines
118 (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));118 (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
119 119
120 120
121 MeshProxy* resultProxy = new MeshProxy(result);121 MeshProxy* resultProxy = new SimpleMeshProxy(result);
122 return meshToScriptValue(_modelScriptEngine, resultProxy);122 return meshToScriptValue(_modelScriptEngine, resultProxy);
123}123}
124 124
@@ -134,7 +134,7 @@ QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshPro · 9 unmodified lines
134 model::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },134 model::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
135 [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },135 [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
136 [&](uint32_t index){ return index; });136 [&](uint32_t index){ return index; });
137 MeshProxy* resultProxy = new MeshProxy(result);137 MeshProxy* resultProxy = new SimpleMeshProxy(result);
138 return meshToScriptValue(_modelScriptEngine, resultProxy);138 return meshToScriptValue(_modelScriptEngine, resultProxy);
139}139}
140 140
@@ -188,6 +188,6 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices · 47 unmodified lines
188 188
189 189
190 190
191 MeshProxy* meshProxy = new MeshProxy(mesh);191 MeshProxy* meshProxy = new SimpleMeshProxy(mesh);
192 return meshToScriptValue(_modelScriptEngine, meshProxy);192 return meshToScriptValue(_modelScriptEngine, meshProxy);
193}193}