History

Resolve conflict

atlante45 committed 13 years ago

Commit 16647e31 parent 08b0afd8 files · +403 −61Browse files

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

Unified · Split

interface/src/ParticleSystem.cpp+183−0
@@ -0,0 +1,183 @@
1+//
2+// ParticleSystem.cpp
3+// hifi
4+//
5+// Created by Jeffrey on July 10, 2013
6+//
7+
8+#include <glm/glm.hpp>
9+#include "InterfaceConfig.h"
10+#include <SharedUtil.h>
11+
12+#include "ParticleSystem.h"
13+
14+ParticleSystem::ParticleSystem() {
15+
16+ _numberOfParticles = 1500;
17+ assert(_numberOfParticles <= MAX_PARTICLES);
18+
19+ _bounce = 0.9f;
20+ _timer = 0.0f;
21+ _airFriction = 6.0f;
22+ _jitter = 0.1f;
23+ _homeAttraction = 0.0f;
24+ _tornadoForce = 0.0f;
25+ _neighborAttraction = 0.02f;
26+ _neighborRepulsion = 0.9f;
27+ _tornadoAxis = glm::normalize(glm::vec3(0.1f, 1.0f, 0.1f));
28+ _home = glm::vec3(5.0f, 1.0f, 5.0f);
29+
30+ _TEST_bigSphereRadius = 0.5f;
31+ _TEST_bigSpherePosition = glm::vec3( 5.0f, _TEST_bigSphereRadius, 5.0f);
32+
33+ for (unsigned int p = 0; p < _numberOfParticles; p++) {
34+ _particle[p].position = _home;
35+ _particle[p].velocity = glm::vec3(0.0f, 0.0f, 0.0f);
36+
37+ float radian = ((float)p / (float)_numberOfParticles) * PI_TIMES_TWO;
38+ float wave = sinf(radian);
39+
40+ float red = 0.5f + 0.5f * wave;
41+ float green = 0.3f + 0.3f * wave;
42+ float blue = 0.2f - 0.2f * wave;
43+
44+ _particle[p].color = glm::vec3(red, green, blue);
45+ _particle[p].age = 0.0f;
46+ _particle[p].radius = 0.01f;
47+ }
48+}
49+
50+void ParticleSystem::simulate(float deltaTime) {
51+
52+ runSpecialEffectsTest(deltaTime);
53+
54+ for (unsigned int p = 0; p < _numberOfParticles; p++) {
55+ updateParticle(p, deltaTime);
56+ }
57+}
58+
59+
60+
61+void ParticleSystem::runSpecialEffectsTest(float deltaTime) {
62+
63+ _timer += deltaTime;
64+
65+ _gravity = 0.01f + 0.01f * sinf( _timer * 0.52f );
66+ _airFriction = 3.0f + 2.0f * sinf( _timer * 0.32f );
67+ _jitter = 0.05f + 0.05f * sinf( _timer * 0.42f );
68+ _homeAttraction = 0.01f + 0.01f * cosf( _timer * 0.6f );
69+ _tornadoForce = 0.0f + 0.03f * sinf( _timer * 0.7f );
70+ _neighborAttraction = 0.1f + 0.1f * cosf( _timer * 0.8f );
71+ _neighborRepulsion = 0.4f + 0.3f * sinf( _timer * 0.4f );
72+
73+ _tornadoAxis = glm::vec3
74+ (
75+ 0.0f + 0.5f * sinf( _timer * 0.55f ),
76+ 1.0f,
77+ 0.0f + 0.5f * cosf( _timer * 0.75f )
78+ );
79+}
80+
81+
82+
83+void ParticleSystem::updateParticle(int p, float deltaTime) {
84+
85+ _particle[p].age += deltaTime;
86+
87+ // apply random jitter
88+ _particle[p].velocity +=
89+ glm::vec3
90+ (
91+ -_jitter * ONE_HALF + _jitter * randFloat(),
92+ -_jitter * ONE_HALF + _jitter * randFloat(),
93+ -_jitter * ONE_HALF + _jitter * randFloat()
94+ ) * deltaTime;
95+
96+
97+ // apply attraction to home position
98+ glm::vec3 vectorToHome = _home - _particle[p].position;
99+ _particle[p].velocity += vectorToHome * _homeAttraction * deltaTime;
100+
101+ // apply neighbor attraction
102+ int neighbor = p + 1;
103+ if (neighbor == _numberOfParticles ) {
104+ neighbor = 0;
105+ }
106+ glm::vec3 vectorToNeighbor = _particle[p].position - _particle[neighbor].position;
107+
108+ _particle[p].velocity -= vectorToNeighbor * _neighborAttraction * deltaTime;
109+
110+ float distanceToNeighbor = glm::length(vectorToNeighbor);
111+ if (distanceToNeighbor > 0.0f) {
112+ _particle[neighbor].velocity += (vectorToNeighbor / ( 1.0f + distanceToNeighbor * distanceToNeighbor)) * _neighborRepulsion * deltaTime;
113+ }
114+
115+ // apply tornado force
116+ glm::vec3 tornadoDirection = glm::cross(vectorToHome, _tornadoAxis);
117+ _particle[p].velocity += tornadoDirection * _tornadoForce * deltaTime;
118+
119+ // apply air friction
120+ float drag = 1.0 - _airFriction * deltaTime;
121+ if (drag < 0.0f) {
122+ _particle[p].velocity = glm::vec3(0.0f, 0.0f, 0.0f);
123+ } else {
124+ _particle[p].velocity *= drag;
125+ }
126+
127+ // apply gravity
128+ _particle[p].velocity.y -= _gravity * deltaTime;
129+
130+ // update position by velocity
131+ _particle[p].position += _particle[p].velocity;
132+
133+ // collision with ground
134+ if (_particle[p].position.y < _particle[p].radius) {
135+ _particle[p].position.y = _particle[p].radius;
136+
137+ if (_particle[p].velocity.y < 0.0f) {
138+ _particle[p].velocity.y *= -_bounce;
139+ }
140+ }
141+
142+ // collision with sphere
143+ glm::vec3 vectorToSphereCenter = _TEST_bigSpherePosition - _particle[p].position;
144+ float distanceToSphereCenter = glm::length(vectorToSphereCenter);
145+ float combinedRadius = _TEST_bigSphereRadius + _particle[p].radius;
146+ if (distanceToSphereCenter < combinedRadius) {
147+
148+ if (distanceToSphereCenter > 0.0f){
149+ glm::vec3 directionToSphereCenter = vectorToSphereCenter / distanceToSphereCenter;
150+ _particle[p].position = _TEST_bigSpherePosition - directionToSphereCenter * combinedRadius;
151+ }
152+ }
153+}
154+
155+
156+void ParticleSystem::render() {
157+
158+ for (unsigned int p = 0; p < _numberOfParticles; p++) {
159+ glColor3f(_particle[p].color.x, _particle[p].color.y, _particle[p].color.z);
160+ glPushMatrix();
161+ glTranslatef(_particle[p].position.x, _particle[p].position.y, _particle[p].position.z);
162+ glutSolidSphere(_particle[p].radius, 6, 6);
163+ glPopMatrix();
164+
165+ // render velocity lines
166+ glColor4f( _particle[p].color.x, _particle[p].color.y, _particle[p].color.z, 0.5f);
167+ glm::vec3 end = _particle[p].position - _particle[p].velocity * 2.0f;
168+ glBegin(GL_LINES);
169+ glVertex3f(_particle[p].position.x, _particle[p].position.y, _particle[p].position.z);
170+ glVertex3f(end.x, end.y, end.z);
171+
172+ glEnd();
173+
174+ }
175+}
176+
177+
178+
179+
180+
181+
182+
183+

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