Skip to content

Commit

Permalink
Orbit: optimisation WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@neilmendoza
neilmendoza committed Jan 4, 2014
1 parent ab5732d commit 9052d37
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 119 deletions.
31 changes: 31 additions & 0 deletions CloudsData/visualsystems/Orbit/shaders/mesh.frag
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#version 120
#extension GL_ARB_texture_rectangle : enable

#define TWO_PI 6.28318530717958647693
#define PI 3.14159265358979323846
#define HALF_PI 1.57079632679489661923

uniform vec3 lEye;
uniform float litAmount;

varying float fogAmount;
varying vec3 nEye;
varying vec3 vEye;

void main()
{
vec3 l = normalize(lEye - vEye);

//vec3 lightN = normalize(cross(dFdx(vEye), dFdy(vEye)));
vec3 lightN = normalize(nEye);

float diffuse = max(dot(lightN, l), 0.0);

vec3 h = normalize(lightN + l);

float nDotH = max(dot(lightN, h), 0.0);

float specular = 1e-2 * pow(nDotH, 64);

gl_FragColor = (1.0 - fogAmount) * gl_Color * (1.0 - litAmount + litAmount * (diffuse + specular));
}
31 changes: 31 additions & 0 deletions CloudsData/visualsystems/Orbit/shaders/mesh.vert
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#version 120
#extension GL_ARB_texture_rectangle : enable

#define PI 3.14159265358979323846
#define TWO_PI 6.28318530717958647693
#define HALF_PI 1.57079632679489661923

uniform sampler2DRect particles0;
uniform sampler2DRect particles1;

uniform float fogStart;
uniform float fogEnd;

varying float fogAmount;
varying vec3 vEye;
varying vec3 nEye;

void main()
{
gl_TexCoord[0] = gl_MultiTexCoord0;
vec4 vWorld = vec4(texture2DRect(particles0, gl_TexCoord[0].st).xyz, 1.0);
vec3 nWorld = texture2DRect(particles1, gl_TexCoord[0].st).xyz;

vEye = (gl_ModelViewMatrix * vWorld).xyz;
fogAmount = clamp((length(vEye) - fogStart) / (fogEnd - fogStart), 0.0, 1.0);
nEye = gl_NormalMatrix * nWorld;

gl_FrontColor = gl_Color;
gl_TexCoord[0] = gl_MultiTexCoord0;
gl_Position = gl_ModelViewProjectionMatrix * vWorld;
}
18 changes: 5 additions & 13 deletions CloudsLibrary/src/VisualSystems/Orbit/vs_src/CloudsVisualSystemOrbit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,14 @@ void CloudsVisualSystemOrbit::selfDraw()
shader.begin();
shader.setUniform1f("fogStart", fogStart);
shader.setUniform1f("fogEnd", fogEnd);
shader.setUniform3f("fogColour", 0, 0, 0);
shader.setUniform1f("litAmount", litAmount);
shader.setUniform3f("lEye", 1000, 1000, 1000);
//for (unsigned i = 0; i < paths.size(); ++i)
{
if (drawMesh) path.drawMesh();
if (drawNormals) path.drawNormals(10);
if (drawInflections) path.drawInflections();
if (drawAcc) path.drawAcc();
}
//if (drawNormals) path.drawNormals(10);
if (drawInflections) path.drawInflections();
if (drawAcc) path.drawAcc();
shader.end();

//for (unsigned i = 0; i < paths.size(); ++i)
{
if (drawLine) path.drawLine(fogStart, fogEnd);
}
if (drawMesh) path.drawMesh(fogStart, fogEnd, litAmount);
if (drawLine) path.drawLine(fogStart, fogEnd);

if (additiveBlending)
{
Expand Down
150 changes: 62 additions & 88 deletions CloudsLibrary/src/VisualSystems/Orbit/vs_src/Path.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,55 @@ namespace itg

// set max frames so we don't end up using up all memory
ptf.setMaxFrames(1000);
lineMesh.setUsage(GL_DYNAMIC_DRAW);
lineMesh.setMode(OF_PRIMITIVE_LINE_STRIP);
//lineMesh.setUsage(GL_DYNAMIC_DRAW);
//lineMesh.setMode(OF_PRIMITIVE_LINE_STRIP);

lineParticles.init(maxLineLength, 1, OF_PRIMITIVE_LINE_STRIP, false, 1);
lineParticles.getDrawShaderRef().load(dataPath + "shaders/line");

linePosns.resize(maxLineLength);

lineVertices.resize(maxLineLength);
unsigned fadeIdx = lineFadeLength * maxLineLength;
for (unsigned i = 0; i < maxLineLength; ++i)
{
lineMesh.addVertex(ofVec3f());
//lineMesh.addVertex(ofVec3f());
float alpha = ofMap(i, 0, fadeIdx, 0.f, 1.f, true);
lineMesh.addColor(ofFloatColor::fromHsb(ofMap(abs(points[i].getPos().x) + abs(points[i].getPos().y), 0, 50, hueMin, hueMax, true), 0.5, 1.0, alpha));
lineParticles.getMeshRef().addColor(ofFloatColor::fromHsb(ofMap(abs(points[i].getPos().x) + abs(points[i].getPos().y), 0, 50, hueMin, hueMax, true), 0.5, 1.0, alpha));
}

updateSlice();

initMeshParticles();
meshParticles.getDrawShaderRef().load(dataPath + "shaders/mesh");
meshVertices.reserve(resolution * maxMeshLength);
meshNormals.reserve(resolution * maxMeshLength);

for (unsigned k = 0; k < maxMeshLength; ++k)
{
for (unsigned j = 0; j < resolution; ++j)
{
meshVertices.push_back(sliceVertices[j]);
meshNormals.push_back(sliceNormals[j]);
}
}
}

