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

Further code cleanup on particle cloud

Browse source
This commit is contained in:
Philip Rosedale 2013-10-09 15:10:03 -07:00
parent 58d6c4c97a
commit 85a15a22fa
4 changed files with 40 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
interface/src/Cloud.cpp
View file

@ -12,10 +12,7 @@
#include "Util.h"
#include "Field.h"
const int NUM_PARTICLES = 20000;
#define COLOR_MIN 0.2f
const int NUM_PARTICLES = 100000;
Cloud::Cloud() {
// Create and initialize particles
@ -23,57 +20,24 @@ Cloud::Cloud() {
glm::vec3 box = glm::vec3(PARTICLE_WORLD_SIZE);
bounds = box;
count = NUM_PARTICLES;
wrapBounds = false;
particles = new Particle[count];
field = new Field(PARTICLE_WORLD_SIZE);
for (i = 0; i < count; i++) {
float x = randFloat()*box.x;
float y = randFloat()*box.y;
float z = randFloat()*box.z;
particles[i].position.x = x;
particles[i].position.y = y;
particles[i].position.z = z;
const float INIT_VEL_SCALE = 0.10;
particles[i].velocity = randVector();
particles[i].velocity *= PARTICLE_WORLD_SIZE * INIT_VEL_SCALE;
float color_mult = 1 - COLOR_MIN;
particles[i].color = glm::vec3(x*color_mult/PARTICLE_WORLD_SIZE + COLOR_MIN,
y*color_mult/PARTICLE_WORLD_SIZE + COLOR_MIN,
z*color_mult/PARTICLE_WORLD_SIZE + COLOR_MIN);
}
particles[i].position = randVector() * box;
const float INIT_VEL_SCALE = 0.03f;
particles[i].velocity = randVector() * ((float)PARTICLE_WORLD_SIZE * INIT_VEL_SCALE);
particles[i].color = randVector();
}
}
void Cloud::render() {
//field->render();
field->render();
/*
float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f };
glEnable( GL_TEXTURE_2D );
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
float maxSize = 0.0f;
glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize );
glPointSize( maxSize );
glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );
glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE );
glEnable( GL_POINT_SPRITE_ARB );
*/
glPointSize(3.0f);
glDisable(GL_TEXTURE_2D);
glEnable(GL_POINT_SMOOTH);
glBegin( GL_POINTS );
glBegin(GL_POINTS);
for (unsigned int i = 0; i < count; i++)
{
glColor3f(particles[i].color.x,
@ -84,8 +48,6 @@ void Cloud::render() {
particles[i].position.z);
}
glEnd();
glDisable( GL_POINT_SPRITE_ARB );
glDisable( GL_TEXTURE_2D );
}
void Cloud::simulate (float deltaTime) {
@ -94,59 +56,35 @@ void Cloud::simulate (float deltaTime) {
for (i = 0; i < count; ++i) {
// Update position
particles[i].position += particles[i].velocity*deltaTime;
//particles[i].position += particles[i].velocity;
particles[i].position += particles[i].velocity * deltaTime;
// Decay Velocity (Drag)
const float CONSTANT_DAMPING = 0.15;
particles[i].velocity *= (1.f - CONSTANT_DAMPING*deltaTime);
const float CONSTANT_DAMPING = 0.15f;
particles[i].velocity *= (1.f - CONSTANT_DAMPING * deltaTime);
// Interact with Field
const float FIELD_COUPLE = 0.005f; //0.0000001;
field->interact(deltaTime, &particles[i].position, &particles[i].velocity, &particles[i].color, FIELD_COUPLE);
const float FIELD_COUPLE = 0.005f;
field->interact(deltaTime,
&particles[i].position,
&particles[i].velocity,
&particles[i].color,
FIELD_COUPLE);
// Update color to velocity
particles[i].color = (glm::normalize(particles[i].velocity)*0.5f);
particles[i].color += 0.5f;
particles[i].color = (glm::normalize(particles[i].velocity) * 0.5f) + 0.5f;
// Bounce or Wrap
if (wrapBounds) {
// wrap around bounds
if (particles[i].position.x > bounds.x)
particles[i].position.x -= bounds.x;
else if (particles[i].position.x < 0.0f)
particles[i].position.x += bounds.x;
if (particles[i].position.y > bounds.y)
particles[i].position.y -= bounds.y;
else if (particles[i].position.y < 0.0f)
particles[i].position.y += bounds.y;
if (particles[i].position.z > bounds.z)
particles[i].position.z -= bounds.z;
else if (particles[i].position.z < 0.0f)
particles[i].position.z += bounds.z;
} else {
// Bounce at bounds
if (particles[i].position.x > bounds.x
|| particles[i].position.x < 0.f) {
if (particles[i].position.x > bounds.x) particles[i].position.x = bounds.x;
else particles[i].position.x = 0.f;
particles[i].velocity.x *= -1;
}
if (particles[i].position.y > bounds.y
|| particles[i].position.y < 0.f) {
if (particles[i].position.y > bounds.y) particles[i].position.y = bounds.y;
else particles[i].position.y = 0.f;
particles[i].velocity.y *= -1;
}
if (particles[i].position.z > bounds.z
|| particles[i].position.z < 0.f) {
if (particles[i].position.z > bounds.z) particles[i].position.z = bounds.z;
else particles[i].position.z = 0.f;
particles[i].velocity.z *= -1;
}
// Bounce at bounds
if ((particles[i].position.x > bounds.x) || (particles[i].position.x < 0.f)) {
particles[i].position.x = glm::clamp(particles[i].position.x, 0.f, bounds.x);
particles[i].velocity.x *= -1.f;
}
if ((particles[i].position.y > bounds.y) || (particles[i].position.y < 0.f)) {
particles[i].position.y = glm::clamp(particles[i].position.y, 0.f, bounds.y);
particles[i].velocity.y *= -1.f;
}
if ((particles[i].position.z > bounds.z) || (particles[i].position.z < 0.f)) {
particles[i].position.z = glm::clamp(particles[i].position.z, 0.f, bounds.z);
particles[i].velocity.z *= -1.f;
}
}
}

3
interface/src/Cloud.h
View file

@ -11,7 +11,7 @@
#include "Field.h"
#define PARTICLE_WORLD_SIZE 128.0
#define PARTICLE_WORLD_SIZE 256.0
class Cloud {
public:
@ -27,7 +27,6 @@ private:
unsigned int count;
glm::vec3 bounds;
bool wrapBounds;
Field *field;
};

30
interface/src/Field.cpp
View file

@ -8,11 +8,6 @@
#include "Field.h"
#define FIELD_SCALE 0.00050
#define COLOR_DRIFT_RATE 0.001f // per-frame drift of particle color towards field element color
#define COLOR_MIN 0.2f // minimum R/G/B value at 0,0,0 - also needs setting in cloud.cpp
// A vector-valued field over an array of elements arranged as a 3D lattice
int Field::value(float *value, float *pos)
@ -30,7 +25,9 @@ int Field::value(float *value, float *pos)
value[2] = field[index].val.z;
return 1;
}
else return 0;
else {
return 0;
}
}
Field::Field(float worldSize)
@ -41,7 +38,7 @@ Field::Field(float worldSize)
float fx, fy, fz;
for (i = 0; i < FIELD_ELEMENTS; i++)
{
const float FIELD_INITIAL_MAG = 0.3f;
const float FIELD_INITIAL_MAG = 0.0f;
field[i].val = randVector() * FIELD_INITIAL_MAG * _worldSize;
field[i].scalar = 0;
// Record center point for this field cell
@ -53,11 +50,6 @@ Field::Field(float worldSize)
field[i].center.z = (fz + 0.5f);
field[i].center *= _worldSize / 10.f;
// and set up the RGB values for each field element.
float color_mult = 1 - COLOR_MIN;
fieldcolors[i].rgb = glm::vec3(((i%10)*(color_mult/10.0f)) + COLOR_MIN,
((i%100)*(color_mult/100.0f)) + COLOR_MIN,
(i*(color_mult/1000.0f)) + COLOR_MIN);
}
}
@ -76,8 +68,8 @@ void Field::add(float* add, float *pos)
}
}
void Field::interact(float dt, glm::vec3 * pos, glm::vec3 * vel, glm::vec3 * color, float coupling) {
void Field::interact(float dt, glm::vec3* pos, glm::vec3* vel, glm::vec3* color, float coupling) {
int index = (int)(pos->x/ _worldSize * 10.0) +
(int)(pos->y/_worldSize*10.0)*10 +
(int)(pos->z/_worldSize*10.0)*100;
@ -85,17 +77,11 @@ void Field::interact(float dt, glm::vec3 * pos, glm::vec3 * vel, glm::vec3 * col
//
// Vector Coupling with particle velocity
//
*vel += field[index].val*dt; // Particle influenced by field
*vel += field[index].val * dt; // Particle influenced by field
glm::vec3 temp = *vel*dt; // Field influenced by particle
glm::vec3 temp = *vel * dt; // Field influenced by particle
temp *= coupling;
field[index].val += temp;
//
// Scalar coupling: Damp particle as function of local density
//
// add a fraction of the field color to the particle color
//*color = (*color * (1 - COLOR_DRIFT_RATE)) + (fieldcolors[index].rgb * COLOR_DRIFT_RATE);
}
}

7
interface/src/Field.h
View file

@ -26,12 +26,7 @@ class Field {
glm::vec3 fld;
float scalar;
} field[FIELD_ELEMENTS];
// Pre-calculated RGB values for each field element
struct FieldColor {
glm::vec3 rgb;
} fieldcolors[FIELD_ELEMENTS];
Field(float worldSize);
int value(float *ret, float *pos);