Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 02:42:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move isAvatar property access to Agent object

Browse source
This commit is contained in:
Stephen Birarda 2014-01-31 14:36:50 -08:00
parent 7a3ce7c89d
commit dd83ff0538
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/Agent.cpp
View file

@ -101,6 +101,9 @@ void Agent::run() {
// give this AvatarData object to the script engine // give this AvatarData object to the script engine
_scriptEngine.setAvatarData(&scriptedAvatar, "Avatar"); _scriptEngine.setAvatarData(&scriptedAvatar, "Avatar");
// register ourselves to the script engine
_scriptEngine.registerGlobalObject("Agent", this);
_scriptEngine.setScriptContents(scriptContents); _scriptEngine.setScriptContents(scriptContents);
_scriptEngine.run(); _scriptEngine.run();

5
assignment-client/src/Agent.h
View file

@ -21,9 +21,14 @@
class Agent : public ThreadedAssignment { class Agent : public ThreadedAssignment {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)
public: public:
Agent(const QByteArray& packet); Agent(const QByteArray& packet);
void setIsAvatar(bool isAvatar) { _scriptEngine.setIsAvatar(isAvatar); }
bool isAvatar() const { return _scriptEngine.isAvatar(); }
public slots: public slots:
void run(); void run();

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -133,7 +133,7 @@ void ScriptEngine::init() {
QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>(); QScriptValue injectionOptionValue = _engine.scriptValueFromQMetaObject<AudioInjectorOptions>();
_engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue); _engine.globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
registerGlobalObject("Agent", this); registerGlobalObject("Script", this);
registerGlobalObject("Audio", &_audioScriptingInterface); registerGlobalObject("Audio", &_audioScriptingInterface);
registerGlobalObject("Controller", _controllerScriptingInterface); registerGlobalObject("Controller", _controllerScriptingInterface);
registerGlobalObject("Data", &_dataServerScriptingInterface); registerGlobalObject("Data", &_dataServerScriptingInterface);

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -31,8 +31,6 @@ const QString NO_SCRIPT("");
class ScriptEngine : public QObject { class ScriptEngine : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)
public: public:
ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false, ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,
const QString& scriptMenuName = QString(""), AbstractMenuInterface* menu = NULL, const QString& scriptMenuName = QString(""), AbstractMenuInterface* menu = NULL,