mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 13:29:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneccessary property browser dimensions

Browse Source
This commit is contained in:
sylvass
2021-11-15 15:31:19 -05:00
parent 21cdc9d5cb
commit 711ad51936
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/skybrowser/include/screenspaceskybrowser.h
View File

@@ -29,13 +29,13 @@ namespace openspace {
bool isAnimated();
void startFovAnimation(float fov);
void incrementallyAnimateToFov(float deltaTime);
glm::vec2 browserPixelDimensions();
void startSyncingWithWwt();
glm::dvec2 fineTuneVector(glm::dvec2 drag);
// Getters returning values
bool hasLoadedImages() const;
glm::vec2 browserPixelDimensions() const;
glm::ivec3 borderColor() const;
float verticalFov() const;
glm::dvec2 fieldsOfView();
@@ -87,7 +87,6 @@ namespace openspace {
// Properties
properties::FloatProperty _verticalFov;
properties::StringProperty _skyTargetId;
properties::Vec2Property _browserDimensions;
properties::IVec3Property _borderColor;
// Flags

33
modules/skybrowser/src/screenspaceskybrowser.cpp
View File

@@ -13,12 +13,6 @@
namespace {
constexpr const char* _loggerCat = "ScreenSpaceSkyBrowser";
constexpr const openspace::properties::Property::PropertyInfo BrowserDimensionInfo =
{
"BrowserDimensions",
"Browser Dimensions",
"The pixel dimensions of the sky browser."
};
constexpr const openspace::properties::Property::PropertyInfo VerticalFovInfo =
{
"VerticalFieldOfView",
@@ -42,9 +36,6 @@ namespace {
struct [[codegen::Dictionary(ScreenSpaceSkyBrowser)]] Parameters {
// [[codegen::verbatim(BrowserDimensionInfo.description)]]
std::optional<glm::vec2> browserDimensions;
// [[codegen::verbatim(VerticalFovInfo.description)]]
std::optional<float> verticalFov;
@@ -62,12 +53,6 @@ namespace openspace {
ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary)
: ScreenSpaceBrowser(dictionary)
, _browserDimensions(
BrowserDimensionInfo,
_dimensions,
glm::ivec2(0),
glm::ivec2(300)
)
, _verticalFov(VerticalFovInfo, 10.f, 0.1f, 70.f)
, _borderColor(BorderColorInfo, glm::ivec3(200), glm::ivec3(0), glm::ivec3(255))
, _skyTargetId(TargetIdInfo)
@@ -77,22 +62,15 @@ namespace openspace {
// Handle target dimension property
const Parameters p = codegen::bake<Parameters>(dictionary);
_browserDimensions = p.browserDimensions.value_or(_browserDimensions);
_verticalFov = p.verticalFov.value_or(_verticalFov);
_borderColor = p.borderColor.value_or(_borderColor);
_skyTargetId = p.targetId.value_or(_skyTargetId);
addProperty(_browserDimensions);
addProperty(_verticalFov);
addProperty(_borderColor);
addProperty(_skyTargetId);
_browserDimensions.onChange([&]() {
if (_skyTarget) {
glm::vec2 dim = browserPixelDimensions();
_skyTarget->setDimensions(dim);
}
});
_verticalFov.onChange([&]() {
if (_skyTarget) {
_skyTarget->setScale(_verticalFov);
@@ -211,6 +189,10 @@ namespace openspace {
return _skyTarget;
}
glm::vec2 ScreenSpaceSkyBrowser::browserPixelDimensions() {
return _dimensions.value();
}
bool ScreenSpaceSkyBrowser::isAnimated()
{
return _isFovAnimated;
@@ -361,7 +343,6 @@ namespace openspace {
glm::vec2 newSize = abs(scalingFactor) * _originalDimensions;
_texture->setDimensions(glm::ivec3(newSize, 1));
_objectSize = _texture->dimensions();
_browserDimensions = newSize;
}
glm::mat4 ScreenSpaceSkyBrowser::scaleMatrix() {
@@ -393,10 +374,6 @@ namespace openspace {
_scale = _originalScale * scalingFactor;
}
glm::vec2 ScreenSpaceSkyBrowser::browserPixelDimensions() const {
return _browserDimensions.value();
}
properties::FloatProperty& ScreenSpaceSkyBrowser::getOpacity() {
return _opacity;
}