From cd115456138cc6182bf80e97553a78874de02b15 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 30 Dec 2013 15:55:46 -0800 Subject: [PATCH] change to setScript() since it does more than update --- libraries/particles/src/Particle.h | 5 +++-- libraries/particles/src/ParticleCollisionSystem.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/particles/src/Particle.h b/libraries/particles/src/Particle.h index 5e0c45d9a9..99a192741a 100644 --- a/libraries/particles/src/Particle.h +++ b/libraries/particles/src/Particle.h @@ -83,7 +83,7 @@ public: float getEditedAgo() const { return (float)(usecTimestampNow() - _lastEdited) / (float)USECS_PER_SECOND; } uint32_t getID() const { return _id; } bool getShouldDie() const { return _shouldDie; } - QString getUpdateScript() const { return _script; } + QString getScript() const { return _script; } uint32_t getCreatorTokenID() const { return _creatorTokenID; } bool isNewlyCreated() const { return _newlyCreated; } @@ -100,7 +100,7 @@ public: void setInHand(bool inHand) { _inHand = inHand; } void setDamping(float value) { _damping = value; } void setShouldDie(bool shouldDie) { _shouldDie = shouldDie; } - void setUpdateScript(QString updateScript) { _script = updateScript; } + void setScript(QString updateScript) { _script = updateScript; } void setCreatorTokenID(uint32_t creatorTokenID) { _creatorTokenID = creatorTokenID; } bool appendParticleData(OctreePacketData* packetData) const; @@ -191,6 +191,7 @@ public slots: void setColor(xColor value) { _particle->setColor(value); } void setRadius(float value) { _particle->setRadius(value); } void setShouldDie(bool value) { _particle->setShouldDie(value); } + void setScript(const QString& script) { _particle->setScript(script); } signals: void update(); diff --git a/libraries/particles/src/ParticleCollisionSystem.cpp b/libraries/particles/src/ParticleCollisionSystem.cpp index c477804325..bde0f6d21a 100644 --- a/libraries/particles/src/ParticleCollisionSystem.cpp +++ b/libraries/particles/src/ParticleCollisionSystem.cpp @@ -227,7 +227,7 @@ void ParticleCollisionSystem::applyHardCollision(Particle* particle, const glm:: ParticleEditHandle particleEditHandle(_packetSender, _particles, particle->getID()); particleEditHandle.updateParticle(position, particle->getRadius(), particle->getXColor(), velocity, - particle->getGravity(), particle->getDamping(), particle->getInHand(), particle->getUpdateScript()); + particle->getGravity(), particle->getDamping(), particle->getInHand(), particle->getScript()); }