mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-31 00:18:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move data loading to initialize function

Browse Source
This commit is contained in:
Andreas Engberg
2026-01-30 11:18:35 +01:00
parent 339562752d
commit 24525cb2b1
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/volume/rendering/renderablevolumevectorfield.cpp
View File

@@ -222,8 +222,8 @@ RenderableVectorField::RenderableVectorField(const ghoul::Dictionary& dictionary
if (p.script.has_value()) {
_luaScriptFile = p.script.value().string();
// Subscribe to changes in the Lua script file, @TODO can this be combined with the
// code below?
// Subscribe to changes in the Lua script file, @TODO can this be combined with
// the duplicate code below?
_luaScriptFileHandle =
std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value()
);
@@ -262,8 +262,7 @@ RenderableVectorField::RenderableVectorField(const ghoul::Dictionary& dictionary
global::scriptEngine->initializeLuaState(_state);
}
void RenderableVectorField::initializeGL()
{
void RenderableVectorField::initialize() {
std::filesystem::path dataFile = absPath(_sourceFile);
if (!std::filesystem::is_regular_file(dataFile)) {
throw ghoul::RuntimeError(std::format("Could not load data file '{}'", dataFile));
@@ -285,7 +284,10 @@ void RenderableVectorField::initializeGL()
computeFieldLinesParallel();
_vectorFieldIsDirty = false;
}
void RenderableVectorField::initializeGL()
{
_program = global::renderEngine->buildRenderProgram(
"vectorfield",
absPath("${MODULE_VOLUME}/shaders/vectorfield_vs.glsl"),
@@ -603,22 +605,12 @@ void RenderableVectorField::computeFieldLinesParallel() {
lua_getglobal(_state, "filter");
// First argument (x,y,z) is the position of the arrow (averaged)
ghoul::lua::push(_state, i.position);
// Second argument (vx, vy, vz) is the direction of the voxel vector (averaged)
// Second argument (vx, vy, vz) is the direction of the voxel vector
// (averaged)
ghoul::lua::push(_state, i.direction);
const int success = lua_pcall(_state, 2, 1, 0);
// // First argument (x,y,z) is the position of the arrow (averaged)
// ghoul::lua::push(_state, i.position.x);
// ghoul::lua::push(_state, i.position.y);
// ghoul::lua::push(_state, i.position.z);
// // Second argument (vx, vy, vz) is the direction of the voxel vector (averaged)
// ghoul::lua::push(_state, i.direction.x);
// ghoul::lua::push(_state, i.direction.y);
// ghoul::lua::push(_state, i.direction.z);
// const int success = lua_pcall(_state, 6, 1, 0);
if (success != 0) {
LERROR(
std::format(

4
modules/volume/rendering/renderablevolumevectorfield.h
View File

@@ -63,18 +63,17 @@ public:
~RenderableVectorField() override = default;
void initialize() override;
void initializeGL() override;
void deinitializeGL() override;
bool isReady() const override;
void render(const RenderData& data, RendererTasks& renderTask) override;
void update(const UpdateData& data) override;
static documentation::Documentation Documentation();
private:
void computeFieldLinesParallel();
@@ -131,7 +130,6 @@ private:
};
};
} // namespace openspace::volume
#endif // __OPENSPACE_MODULE_VOLUME_RENDERABLEVECTORFIELD___H__