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

add FOV-mode to renderable prism

Browse Source
This commit is contained in:
Joakim Kilby
2024-04-23 09:55:39 +02:00
parent 6723eb0184
commit 1012841982
2 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
modules/base/rendering/renderableprism.cpp
View File

@@ -59,6 +59,22 @@ namespace {
openspace::properties::Property::Visibility::User
};
constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
"Width",
"Width",
"The width of the prism's shape in meters",
// @VISIBILITY(2.8)
openspace::properties::Property::Visibility::User
};
constexpr openspace::properties::Property::PropertyInfo HeightInfo = {
"Height",
"Height",
"The height of the prism's shape in meters",
// @VISIBILITY(2.8)
openspace::properties::Property::Visibility::User
};
constexpr openspace::properties::Property::PropertyInfo BaseRadiusInfo = {
"BaseRadius",
"Base Radius",
@@ -109,6 +125,12 @@ namespace {
// [[codegen::verbatim(LengthInfo.description)]]
std::optional<float> length;
// [[codegen::verbatim(WidthInfo.description)]]
std::optional<float> width;
// [[codegen::verbatim(HeightInfo.description)]]
std::optional<float> height;
};
#include "renderableprism_codegen.cpp"
} // namespace
@@ -124,6 +146,8 @@ RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary)
, _nShapeSegments(SegmentsInfo, 6, 3, 32)
, _nLines(LinesInfo, 6, 0, 32)
, _radius(RadiusInfo, 10.f, 0.f, 3e20f)
, _width(WidthInfo, 0.f, 0.f, 3e20f)
, _height(HeightInfo, 0.f, 0.f, 3e20f)
, _baseRadius(BaseRadiusInfo, 10.f, 0.f, 3e20f)
, _lineWidth(LineWidthInfo, 1.f, 1.f, 20.f)
, _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -144,6 +168,14 @@ RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary)
_radius = p.radius.value_or(_radius);
addProperty(_radius);
_width.onChange([this]() { _prismIsDirty = true; });
_width = p.width.value_or(_width);
addProperty(_width);
_height.onChange([this]() { _prismIsDirty = true; });
_height = p.height.value_or(_height);
addProperty(_height);
_baseRadius.setExponent(12.f);
_baseRadius.onChange([this]() { _prismIsDirty = true; });
// Use the "regular" radius as default if no value was provided
@@ -218,6 +250,14 @@ void RenderablePrism::updateVertexData() {
std::vector<VertexXYZ> unitVertices = createRingXYZ(_nShapeSegments.value(), 1.f);
std::vector<VertexXYZ> unitVerticesLines = createRingXYZ(_nLines.value(), 1.f);
// hacked-up FOV adaptation
const auto doFOV = (_width > 0.f && _height > 0.f && _nShapeSegments == 4 && _nLines == 4);
const auto rot = glm::rotate(glm::mat4(1), glm::radians(-45.f), glm::vec3(0, 0, 1));
const auto NW = rot * glm::vec4(-_width / 2, _height / 2, 0.f, 1.f);
const auto SW = rot * glm::vec4(-_width / 2, -_height / 2, 0.f, 1.f);
const auto SE = rot * glm::vec4(_width / 2, -_height / 2, 0.f, 1.f);
const auto NE = rot * glm::vec4(_width / 2, _height / 2, 0.f, 1.f);
// Put base vertices into array
for (int j = 0; j < _nShapeSegments; j++) {
const float ux = unitVertices[j].xyz[0];
@@ -228,14 +268,34 @@ void RenderablePrism::updateVertexData() {
_vertexArray.push_back(0.f); // z
}
// Put top shape vertices into array
for (int j = 0; j < _nShapeSegments; j++) {
const float ux = unitVertices[j].xyz[0];
const float uy = unitVertices[j].xyz[1];
if (doFOV) {
// Put top shape vertices into array
_vertexArray.push_back(NW.x);
_vertexArray.push_back(NW.y);
_vertexArray.push_back(_length);
_vertexArray.push_back(ux * _radius); // x
_vertexArray.push_back(uy * _radius); // y
_vertexArray.push_back(_length); // z
_vertexArray.push_back(SW.x);
_vertexArray.push_back(SW.y);
_vertexArray.push_back(_length);
_vertexArray.push_back(SE.x);
_vertexArray.push_back(SE.y);
_vertexArray.push_back(_length);
_vertexArray.push_back(NE.x);
_vertexArray.push_back(NE.y);
_vertexArray.push_back(_length);
}
else {
// Put top shape vertices into array
for (int j = 0; j < _nShapeSegments; j++) {
const float ux = unitVertices[j].xyz[0];
const float uy = unitVertices[j].xyz[1];
_vertexArray.push_back(ux * _radius); // x
_vertexArray.push_back(uy * _radius); // y
_vertexArray.push_back(_length); // z
}
}
// Put the vertices for the connecting lines into array
@@ -262,9 +322,35 @@ void RenderablePrism::updateVertexData() {
_vertexArray.push_back(0.f); // z
// Top
_vertexArray.push_back(ux * _radius); // x
_vertexArray.push_back(uy * _radius); // y
_vertexArray.push_back(_length); // z
if (!doFOV) {
_vertexArray.push_back(ux * _radius); // x
_vertexArray.push_back(uy * _radius); // y
_vertexArray.push_back(_length); // z
}
else {
switch (j) {
case 0:
_vertexArray.push_back(NW.x);
_vertexArray.push_back(NW.y);
_vertexArray.push_back(_length);
break;
case 1:
_vertexArray.push_back(SW.x);
_vertexArray.push_back(SW.y);
_vertexArray.push_back(_length);
break;
case 2:
_vertexArray.push_back(SE.x);
_vertexArray.push_back(SE.y);
_vertexArray.push_back(_length);
break;
case 3:
_vertexArray.push_back(NE.x);
_vertexArray.push_back(NE.y);
_vertexArray.push_back(_length);
break;
}
}
}
}

2
modules/base/rendering/renderableprism.h
View File

@@ -63,6 +63,8 @@ private:
properties::IntProperty _nShapeSegments;
properties::IntProperty _nLines;
properties::FloatProperty _radius;
properties::FloatProperty _width;
properties::FloatProperty _height;
properties::FloatProperty _baseRadius;
properties::FloatProperty _lineWidth;
properties::Vec3Property _lineColor;