just a few changes. Bug of cutplanes backside not showing up detected when sun is activated

This commit is contained in:
ElonOlsson
2021-08-27 10:01:57 -04:00
parent 8a63c15383
commit 4e6323cd8f
8 changed files with 12 additions and 10 deletions
@@ -25,7 +25,7 @@ local fieldlines = {
},
Rotation = {
-- This is a rotation matrix to go from Carrington longitude referens frame to HEEQ180
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame.Identifier is
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame. Identifier is
-- referring to. At the reference time, MAS_seq = 0, 2000-07-14T08:33:37.105 the Carrington
-- longitude was 309.3 degrees.
-- Difference from HEEQ => 360-309.3=50.7
@@ -25,7 +25,7 @@ local Fluxnodes = {
},
Rotation = {
-- This is a rotation matrix to go from Carrington longitude referens frame to HEEQ180
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame.Identifier is
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame. Identifier is
-- referring to. At the reference time, MAS_seq = 0, 2000-07-14T08:33:37.105 the Carrington
-- longitude was 309.3 degrees.
-- Difference from HEEQ => 360-309.3=50.7
@@ -21,7 +21,7 @@ local EquatorialCutplane = {
Transform = {
Rotation = {
-- This is a rotation matrix to go from Carrington longitude referens frame to HEEQ180
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame.Identifier is
-- which is what the renderables parent transforms.HEEQ180ReferenceFrame. Identifier is
-- referring to. At the reference time, MAS_seq = 0, 2000-07-14T08:33:37.105 the Carrington
-- longitude was 309.3 degrees.
-- Difference from HEEQ => 360-309.3=50.7
@@ -2,12 +2,12 @@ local TexturesPath = asset.syncedResource({
Name = "Bastille Day Magnetogram",
Type = "HttpSynchronization",
Identifier = "bastille_day_magnetogram",
Version = 2
Version = 3
})
asset.export("TexturesPath", TexturesPath)
-- Torok, T., Downs, C., Linker, J. A., Lionello, R., Titov, V. S., Mikic, Z., Riley, P., Caplan, R. M., and Wijaya, J. (2018).
-- Torok, T., Downs, C., Linker, J. A., Lionello, R., Titov, V. S., Mikic, Z., Riley, P., Caplan, R. M., and Wijaya, J. (2018).
-- Sun-to-Earth MHD Simulation of the 2000 July 14 Bastille Day Eruption.
-- ApJ,
-- 856:75.
-1
View File
@@ -8,7 +8,6 @@
"scene/solarsystem/heliosphere/bastille_day/fluxnodes",
"scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane",
"scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend",
"scene/solarsystem/heliosphere/bastille_day/focuspoint",
"scene/solarsystem/heliosphere/bastille_day/lightindicator",
"scene/solarsystem/heliosphere/bastille_day/magnetogram",
"scene/solarsystem/heliosphere/bastille_day/magnetogram_textures",
@@ -38,7 +38,6 @@
#include <ghoul/io/texture/texturereader.h>
// Test debugging tools more then logmanager
#include <ghoul/logging/logmanager.h>
//#include <ghoul/logging/consolelog.h>
#include <optional>
namespace {
@@ -272,6 +271,11 @@ void RenderablePlaneTimeVaryingImage::update(const UpdateData& data) {
}
}
//void RenderablePlaneTimeVaryingImage::render(const RenderData& data, RendererTasks& t) {
// RenderablePlane::render(data, t);
// glDisable(GL_CULL_FACE);
//}
// Requires time to be formated as such: 'YYYY-MM-DDTHH-MM-SS-XXX'
void RenderablePlaneTimeVaryingImage::extractTriggerTimesFromFileNames() {
for (const std::string& filePath : _sourceFiles) {
@@ -48,12 +48,12 @@ public:
bool isReady() const override;
void update(const UpdateData& data) override;
//void render(const RenderData& data, RendererTasks&);
static documentation::Documentation Documentation();
protected:
virtual void bindTexture() override;
//virtual void unbindTexture() override;
private:
void loadTexture();
@@ -283,8 +283,8 @@ void RenderableTimeVaryingSphere::initializeGL() {
if (!success) {
return;
}
computeSequenceEndTime();
computeSequenceEndTime();
loadTexture();
}
@@ -575,5 +575,4 @@ void RenderableTimeVaryingSphere::loadTexture() {
_isLoadingTexture = false;
}
}
} // namespace openspace