mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-01 00:09:58 -05:00
Fix Jenkins error and minor cleanup
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user