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

fix a bug where x was only attribute being copied for vec3s WHT

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-21 16:40:03 -08:00
parent 90c841ff01
commit eb1e72b838
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/editParticleExample.js
View file

@ -11,9 +11,9 @@
var count = 0;
var originalProperties = {
position: { x: 1/TREE_SCALE,
position: { x: 10/TREE_SCALE,
y: 0/TREE_SCALE,
z: 1/TREE_SCALE },
z: 0/TREE_SCALE },
velocity: { x: 0,
y: 0,
@ -32,7 +32,7 @@ var originalProperties = {
};
var positionDelta = { x: 0.5/TREE_SCALE, y: 0, z: 0 };
var positionDelta = { x: 0.1/TREE_SCALE, y: 0, z: 0 };
var particleID = Particles.addParticle(originalProperties);
@ -74,7 +74,7 @@ function moveParticle() {
//print("particleID = " + particleID);
print("newProperties.position.x = " + newProperties.position.x);
print("newProperties.position = " + newProperties.position.x + "," + newProperties.position.y+ "," + newProperties.position.z);
Particles.editParticle(particleID, newProperties);

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

@ -935,8 +935,8 @@ void ParticleProperties::copyFromScriptValue(const QScriptValue &object) {
if (x.isValid() && y.isValid() && z.isValid()) {
glm::vec3 newPosition;
newPosition.x = x.toVariant().toFloat();
newPosition.y = x.toVariant().toFloat();
newPosition.z = x.toVariant().toFloat();
newPosition.y = y.toVariant().toFloat();
newPosition.z = z.toVariant().toFloat();
if (newPosition != _position) {
_position = newPosition;
_positionChanged = true;
@ -981,8 +981,8 @@ void ParticleProperties::copyFromScriptValue(const QScriptValue &object) {
if (x.isValid() && y.isValid() && z.isValid()) {
glm::vec3 newVelocity;
newVelocity.x = x.toVariant().toFloat();
newVelocity.y = x.toVariant().toFloat();
newVelocity.z = x.toVariant().toFloat();
newVelocity.y = y.toVariant().toFloat();
newVelocity.z = z.toVariant().toFloat();
if (newVelocity != _velocity) {
_velocity = newVelocity;
_velocityChanged = true;
@ -998,8 +998,8 @@ void ParticleProperties::copyFromScriptValue(const QScriptValue &object) {
if (x.isValid() && y.isValid() && z.isValid()) {
glm::vec3 newGravity;
newGravity.x = x.toVariant().toFloat();
newGravity.y = x.toVariant().toFloat();
newGravity.z = x.toVariant().toFloat();
newGravity.y = y.toVariant().toFloat();
newGravity.z = z.toVariant().toFloat();
if (newGravity != _gravity) {
_gravity = newGravity;
_gravityChanged = true;

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

@ -41,12 +41,20 @@ void ParticlesScriptingInterface::editParticle(ParticleID particleID, const Part
// hmmm... we kind of want to bail if someone attempts to edit an unknown
if (actualID == UNKNOWN_PARTICLE_ID) {
qDebug() << "ParticlesScriptingInterface::editParticle()... BAILING!!! particleID.creatorTokenID=" << particleID.creatorTokenID;
return; // bailing early
}
}
particleID.id = actualID;
particleID.isKnownID = true;
qDebug() << "ParticlesScriptingInterface::editParticle()... FOUND IT!!! actualID=" << actualID;
qDebug() << "ParticlesScriptingInterface::editParticle()... properties.getPositon()="
<< properties.getPosition().x << ", "
<< properties.getPosition().y << ", "
<< properties.getPosition().z << "...";
queueParticleMessage(PACKET_TYPE_PARTICLE_ADD_OR_EDIT, particleID, properties);
}