From 0a1c842345f4c07c2953c56140a580fb6b3cb9bc Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Fri, 28 May 2021 13:26:47 +0200 Subject: [PATCH] Some clean up --- data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset | 1 - data/assets/scene/solarsystem/missions/jwst/L2.asset | 2 +- ext/ghoul | 2 +- modules/base/rendering/renderableprism.cpp | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset index d05d88dfb6..10128c9d56 100644 --- a/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset +++ b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset @@ -14,7 +14,6 @@ local DISTANCE = 9.2E15; -- ra = 3h32m38.92s -- dec = -27d47m29.37s --- fov = 0.0516666667 degrees -- distance = 9.2E15 m (set to size of view sphere) local HUDFPosition = { Identifier = "HUDFPosition", diff --git a/data/assets/scene/solarsystem/missions/jwst/L2.asset b/data/assets/scene/solarsystem/missions/jwst/L2.asset index 0e029b500b..d3b3440a88 100644 --- a/data/assets/scene/solarsystem/missions/jwst/L2.asset +++ b/data/assets/scene/solarsystem/missions/jwst/L2.asset @@ -38,7 +38,7 @@ local L2Large = { RenderableType = "Opaque", Billboard = true, Size = 700E5, - Texture = "C:/Users/ElmQPC/Desktop/Malin/develop/images/jwst/circle.png", + Texture = circle .. "/circle.png", BlendMode = "Additive" }, Transform = { diff --git a/ext/ghoul b/ext/ghoul index 4d5fc43c46..c09f4fe759 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 4d5fc43c460679fa6e010a5bc85ad3c0a618974f +Subproject commit c09f4fe75994f803ea2d496864d984b6b91ff2e4 diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp index 23c1155123..08da527d2e 100644 --- a/modules/base/rendering/renderableprism.cpp +++ b/modules/base/rendering/renderableprism.cpp @@ -81,7 +81,7 @@ namespace { "The length of the prism in meters." }; - // Generate a vertices around the unit circle on the XY-plane + // Generate vertices around the unit circle on the XY-plane void getUnitCircleVertices(std::vector& vertices, int sectorCount) { float sectorStep = 2 * M_PI / sectorCount; float sectorAngle; // in radians @@ -130,7 +130,6 @@ RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary) , _lineWidth(LineWidthInfo, 1.f, 1.f, 20.f) , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) , _length(LengthInfo, 20.f, 1.f, 3.0e12f) - { const Parameters p = codegen::bake(dictionary);