History

make shootParticle() work better

ZappoMan committed 12 years ago

Commit 03e892d1 parent ae1576b2 files · +12 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+11−4
@@ -1485,9 +1485,10 @@ void Application::removeVoxel(glm::vec3 position, · 1484 unmodified lines
14851485
14861486 void Application::shootParticle() {
14871487
1488− glm::vec3 position = _viewFrustum.getOffsetPosition();
1489− glm::vec3 direction = _viewFrustum.getOffsetDirection();
1490− glm::vec3 lookingAt = position + (direction * 0.2f);
1488+ glm::vec3 position = _viewFrustum.getPosition();
1489+ glm::vec3 direction = _viewFrustum.getDirection();
1490+ const float LINEAR_VELOCITY = 30.0f;
1491+ glm::vec3 lookingAt = position + (direction * LINEAR_VELOCITY);
14911492
14921493 const float radius = 0.5 / TREE_SCALE;
14931494 xColor color = { 255, 0, 0};
@@ -1495,7 +1496,10 @@ void Application::shootParticle() { · 1 unmodified line
14951496 glm::vec3 gravity = DEFAULT_GRAVITY;
14961497 float damping = DEFAULT_DAMPING;
14971498 QString updateScript("");
1498− makeParticle(position, radius, color, velocity, gravity, damping, updateScript);
1499+
1500+ makeParticle(position / (float)TREE_SCALE, radius, color,
1501+ velocity / (float)TREE_SCALE, gravity, damping, updateScript);
1502+
14991503 }
15001504
15011505 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 · 5 unmodified lines
15071511
15081512 // queue the packet
15091513 _particleEditSender.queueParticleEditMessages(PACKET_TYPE_PARTICLE_ADD, 1, &addParticleDetail);
1514+
1515+ // release them
1516+ _particleEditSender.releaseQueuedMessages();
15101517 }
15111518
15121519

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t