Fix Jenkins error and minor cleanup

This commit is contained in:
Anton Arbring
2015-06-21 20:23:40 -04:00
parent ad55309b0e
commit c7a3048dda
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -100,7 +100,7 @@ void ModelGeometry::render() {
glBindVertexArray(0);
}
void ModelGeometry::changeRenderMode(const GLenum mode){
void ModelGeometry::changeRenderMode(const GLenum mode) {
_mode = mode;
}
@@ -143,7 +143,7 @@ void ModelGeometry::deinitialize() {
glDeleteBuffers(1, &_ibo);
}
bool ModelGeometry::loadObj(const std::string& filename){
bool ModelGeometry::loadObj(const std::string& filename) {
std::string cachedFile = "";
FileSys.cacheManager()->getCachedFile(filename, cachedFile, true);
+2 -2
View File
@@ -50,8 +50,8 @@ namespace openspace {
void render();
virtual bool loadModel(const std::string& filename) = 0;
void changeRenderMode(const GLenum mode);
bool ModelGeometry::getVertices(std::vector<Vertex>* vertexList);
bool ModelGeometry::getIndices(std::vector<int>* indexList);
bool getVertices(std::vector<Vertex>* vertexList);
bool getIndices(std::vector<int>* indexList);
protected:
Renderable* _parent;
+2 -2
View File
@@ -284,10 +284,10 @@ void RenderableTrail::fullYearSweep(double time) {
psc pscPos;
_vertexArray.resize(segments+2);
for (int i = 0; i < segments+2; i++) {
if (start > time && intervalSet){
if (start > time && intervalSet) {
time = start;
}
else if (end < time && intervalSet){
else if (end < time && intervalSet) {
time = end;
}