mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-22 11:18:22 -05:00
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -44,7 +44,7 @@ protected:
|
||||
private:
|
||||
virtual bool createGeometry() override;
|
||||
virtual bool destroyGeometry() override;
|
||||
virtual bool renderGeometry() override;
|
||||
virtual void renderGeometry() override;
|
||||
};
|
||||
|
||||
} //namespace openspace
|
||||
|
||||
@@ -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]);
|
||||
|
||||
@@ -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&);
|
||||
|
||||
@@ -72,7 +72,7 @@ bool DataSphere::readyToRender(){
|
||||
}
|
||||
|
||||
|
||||
bool DataSphere::setUniformAndTextures(){
|
||||
void DataSphere::setUniformAndTextures(){
|
||||
_shader->setUniform("transparency",0.5f);
|
||||
|
||||
ghoul::opengl::TextureUnit unit;
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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(){
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
virtual bool updateTexture() override;
|
||||
|
||||
virtual bool readyToRender() override;
|
||||
virtual bool setUniformAndTextures() override;
|
||||
virtual void setUniformAndTextures() override;
|
||||
virtual bool createShader() override;
|
||||
};
|
||||
|
||||
|
||||
@@ -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) +
|
||||
"}"
|
||||
"}";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user