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
14981498
14991499 glm::vec3 position = _viewFrustum.getPosition();
15001500 glm::vec3 direction = _viewFrustum.getDirection();
1501− const float LINEAR_VELOCITY = 30.0f;
1501+ const float LINEAR_VELOCITY = 5.f;
15021502 glm::vec3 lookingAt = position + (direction * LINEAR_VELOCITY);
15031503
1504− const float radius = 0.5 / TREE_SCALE;
1505− xColor color = { 255, 0, 0};
1504+ const float radius = 0.125 / TREE_SCALE;
1505+ xColor color = { 0, 255, 255};
15061506 glm::vec3 velocity = lookingAt - position;
1507− glm::vec3 gravity = DEFAULT_GRAVITY;
1508− float damping = DEFAULT_DAMPING;
1507+ glm::vec3 gravity = DEFAULT_GRAVITY * 0.f;
1508+ float damping = DEFAULT_DAMPING * 0.01f;
15091509 QString updateScript("");
15101510
15111511 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