History

change Model api in anticipation of more than just PolyVox being able to give meshes to javascript

Seth Alves committed 9 years ago

Commit ce9bb431 parent b5786be10 files · +52 −59Browse files

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

Unified · Split

libraries/script-engine/src/ModelScriptingInterface.h+1−7
@@ -17,7 +17,7 @@ · 16 unmodified lines
17#include <QScriptValue>17#include <QScriptValue>
18#include <OBJWriter.h>18#include <OBJWriter.h>
19#include <model/Geometry.h>19#include <model/Geometry.h>
20#include "MeshProxy.h"20#include <model/MeshProxy.h>
21 21
22using MeshPointer = std::shared_ptr<model::Mesh>;22using MeshPointer = std::shared_ptr<model::Mesh>;
23class ScriptEngine;23class ScriptEngine;
@@ -36,10 +36,4 @@ private: · 12 unmodified lines
36 ScriptEngine* _modelScriptEngine { nullptr };36 ScriptEngine* _modelScriptEngine { nullptr };
37};37};
38 38
39QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in);
40void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out);
41
42QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in);
43void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out);
44
45#endif // hifi_ModelScriptingInterface_h39#endif // hifi_ModelScriptingInterface_h

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