This commit is contained in:
Agnes Heppich
2019-01-16 11:48:12 -05:00
parent 0bf05635b5
commit 5c74fafd4c
2 changed files with 8 additions and 8 deletions

View File

@@ -208,7 +208,7 @@ void RenderableCone::updateUniforms(const RenderData& data) {
}
void RenderableCone::fillVertexArray(std::vector<float> &vertexArray, glm::dvec3 centerPoint, std::vector<glm::dvec3> points) {
glm::vec4 color = { 0.0f, 0.0f, 1.0f, 1.0f };
glm::vec4 color = { 0.0f, 0.0f, 1.0f, 0.2f };
addVertexToVertexArray(vertexArray, centerPoint, color);
for (int i = 0; i < points.size(); ++i) {

View File

@@ -88,18 +88,11 @@ namespace openspace {
/// The RenderInformation contains information filled in by the concrete subclasses to
/// be used by this class.
struct RenderInformation {
/// The first element in the vertex buffer to be rendered
GLint first = 0;
/// The number of values to be rendered
GLsizei count = 0;
/// Local model matrix, dependant on focusnode, used for rendering in camera space
glm::dmat4 _localTransform = glm::dmat4(1.0);
/// The vertex array object for this RenderInformation
GLuint _vaoID = 0;
/// The main vertex buffer object
GLuint _vBufferID = 0;
};
/// Set of information about the lateral surface of the cone
RenderInformation _lateralSurfaceInfo;
/// Set of information about the base of the cone
@@ -114,6 +107,13 @@ namespace openspace {
const GLuint _sizeFourVal = 4;
const GLuint _sizeThreeVal = 3;
/// Local model matrix, used for rendering in camera space
glm::dmat4 _localTransform = glm::dmat4(1.0);
/// The first element in the vertex buffer to be rendered
GLint _first = 0;
/// The number of values to be rendered
GLsizei _count = 0;
private:
void addVertexToVertexArray(std::vector<float> &_vertexArray,glm::dvec3 position,glm::vec4 color);
void updateUniforms(const RenderData& data);