mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-07 12:10:52 -06:00
No longer enforce a scale of 1 for screenspacedashboards
This commit is contained in:
@@ -85,9 +85,6 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
|
||||
_useMainDashboard = p.useMainDashboard.value_or(_useMainDashboard);
|
||||
addProperty(_useMainDashboard);
|
||||
|
||||
_scale = 1.f;
|
||||
_scale.setMaxValue(15.f);
|
||||
|
||||
if (_useMainDashboard && p.items.has_value()) {
|
||||
throw ghoul::RuntimeError("Cannot specify items when using the main dashboard");
|
||||
}
|
||||
@@ -97,7 +94,7 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
|
||||
}
|
||||
|
||||
if (p.items.has_value()) {
|
||||
ghoul_assert(_useMainDashboard, "Cannot add items to the main dashboard");
|
||||
ghoul_assert(!_useMainDashboard, "Cannot add items to the main dashboard");
|
||||
for (const ghoul::Dictionary& item : *p.items) {
|
||||
std::unique_ptr<DashboardItem> i = DashboardItem::createFromDictionary(item);
|
||||
_dashboard.addDashboardItem(std::move(i));
|
||||
|
||||
Reference in New Issue
Block a user