Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

This commit is contained in:
Sebastian Piwell
2016-05-09 13:10:06 -04:00
13 changed files with 20 additions and 22 deletions
+4 -1
View File
@@ -64,6 +64,7 @@ bool CygnetPlane::createGeometry() {
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, reinterpret_cast<void*>(sizeof(GLfloat) * 4));
return true;
}
bool CygnetPlane::destroyGeometry(){
@@ -72,9 +73,11 @@ bool CygnetPlane::destroyGeometry(){
glDeleteBuffers(1, &_vertexPositionBuffer);
_vertexPositionBuffer = 0;
return true;
}
bool CygnetPlane::renderGeometry(){
void CygnetPlane::renderGeometry(){
glBindVertexArray(_quad);
glDrawArrays(GL_TRIANGLES, 0, 6);
}
+1 -1
View File
@@ -38,7 +38,7 @@ public:
private:
virtual bool createGeometry() override;
virtual bool destroyGeometry() override;
virtual bool renderGeometry() override;
virtual void renderGeometry() override;
GLuint _quad;
GLuint _vertexPositionBuffer;
+3 -1
View File
@@ -41,13 +41,15 @@ bool CygnetSphere::createGeometry(){
int segments = 100;
_sphere = std::make_shared<PowerScaledSphere>(radius, segments);
_sphere->initialize();
return true;
}
bool CygnetSphere::destroyGeometry(){
_sphere = nullptr;
return true;
}
bool CygnetSphere::renderGeometry(){
void CygnetSphere::renderGeometry(){
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
_sphere->render();
+1 -1
View File
@@ -44,7 +44,7 @@ protected:
private:
virtual bool createGeometry() override;
virtual bool destroyGeometry() override;
virtual bool renderGeometry() override;
virtual void renderGeometry() override;
};
} //namespace openspace
+1 -1
View File
@@ -168,7 +168,7 @@ bool DataPlane::readyToRender(){
return (!_textures.empty());
}
bool DataPlane::setUniformAndTextures(){
void DataPlane::setUniformAndTextures(){
// _shader->setUniform("textures", 1, units[1]);
// _shader->setUniform("textures", 2, units[2]);
+1 -1
View File
@@ -53,7 +53,7 @@ friend class IswaGroup;
virtual bool updateTexture() override;
virtual bool readyToRender() override;
virtual bool setUniformAndTextures() override;
virtual void setUniformAndTextures() override;
virtual bool createShader() override;
void readHeader(std::string&);
+1 -1
View File
@@ -72,7 +72,7 @@ bool DataSphere::readyToRender(){
}
bool DataSphere::setUniformAndTextures(){
void DataSphere::setUniformAndTextures(){
_shader->setUniform("transparency",0.5f);
ghoul::opengl::TextureUnit unit;
+1 -1
View File
@@ -41,7 +41,7 @@ private:
virtual bool updateTexture() override;
virtual bool readyToRender() override;
virtual bool setUniformAndTextures() override;
virtual void setUniformAndTextures() override;
virtual bool createShader() override;
};
+2
View File
@@ -115,6 +115,7 @@ bool IswaCygnet::initialize(){
IswaManager::ref().registerToGroup(_data->groupId, _type, this);
// return isReady();
return true;
}
bool IswaCygnet::deinitialize(){
@@ -203,6 +204,7 @@ bool IswaCygnet::destroyShader(){
renderEngine.removeRenderProgram(_shader);
_shader = nullptr;
}
return true;
}
void IswaCygnet::registerProperties(){
+2 -2
View File
@@ -91,12 +91,12 @@ protected:
virtual bool createGeometry() = 0;
virtual bool destroyGeometry() = 0;
virtual bool renderGeometry() = 0;
virtual void renderGeometry() = 0;
virtual bool loadTexture() = 0;
virtual bool updateTexture() = 0;
virtual bool readyToRender() = 0;
virtual bool setUniformAndTextures() = 0;
virtual void setUniformAndTextures() = 0;
virtual bool createShader() = 0;
properties::TriggerProperty _delete;
+1 -3
View File
@@ -105,14 +105,12 @@ bool TexturePlane::readyToRender(){
}
bool TexturePlane::setUniformAndTextures(){
void TexturePlane::setUniformAndTextures(){
ghoul::opengl::TextureUnit unit;
unit.activate();
_textures[0]->bind();
_shader->setUniform("texture1", unit);
return true;
}
+1 -1
View File
@@ -41,7 +41,7 @@
virtual bool updateTexture() override;
virtual bool readyToRender() override;
virtual bool setUniformAndTextures() override;
virtual void setUniformAndTextures() override;
virtual bool createShader() override;
};
+1 -8
View File
@@ -315,12 +315,6 @@ std::string IswaManager::parseJSONToLuaTable(std::shared_ptr<MetadataFuture> dat
std::string coordinateType = j["Coordinate Type"];
int updateTime = j["ISWA_UPDATE_SECONDS"];
std::string radius = "";
if(j["Radius"] == NULL){
radius ="Radius = {6.371, 6.01}, "
"Segments = 100,";
}
glm::vec3 max(
j["Plot XMAX"],
j["Plot YMAX"],
@@ -355,8 +349,7 @@ std::string IswaManager::parseJSONToLuaTable(std::shared_ptr<MetadataFuture> dat
"SpatialScale = " + std::to_string(spatialScale) + ", "
"UpdateTime = " + std::to_string(updateTime) + ", "
"CoordinateType = '" + coordinateType + "', "
"Group = "+ std::to_string(data->group) + " ,"
+ radius +
"Group = "+ std::to_string(data->group) +
"}"
"}";