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

add ParticleID class

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-20 09:11:47 -08:00
parent a7fd1e4565
commit ab9e01ce7f
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/particles/src/Particle.cpp
View file

@ -924,7 +924,7 @@ QScriptValue ParticleIDtoScriptValue(QScriptEngine* engine, const ParticleID& id
return obj;
}
void ParticleIDFromScriptValue(const QScriptValue &object, ParticleID& id) {
void ParticleIDfromScriptValue(const QScriptValue &object, ParticleID& id) {
id.id = object.property("id").toVariant().toUInt();
id.creatorTokenID = object.property("creatorTokenID").toVariant().toUInt();
id.isKnownID = object.property("isKnownID").toVariant().toBool();

4
libraries/particles/src/Particle.h
View file

@ -117,8 +117,8 @@ public:
};
Q_DECLARE_METATYPE(ParticleID);
QScriptValue ParticleIDToScriptValue(QScriptEngine* engine, const ParticleID& properties);
void ParticleIDFromScriptValue(const QScriptValue &object, ParticleID& properties);
QScriptValue ParticleIDtoScriptValue(QScriptEngine* engine, const ParticleID& properties);
void ParticleIDfromScriptValue(const QScriptValue &object, ParticleID& properties);

7
libraries/particles/src/ParticlesScriptingInterface.cpp
View file

@ -71,6 +71,13 @@ ParticleID ParticlesScriptingInterface::addParticle(const ParticleProperties& pr
}
void ParticlesScriptingInterface::editParticle(ParticleID particleID, const ParticleProperties& properties) {
// expected behavior...
//
// if !particleID.isKnownID
// try to lookup the particle
// do nothing
// setup a ParticleDetail struct with the data
uint64_t now = usecTimestampNow();

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

@ -100,6 +100,7 @@ void ScriptEngine::init() {
// register meta-type for glm::vec3 conversions
registerMetaTypes(&_engine);
qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
QScriptValue agentValue = _engine.newQObject(this);
_engine.globalObject().setProperty("Agent", agentValue);