Add scale to topic

This commit is contained in:
Ylva Selling
2022-05-04 12:27:44 -04:00
parent 9a49966fb6
commit d3a955e6be
3 changed files with 6 additions and 0 deletions

View File

@@ -74,6 +74,7 @@ public:
bool isFacingCamera() const;
void setEnabled(bool isEnabled);
float depth();
float scale() const;
// Screen space functionality in these coords: [-1,1][-ratio,ratio]
glm::vec2 screenSpacePosition();

View File

@@ -198,6 +198,7 @@ ghoul::Dictionary TargetBrowserPair::dataAsDictionary() const {
res.setValue("isFacingCamera", isFacingCamera());
res.setValue("isUsingRae", isUsingRadiusAzimuthElevation());
res.setValue("selectedImages", selectedImages());
res.setValue("scale", static_cast<double>(_browser->scale()));
res.setValue("opacities", _browser->opacities());
std::vector<std::pair<std::string, glm::dvec3>> copies = renderCopies();

View File

@@ -436,6 +436,10 @@ float ScreenSpaceRenderable::depth() {
cartesianToSpherical(_cartesianPosition).x;
}
float ScreenSpaceRenderable::scale() const {
return _scale;
}
void ScreenSpaceRenderable::createShaders() {
ghoul::Dictionary dict = ghoul::Dictionary();