mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to choose point steps in path rendering.

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-09 11:49:43 -04:00
parent fb87842b1b
commit 08431d3d88
3 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/base/rendering/renderablepath.cpp
View File

@@ -49,6 +49,7 @@ namespace {
const std::string keyPathModule = "ModulePath";
const std::string keyColor = "RGB";
const std::string keyTimeSteps = "TimeSteps";
const std::string keyPointSteps = "PointSteps";
const std::string keyDrawLine = "DrawLine";
}
@@ -73,6 +74,9 @@ RenderablePath::RenderablePath(const ghoul::Dictionary& dictionary)
_successfullDictionaryFetch &= dictionary.getValue(keyFrame, _frame);
_successfullDictionaryFetch &= dictionary.getValue(keyTimeSteps, _increment);
if (!dictionary.getValue(keyPointSteps, _pointSteps))
_pointSteps = 4;
glm::vec3 color(0.f);
if (dictionary.hasKeyAndValue<glm::vec3>(keyColor))
dictionary.getValue(keyColor, color);
@@ -141,7 +145,7 @@ void RenderablePath::render(const RenderData& data) {
return;
int nPointsToDraw = (time - _start) / (_stop - _start) * _vertexArray.size() + 3;
int nPointsToDraw = (time - _start) / (_stop - _start) * (_vertexArray.size()) + 1 + 0.5;
_programObject->activate();
@@ -155,6 +159,7 @@ void RenderablePath::render(const RenderData& data) {
_programObject->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
_programObject->setUniform("projectionTransform", data.camera.projectionMatrix());
_programObject->setUniform("pointSteps", _pointSteps);
_programObject->setUniform("color", _lineColor);
if (_drawLine) {
@@ -173,46 +178,6 @@ void RenderablePath::render(const RenderData& data) {
glDisable(GL_PROGRAM_POINT_SIZE);
/*
psc currentPosition = data.position;
glm::mat4 camrot = glm::mat4(data.camera.viewRotationMatrix());
glm::mat4 transform = glm::mat4(1);
// setup the data to the shader
_programObject->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
_programObject->setUniform("ModelTransform", transform);
_programObject->setUniform("color", _lineColor);
_programObject->setUniform("lastPosition", _lastPosition);
setPscUniforms(*_programObject.get(), data.camera, data.position);
if (_drawLine) {
glLineWidth(_lineWidth);
glBindVertexArray(_vaoID);
glDrawArrays(GL_LINE_STRIP, 0, static_cast<GLsizei>(_vertexArray.size()));
glBindVertexArray(0);
glLineWidth(1.f);
}
//float pointSize = std::min((11-exp),5.f);
//glPointSize(5);
glEnable(GL_PROGRAM_POINT_SIZE);
//GLfloat distanceParams[] = { 1.0f, 5.0f, 10.f }; //a, b, c
//GLfloat fadeThreshold[] = { 0.1f };
//
//glPointParameterf(GL_POINT_SIZE_MAX, 5.0f);
//glPointParameterf(GL_POINT_SIZE_MIN, 1.0f);
//glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, distanceParams);
////=> size = clamp(size*sqrt(1/(a+b*d+c*d^2)));
//glPointParameterfv(GL_POINT_FADE_THRESHOLD_SIZE, fadeThreshold);
glBindVertexArray(_vaoID);
glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_vertexArray.size()));
glBindVertexArray(0);
glDisable(GL_PROGRAM_POINT_SIZE);
*/
_programObject->deactivate();
}

1
modules/base/rendering/renderablepath.h
View File

@@ -87,6 +87,7 @@ private:
double _start;
double _stop;
float _distanceFade;
int _pointSteps;
};
} // namespace openspace

14
modules/base/shaders/path_vs.glsl
View File

@@ -29,6 +29,7 @@ in vec4 in_point_position;
uniform vec3 color;
uniform mat4 modelViewTransform;
uniform mat4 projectionTransform;
uniform int pointSteps;
out vec4 vs_positionScreenSpace;
out vec4 vs_pointColor;
@@ -42,15 +43,14 @@ void main() {
gl_Position = vs_positionScreenSpace;
int id = gl_VertexID;
bool isNewHour = mod(id * 900, 3600) > 0;
if(isNewHour) {
vs_pointColor = vec4(0.6f, 0.6f, 0.6f, 0.8f);
gl_PointSize = 5.f;
}
else {
if(mod(id, pointSteps) == 0) {
vs_pointColor.rgb = color;
vs_pointColor.a = 1.f;
gl_PointSize = 10.0f;
gl_PointSize = 10.0f;
}
else {
vs_pointColor = vec4(0.6f, 0.6f, 0.6f, 0.8f);
gl_PointSize = 5.f;
}
}