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

make shootParticle() work better

Browse source
This commit is contained in:
ZappoMan 2013-12-10 17:42:55 -08:00
parent ae1576b9f5
commit 03e892d4fd
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Application.cpp
View file

@ -1485,9 +1485,10 @@ void Application::removeVoxel(glm::vec3 position,
void Application::shootParticle() {
glm::vec3 position = _viewFrustum.getOffsetPosition();
glm::vec3 direction = _viewFrustum.getOffsetDirection();
glm::vec3 lookingAt = position + (direction * 0.2f);
glm::vec3 position = _viewFrustum.getPosition();
glm::vec3 direction = _viewFrustum.getDirection();
const float LINEAR_VELOCITY = 30.0f;
glm::vec3 lookingAt = position + (direction * LINEAR_VELOCITY);
const float radius = 0.5 / TREE_SCALE;
xColor color = { 255, 0, 0};
@ -1495,7 +1496,10 @@ void Application::shootParticle() {
glm::vec3 gravity = DEFAULT_GRAVITY;
float damping = DEFAULT_DAMPING;
QString updateScript("");
makeParticle(position, radius, color, velocity, gravity, damping, updateScript);
makeParticle(position / (float)TREE_SCALE, radius, color,
velocity / (float)TREE_SCALE, gravity, damping, updateScript);
}
void Application::makeParticle(glm::vec3 position, float radius, xColor color, glm::vec3 velocity,
@ -1507,6 +1511,9 @@ void Application::makeParticle(glm::vec3 position, float radius, xColor color, g
// queue the packet
_particleEditSender.queueParticleEditMessages(PACKET_TYPE_PARTICLE_ADD, 1, &addParticleDetail);
// release them
_particleEditSender.releaseQueuedMessages();
}

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

@ -43,7 +43,7 @@ void ParticleEditPacketSender::queueParticleEditMessages(PACKET_TYPE type, int n
}
for (int i = 0; i < numberOfDetails; i++) {
// use MAX_PACKET_SIZE since it's static and guarenteed to be larger than _maxPacketSize
// use MAX_PACKET_SIZE since it's static and guaranteed to be larger than _maxPacketSize
static unsigned char bufferOut[MAX_PACKET_SIZE];
int sizeOut = 0;