void Path::initMeshParticles()
{
meshParticles.init(resolution, maxMeshLength, OF_PRIMITIVE_TRIANGLES, false, 2);
for (unsigned k = 1; k < maxMeshLength; ++k)
{
unsigned prevLayerIdx = (k - 1) * resolution;
unsigned currLayerIdx = k * resolution;
for (unsigned i = 0; i < resolution; ++i)
{
meshParticles.getMeshRef().addIndex(prevLayerIdx + i);
meshParticles.getMeshRef().addIndex(prevLayerIdx + (i + 1) % resolution);
meshParticles.getMeshRef().addIndex(currLayerIdx + i);

meshParticles.getMeshRef().addIndex(currLayerIdx + i);
meshParticles.getMeshRef().addIndex(prevLayerIdx + (i + 1) % resolution);
meshParticles.getMeshRef().addIndex(currLayerIdx + (i + 1) % resolution);
}
}
}

void Path::setMeshRadius(float meshRadius)
Expand Down Expand Up @@ -99,9 +131,6 @@ namespace itg

void Path::addVertex(const ofVec3f& vertex)
{
linePosns.push_back(vertex);
while (linePosns.size() > maxLineLength) linePosns.erase(linePosns.begin());

points.push_back(vertex);
while (points.size() > maxLineLength) points.pop_front();

Expand All @@ -122,82 +151,33 @@ namespace itg
}

// line
lineVertices.push_back(vertex);
while (lineVertices.size() > maxLineLength) lineVertices.erase(lineVertices.begin());
if (maxLineLength != lineParticles.getWidth()) lineParticles.init(maxLineLength, 1, OF_PRIMITIVE_LINE_STRIP, false, 1);
lineParticles.loadDataTexture(ofxGpuParticles::POSITION, linePosns[0].getPtr());
//lineMesh.clear();
//unsigned lineLength = fmin(maxLineLength, points.size());
//unsigned fadeIdx = lineFadeLength * lineLength;
/*for (unsigned i = 0; i < lineLength; ++i)
{
lineMesh.addVertex(points[i].getPos());
float alpha = ofMap(i, 0, fadeIdx, 0.f, 1.f, true);
lineMesh.addColor(ofFloatColor::fromHsb(ofMap(abs(points[i].getPos().x) + abs(points[i].getPos().y), 0, 50, hueMin, hueMax, true), 0.5, 1.0, alpha));
}*/
lineParticles.loadDataTexture(0, lineVertices[0].getPtr());

// mesh
ptf.addPoint(vertex);
if (ptf.getFrames().size())
{
bool firstLayer = mesh.getVertices().empty();
ofMatrix4x4 transform = ptf.transformMatrix();
ofMatrix4x4 normalMatrix = ptf.normalMatrix();

for (unsigned i = 0; i < resolution; ++i)
{
vertices.push_back(sliceVertices[i] * transform);
normals.push_back(sliceNormals[i] * normalMatrix);
mesh.addVertex(vertices.back());
mesh.addNormal(normals.back());
meshVertices.push_back(sliceVertices[i] * transform);
meshNormals.push_back(sliceNormals[i] * normalMatrix);
}
while (meshVertices.size() > resolution * maxMeshLength) meshVertices.erase(meshVertices.begin(), meshVertices.begin() + resolution);
while (meshNormals.size() > resolution * maxMeshLength) meshNormals.erase(meshNormals.begin(), meshNormals.begin() + resolution);

/*
if (!firstLayer)
{
unsigned prevLayerIdx = mesh.getNumVertices() - 2 * resolution;
unsigned currLayerIdx = mesh.getNumVertices() - resolution;
for (unsigned i = 0; i < resolution; ++i)
{
indices.push_back(prevLayerIdx + i);
indices.push_back(prevLayerIdx + (i + 1) % resolution);
indices.push_back(currLayerIdx + i);
indices.push_back(currLayerIdx + i);
indices.push_back(prevLayerIdx + (i + 1) % resolution);
indices.push_back(currLayerIdx + (i + 1) % resolution);
}
for (unsigned i = 0; i < 6 * resolution; ++i)
{
mesh.addIndex(indices[indices.size() - 6 * resolution + i]);
}
unsigned removed = 0;
while (vertices.size() > resolution * Path::maxMeshLength)
{
for (unsigned i = 0; i < resolution; ++i)
{
vertices.pop_front();
normals.pop_front();
for (unsigned j = 0; j < 6; ++j) indices.pop_front();
}
removed += resolution;
}
if (removed != 0)
{
for (unsigned i = 0; i < indices.size(); ++i) indices[i] -= removed;
mesh.getVertices().clear();
for (unsigned i = 0; i < vertices.size(); ++i) mesh.addVertex(vertices[i]);
mesh.getNormals().clear();
for (unsigned i = 0; i < normals.size(); ++i) mesh.addNormal(normals[i]);
mesh.getIndices().clear();
for (unsigned i = 0; i < indices.size(); ++i) mesh.addIndex(indices[i]);
}
}*/
if (maxMeshLength * resolution != meshParticles.getSize()) initMeshParticles();
meshParticles.loadDataTexture(0, meshVertices[0].getPtr());
meshParticles.loadDataTexture(1, meshNormals[0].getPtr());
}
}

