History

cleanup test toy ball throwing code

Philip Rosedale committed 12 years ago

Commit 2d72bea1 parent bad5d823 files · +66 −44Browse files

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

Unified · Split

interface/src/Application.cpp+5−5
@@ -1498,14 +1498,14 @@ void Application::shootParticle() { · 1497 unmodified lines
1498 1498
1499 glm::vec3 position = _viewFrustum.getPosition();1499 glm::vec3 position = _viewFrustum.getPosition();
1500 glm::vec3 direction = _viewFrustum.getDirection();1500 glm::vec3 direction = _viewFrustum.getDirection();
1501 const float LINEAR_VELOCITY = 30.0f;1501 const float LINEAR_VELOCITY = 5.f;
1502 glm::vec3 lookingAt = position + (direction * LINEAR_VELOCITY);1502 glm::vec3 lookingAt = position + (direction * LINEAR_VELOCITY);
1503 1503
1504 const float radius = 0.5 / TREE_SCALE;1504 const float radius = 0.125 / TREE_SCALE;
1505 xColor color = { 255, 0, 0};1505 xColor color = { 0, 255, 255};
1506 glm::vec3 velocity = lookingAt - position;1506 glm::vec3 velocity = lookingAt - position;
1507 glm::vec3 gravity = DEFAULT_GRAVITY;1507 glm::vec3 gravity = DEFAULT_GRAVITY * 0.f;
1508 float damping = DEFAULT_DAMPING;1508 float damping = DEFAULT_DAMPING * 0.01f;
1509 QString updateScript("");1509 QString updateScript("");
1510 1510
1511 makeParticle(position / (float)TREE_SCALE, radius, color, 1511 makeParticle(position / (float)TREE_SCALE, radius, color,

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