mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding new Renderable for Tully galaxies. Removed unsused code. Avoiding convertions. Others.

Browse Source
This commit is contained in:
Jonathas Costa
2017-10-06 18:35:32 -04:00
parent a3f28a617b
commit 611cd92f1d
6 changed files with 72 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/digitaluniverse/CMakeLists.txt
View File

@@ -25,7 +25,6 @@
include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepointssprite.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepoints.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledumeshes.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablebillboardscloud.h
@@ -34,7 +33,6 @@ set(HEADER_FILES
source_group("Header Files" FILES ${HEADER_FILES})
set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepointssprite.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepoints.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledumeshes.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablebillboardscloud.cpp

4
modules/digitaluniverse/digitaluniversemodule.cpp
View File

@@ -33,7 +33,7 @@
#include <modules/digitaluniverse/rendering/renderablepoints.h>
#include <modules/digitaluniverse/rendering/renderablebillboardscloud.h>
//#include <modules/digitaluniverse/rendering/renderablepointssprite.h>
#include <modules/digitaluniverse/rendering/renderableplanescloud.h>
#include <modules/digitaluniverse/rendering/renderabledumeshes.h>
#include <ghoul/filesystem/filesystem>
@@ -48,7 +48,7 @@ void DigitalUniverseModule::internalInitialize() {
fRenderable->registerClass<RenderablePoints>("RenderablePoints");
fRenderable->registerClass<RenderableBillboardsCloud>("RenderableBillboardsCloud");
//fRenderable->registerClass<RenderablePointsSprite>("RenderablePointsSprite");
fRenderable->registerClass<RenderablePlanesCloud>("RenderablePlanesCloud");
fRenderable->registerClass<RenderableDUMeshes>("RenderableDUMeshes");
}

53
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
View File

@@ -272,7 +272,6 @@ namespace openspace {
, _polygonSides(0)
, _textMinSize(0)
, _pTexture(0)
, _tTexture(0)
, _alphaValue(TransparencyInfo, 1.f, 0.f, 1.f)
, _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 600.f)
, _pointColor(ColorInfo, glm::vec3(1.f, 0.4f, 0.2f), glm::vec3(0.f, 0.f, 0.f), glm::vec3(1.0f, 1.0f, 1.0f))
@@ -513,10 +512,6 @@ namespace openspace {
_polygonTexture = nullptr;
glDeleteTextures(1, &_pTexture);
}
if (_hasLabel) {
glDeleteTextures(1, &_tTexture);
}
}
void RenderableBillboardsCloud::renderBillboards(const RenderData& data, const glm::dmat4& modelViewMatrix,
@@ -734,9 +729,9 @@ namespace openspace {
if (_hasColorMapFile) {
const size_t nAstronomicalObjects = _fullData.size() / _nValuesPerAstronomicalObject;
/*const size_t nAstronomicalObjects = _fullData.size() / _nValuesPerAstronomicalObject;
const size_t nValues = _slicedData.size() / nAstronomicalObjects;
GLsizei stride = static_cast<GLsizei>(sizeof(float) * nValues);
GLsizei stride = static_cast<GLsizei>(sizeof(float) * nValues);*/
glEnableVertexAttribArray(positionAttrib);
glVertexAttribPointer(
@@ -1318,9 +1313,6 @@ namespace openspace {
}
glViewport(0, 0, textureWidth, textureHeight);
RenderEngine& renderEngine = OsEng.renderEngine();
GLuint vao = geometryLoadingFunction();
renderFunction(vao);
@@ -1357,8 +1349,6 @@ namespace openspace {
}
void RenderableBillboardsCloud::renderPolygonGeometry(GLuint vao) {
RenderEngine& renderEngine = OsEng.renderEngine();
std::unique_ptr<ghoul::opengl::ProgramObject> program = ghoul::opengl::ProgramObject::Build("RenderableBillboardsCloud_Polygon",
"${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_vs.glsl",
"${MODULE_DIGITALUNIVERSE}/shaders/billboardpolygon_fs.glsl",
@@ -1383,45 +1373,6 @@ namespace openspace {
program->deactivate();
}
GLuint RenderableBillboardsCloud::loadTextGeometryForRendering() {
// The font render method creates its own vertex array object.
return 0;
}
void RenderableBillboardsCloud::renderTextGeometry(GLuint vao) {
size_t _fontSize = 10;
std::shared_ptr<ghoul::fontrendering::Font> _font = OsEng.fontManager().font("Mono", static_cast<float>(_fontSize),
ghoul::fontrendering::FontManager::Outline::Yes, ghoul::fontrendering::FontManager::LoadGlyphs::No);
std::string text = "This is a text test!!";
auto size = ghoul::fontrendering::FontRenderer::defaultRenderer().boundingBox(
*_font,
"%s",
text
);
GLsizei framebufferSize = 10*static_cast<GLsizei>(ceil(size.boundingBox.x > size.boundingBox.y ? size.boundingBox.x : size.boundingBox.y));
framebufferSize = 256;
_fontRenderer = std::unique_ptr<ghoul::fontrendering::FontRenderer>(ghoul::fontrendering::FontRenderer::createDefault());
_fontRenderer->setFramebufferSize(glm::vec2(framebufferSize,framebufferSize));
glm::vec2 textPosition(0.0, 0.0);
static const float black[] = { 0.0f, 0.0f, 0.0f, 0.0f };
glClearBufferfv(GL_COLOR, 0, black);
_fontRenderer->render(
*_font,
textPosition,
_textColor,
"%s",
text.c_str());
}
void RenderableBillboardsCloud::saveTextureToPPMFile(const GLenum color_buffer_attachment,
const std::string & fileName, const int width, const int height) const {
std::fstream ppmFile;

3
modules/digitaluniverse/rendering/renderablebillboardscloud.h
View File

@@ -88,8 +88,6 @@ namespace openspace {
GLuint textureToRenderTo, GLuint textureWidth, GLuint textureHeight);
GLuint loadPolygonGeometryForRendering();
void renderPolygonGeometry(GLuint vao);
GLuint loadTextGeometryForRendering();
void renderTextGeometry(GLuint vao);
void renderBillboards(const RenderData& data, const glm::dmat4& modelViewMatrix,
const glm::dmat4& projectionMatrix, const glm::vec3& orthoRight, const glm::vec3& orthoUp);
void renderLabels(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
@@ -118,7 +116,6 @@ namespace openspace {
int _textMinSize;
GLuint _pTexture;
GLuint _tTexture;
properties::FloatProperty _alphaValue;
properties::FloatProperty _scaleFactor;

198
modules/digitaluniverse/rendering/renderableplanescloud.cpp
View File

@@ -51,7 +51,6 @@
namespace {
const char* _loggerCat = "RenderablePlanesCloud";
const char* KeyFile = "File";
const char* keyColor = "Color";
const char* keyUnit = "Unit";
const char* MeterUnit = "m";
const char* KilometerUnit = "Km";
@@ -62,7 +61,12 @@ namespace {
const char* GigalightyearUnit = "Gly";
const int8_t CurrentCacheVersion = 1;
const double PARSEC = 0.308567756E17;
const float PARSEC = 0.308567756E17f;
enum BlendMode {
BlendModeNormal = 0,
BlendModeAdditive
};
static const openspace::properties::Property::PropertyInfo TransparencyInfo = {
"Transparency",
@@ -115,6 +119,12 @@ namespace {
"Transformation Matrix",
"Transformation matrix to be applied to each astronomical object."
};
static const openspace::properties::Property::PropertyInfo BlendModeInfo = {
"BlendMode",
"Blending Mode",
"This determines the blending mode that is applied to this plane."
};
} // namespace
namespace openspace {
@@ -179,6 +189,12 @@ namespace openspace {
Optional::Yes,
TransformationMatrixInfo.description
},
{
BlendModeInfo.identifier,
new StringInListVerifier({ "Normal", "Additive" }),
Optional::Yes,
BlendModeInfo.description, // + " The default value is 'Normal'.",
},
}
};
}
@@ -193,9 +209,7 @@ namespace openspace {
, _labelDataIsDirty(true)
, _textMinSize(0)
, _planeStartingIndexPos(0)
, _textureVariableIndex(0)
, _pTexture(0)
, _tTexture(0)
, _textureVariableIndex(0)
, _alphaValue(TransparencyInfo, 1.f, 0.f, 1.f)
, _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 600.f)
, _textColor(
@@ -206,13 +220,12 @@ namespace openspace {
)
, _textSize(TextSizeInfo, 8.0, 0.5, 24.0)
, _drawElements(DrawElementsInfo, true)
, _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
, _program(nullptr)
, _fontRenderer(nullptr)
, _font(nullptr)
, _speckFile("")
, _colorMapFile("")
, _labelFile("")
, _colorOptionString("")
, _unit(Parsec)
, _nValuesPerAstronomicalObject(0)
, _transformationMatrix(glm::dmat4(1.0))
@@ -298,7 +311,7 @@ namespace openspace {
if (dictionary.hasKey(TextSizeInfo.identifier)) {
_textSize = dictionary.value<double>(TextSizeInfo.identifier);
_textSize = dictionary.value<float>(TextSizeInfo.identifier);
}
addProperty(_textSize);
@@ -310,6 +323,33 @@ namespace openspace {
if (dictionary.hasKey(TransformationMatrixInfo.identifier)) {
_transformationMatrix = dictionary.value<glm::dmat4>(TransformationMatrixInfo.identifier);
}
_blendMode.addOptions({
{ BlendModeNormal, "Normal" },
{ BlendModeAdditive, "Additive" }
});
_blendMode.onChange([&]() {
switch (_blendMode) {
case BlendModeNormal:
setRenderBin(Renderable::RenderBin::Opaque);
break;
case BlendModeAdditive:
setRenderBin(Renderable::RenderBin::Transparent);
break;
default:
throw ghoul::MissingCaseException();
}
});
if (dictionary.hasKey(BlendModeInfo.identifier)) {
const std::string v = dictionary.value<std::string>(BlendModeInfo.identifier);
if (v == "Normal") {
_blendMode = BlendModeNormal;
}
else if (v == "Additive") {
_blendMode = BlendModeAdditive;
}
}
}
bool RenderablePlanesCloud::isReady() const {
@@ -351,11 +391,7 @@ namespace openspace {
if (_program) {
renderEngine.removeRenderProgram(_program);
_program = nullptr;
}
if (_hasLabel) {
glDeleteTextures(1, &_tTexture);
}
}
}
void RenderablePlanesCloud::renderBillboards(const RenderData& data, const glm::dmat4& modelViewMatrix,
@@ -427,26 +463,7 @@ namespace openspace {
RenderEngine& renderEngine = OsEng.renderEngine();
_fontRenderer->setFramebufferSize(renderEngine.renderingResolution());
/*auto size = ghoul::fontrendering::FontRenderer::defaultRenderer().boundingBox(
*_font,
"%s",
text
);*/
//float distanceFromCamera = glm::distance(data.camera.positionVec3(), glm::dvec3(textPosition));
/*if (_font == nullptr) {
size_t _fontSize = 30;
std::shared_ptr<ghoul::fontrendering::Font> _font = OsEng.fontManager().font("Mono", static_cast<float>(_fontSize),
ghoul::fontrendering::FontManager::Outline::Yes, ghoul::fontrendering::FontManager::LoadGlyphs::No);
}*/
/*size_t _fontSize = 50;
std::shared_ptr<ghoul::fontrendering::Font> _font = OsEng.fontManager().font("Mono", static_cast<float>(_fontSize),
ghoul::fontrendering::FontManager::Outline::No, ghoul::fontrendering::FontManager::LoadGlyphs::No);
*/
float scale = 0.0;
switch (_unit) {
case Meter:
@@ -512,9 +529,9 @@ namespace openspace {
glm::vec3 orthoUp = glm::normalize(glm::vec3(worldToModelTransform * glm::vec4(up, 0.0)));
if (_hasSpeckFile) {
/*if (_hasSpeckFile) {
renderBillboards(data, modelViewMatrix, projectionMatrix, orthoRight, orthoUp);
}
}*/
if (_hasLabel) {
renderLabels(data, modelViewProjectionMatrix, orthoRight, orthoUp);
@@ -579,17 +596,18 @@ namespace openspace {
);
bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {
LINFO("Cached file '" << cachedFile << "' used for Speck file '" << _file << "'");
//if (hasCachedFile) {
// LINFO("Cached file '" << cachedFile << "' used for Speck file '" << _file << "'");
success = loadCachedFile(cachedFile);
if (!success) {
FileSys.cacheManager()->removeCacheFile(_file);
// Intentional fall-through to the 'else' computation to generate the cache
// file for the next run
}
}
else {
// success = loadCachedFile(cachedFile);
// if (!success) {
// FileSys.cacheManager()->removeCacheFile(_file);
// // Intentional fall-through to the 'else' computation to generate the cache
// // file for the next run
// }
//}
//else
{
LINFO("Cache for Speck file '" << _file << "' not found");
LINFO("Loading Speck file '" << _file << "'");
@@ -757,7 +775,7 @@ namespace openspace {
// JCC: This should be moved to the RenderablePlanesCloud:
if (i == _textureVariableIndex) {
textureIndex = values[i];
textureIndex = static_cast<int>(values[i]);
}
}
@@ -767,55 +785,6 @@ namespace openspace {
return true;
}
bool RenderablePlanesCloud::readColorMapFile() {
std::string _file = _colorMapFile;
std::ifstream file(_file);
if (!file.good()) {
LERROR("Failed to open Color Map file '" << _file << "'");
return false;
}
std::size_t numberOfColors = 0;
// The beginning of the speck file has a header that either contains comments
// (signaled by a preceding '#') or information about the structure of the file
// (signaled by the keywords 'datavar', 'texturevar', and 'texture')
std::string line = "";
while (true) {
std::streampos position = file.tellg();
std::getline(file, line);
if (line[0] == '#' || line.empty()) {
continue;
}
// Initial number of colors
std::locale loc;
if (std::isdigit(line[0], loc)) {
std::string::size_type sz;
numberOfColors = std::stoi(line, &sz);
break;
}
else if (file.eof()) {
return false;
}
}
for (auto i = 0; i < numberOfColors; ++i) {
std::getline(file, line);
std::stringstream str(line);
glm::vec4 color;
for (auto j = 0; j < 4; ++j) {
str >> color[j];
}
_colorMapData.push_back(color);
}
return true;
}
bool RenderablePlanesCloud::readLabelFile() {
std::string _file = _labelFile;
std::ifstream file(_file);
@@ -1096,43 +1065,4 @@ namespace openspace {
}*/
program->deactivate();
}
GLuint RenderablePlanesCloud::loadTextGeometryForRendering() {
// The font render method creates its own vertex array object.
return 0;
}
void RenderablePlanesCloud::renderTextGeometry(GLuint vao) {
size_t _fontSize = 10;
std::shared_ptr<ghoul::fontrendering::Font> _font = OsEng.fontManager().font("Mono", static_cast<float>(_fontSize),
ghoul::fontrendering::FontManager::Outline::Yes, ghoul::fontrendering::FontManager::LoadGlyphs::No);
std::string text = "This is a text test!!";
auto size = ghoul::fontrendering::FontRenderer::defaultRenderer().boundingBox(
*_font,
"%s",
text
);
GLsizei framebufferSize = 10*static_cast<GLsizei>(ceil(size.boundingBox.x > size.boundingBox.y ? size.boundingBox.x : size.boundingBox.y));
framebufferSize = 256;
_fontRenderer = std::unique_ptr<ghoul::fontrendering::FontRenderer>(ghoul::fontrendering::FontRenderer::createDefault());
_fontRenderer->setFramebufferSize(glm::vec2(framebufferSize,framebufferSize));
glm::vec2 textPosition(0.0, 0.0);
static const float black[] = { 0.0f, 0.0f, 0.0f, 0.0f };
glClearBufferfv(GL_COLOR, 0, black);
_fontRenderer->render(
*_font,
textPosition,
_textColor,
"%s",
text.c_str());
}
} // namespace openspace

22
modules/digitaluniverse/rendering/renderableplanescloud.h
View File

@@ -87,8 +87,6 @@ namespace openspace {
GLuint textureToRenderTo, GLuint textureWidth, GLuint textureHeight);
GLuint loadPolygonGeometryForRendering();
void renderPolygonGeometry(GLuint vao);
GLuint loadTextGeometryForRendering();
void renderTextGeometry(GLuint vao);
void renderBillboards(const RenderData& data, const glm::dmat4& modelViewMatrix,
const glm::dmat4& projectionMatrix, const glm::vec3& orthoRight, const glm::vec3& orthoUp);
void renderLabels(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
@@ -96,7 +94,6 @@ namespace openspace {
bool loadData();
bool readSpeckFile();
bool readColorMapFile();
bool readLabelFile();
bool loadCachedFile(const std::string& file);
bool saveCachedFile(const std::string& file) const;
@@ -110,40 +107,29 @@ namespace openspace {
int _textMinSize;
int _planeStartingIndexPos;
int _textureVariableIndex;
GLuint _pTexture;
GLuint _tTexture;
int _textureVariableIndex;
properties::FloatProperty _alphaValue;
properties::FloatProperty _scaleFactor;
properties::Vec4Property _textColor;
properties::FloatProperty _textSize;
properties::BoolProperty _drawElements;
properties::OptionProperty _blendMode;
std::unique_ptr<ghoul::opengl::Texture> _polygonTexture;
std::unique_ptr<ghoul::opengl::Texture> _spriteTexture;
std::unique_ptr<ghoul::filesystem::File> _spriteTextureFile;
std::unique_ptr<ghoul::opengl::ProgramObject> _program;
std::unique_ptr<ghoul::fontrendering::FontRenderer> _fontRenderer;
std::shared_ptr<ghoul::fontrendering::Font> _font;
std::string _speckFile;
std::string _colorMapFile;
std::string _labelFile;
std::string _colorOptionString;
Unit _unit;
std::vector<float> _slicedData;
std::vector<float> _fullData;
std::vector<glm::vec4> _colorMapData;
std::vector<std::pair<glm::vec3, std::string>> _labelData;
std::unordered_map<std::string, int> _variableDataPositionMap;
std::unordered_map<int, std::string> _optionConversionMap;
std::vector<glm::vec2> _colorRangeData;
int _nValuesPerAstronomicalObject;
glm::dmat4 _transformationMatrix;