/*
void Path::drawNormals(float size)
{
unsigned step = 8;
Expand All @@ -212,10 +192,17 @@ namespace itg
}
}
}
*/

void Path::drawMesh()
void Path::drawMesh(float fogStart, float fogEnd, float litAmount)
{
mesh.draw();
meshParticles.getDrawShaderRef().begin();
meshParticles.getDrawShaderRef().setUniform1f("fogStart", fogStart);
meshParticles.getDrawShaderRef().setUniform1f("fogEnd", fogEnd);
meshParticles.getDrawShaderRef().setUniform1f("litAmount", litAmount);
meshParticles.getDrawShaderRef().setUniform3f("lEye", 1000.f, 1000.f, 1000.f);
meshParticles.getDrawShaderRef().end();
meshParticles.draw();
}

void Path::drawLine(float fogStart, float fogEnd)
Expand All @@ -230,20 +217,7 @@ namespace itg
lineParticles.getDrawShaderRef().setUniform1f("hueMax", hueMax);
lineParticles.getDrawShaderRef().end();
lineParticles.draw();
//lineMesh.draw();
ofPopStyle();
/*
ofPushStyle();
ofNoFill();
ofBeginShape();
for (unsigned i = 0; i < points.size(); ++i)
{
ofVec3f v = points[i].getPos();
ofVertex(v);
}
ofEndShape();
ofPopStyle();
*/
}

void Path::drawInflections()
Expand Down Expand Up @@ -271,11 +245,11 @@ namespace itg

void Path::clear()
{
vertices.clear();
/*vertices.clear();
normals.clear();
indices.clear();
mesh.clear();
lineMesh.clear();
lineMesh.clear();*/
ptf.clear();
points.clear();
inflections.clear();
Expand Down
30 changes: 12 additions & 18 deletions CloudsLibrary/src/VisualSystems/Orbit/vs_src/Path.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,49 +54,43 @@ namespace itg
void addVertex(const ofVec3f& vertex);
void addVertex(float x, float y, float z);

void drawMesh();
void drawMesh(float fogStart, float fogEnd, float litAmount);
void drawLine(float fogStart, float fogEnd);
void drawNormals(float size);
//void drawNormals(float size);
void drawInflections();
void drawAcc();

PathPoint back() const { return points.back(); }
unsigned size() const { return points.size(); }
PathPoint operator[](unsigned idx) const { return points[idx]; }

deque<ofVec3f>& getVerticesRef() { return vertices; }

ofxPtf& getPtfRef() { return ptf; }

ofVboMesh& getLineMeshRef() { return lineMesh; }

void setMeshRadius(float meshRadius);
void setMeshRadius(float meshRadius);

void setResolution(unsigned resolution);

void clear();

private:
void initMeshParticles();
void updateSlice();

vector<ofVec4f> linePosns;
ofxGpuParticles lineParticles;

deque<PathPoint> points;

deque<ofVec3f> inflections;

// line stuff
ofVboMesh lineMesh;
unsigned resolution;
ofxPtf ptf;
vector<ofVec4f> lineVertices;
ofxGpuParticles lineParticles;

// mesh stuff
ofxPtf ptf;
unsigned resolution;
vector<ofVec3f> sliceVertices;
vector<ofVec3f> sliceNormals;
deque<ofVec3f> vertices;
deque<ofVec3f> normals;
deque<unsigned> indices;
ofVboMesh mesh;
float meshRadius;
float meshRadius;vector<ofVec4f> meshVertices;
vector<ofVec4f> meshNormals;
ofxGpuParticles meshParticles;
};
}
Loading

0 comments on commit 9052d37

Please sign in to comment.