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

enable wireframe rendering of models

Browse Source
This commit is contained in:
Joakim Kilby
2023-09-19 13:08:15 +02:00
parent b6c23ef025
commit 3a63055324
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/base/rendering/renderablemodel.cpp
View File

@@ -160,6 +160,13 @@ namespace {
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo RenderWireframeInfo = {
"RenderWireframe",
"Enable Wireframe Rendering",
"Enable Wireframe rendering for the Model",
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo BlendingOptionInfo = {
"BlendingOption",
"Blending Options",
@@ -271,6 +278,9 @@ namespace {
// [[codegen::verbatim(EnableDepthTestInfo.description)]]
std::optional<bool> enableDepthTest;
// [[codegen::verbatim(RenderWireframeInfo.description)]]
std::optional<bool> renderWireframe;
// [[codegen::verbatim(BlendingOptionInfo.description)]]
std::optional<std::string> blendingOption;
@@ -312,6 +322,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
, _modelScale(ModelScaleInfo, 1.0, std::numeric_limits<double>::epsilon(), 4e+27)
, _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0))
, _enableDepthTest(EnableDepthTestInfo, true)
, _renderWireframe(RenderWireframeInfo, false)
, _blendingFuncOption(
BlendingOptionInfo,
properties::OptionProperty::DisplayType::Dropdown
@@ -410,6 +421,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
_performShading = p.performShading.value_or(_performShading);
_enableDepthTest = p.enableDepthTest.value_or(_enableDepthTest);
_enableFaceCulling = p.enableFaceCulling.value_or(_enableFaceCulling);
_renderWireframe = p.renderWireframe.value_or(_renderWireframe);
if (p.vertexShader.has_value()) {
_vertexShaderPath = p.vertexShader->string();
@@ -437,6 +449,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
addProperty(_performShading);
addProperty(_enableFaceCulling);
addProperty(_enableDepthTest);
addProperty(_renderWireframe);
addProperty(_modelTransform);
addProperty(_pivot);
addProperty(_rotationVec);
@@ -840,6 +853,10 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
glDisable(GL_DEPTH_TEST);
}
if (_renderWireframe) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
}
if (!_shouldRenderTwice) {
// Reset manual depth test
@@ -984,6 +1001,10 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
glEnable(GL_DEPTH_TEST);
}
if (_renderWireframe) {
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
global::renderEngine->openglStateCache().resetBlendState();
global::renderEngine->openglStateCache().resetDepthState();
glActiveTexture(GL_TEXTURE0);