mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

temp before merge master

Browse Source
This commit is contained in:
elonolsson
2025-01-10 17:54:58 +01:00
parent 6c453eeff5
commit 44dfb6548a
14 changed files with 1418 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1325
config/schema/sgct.schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

2
ext/ghoul

Submodule ext/ghoul updated: df84293686...1c9121472f

1
include/openspace/interaction/joystickinputstate.h
View File

@@ -28,7 +28,6 @@
#include <ghoul/misc/assert.h>
#include <ghoul/misc/exception.h>
#include <ghoul/misc/stringconversion.h>
#include <ghoul/fmt.h>
#include <array>
#include <memory>
#include <string>

1
include/openspace/network/messagestructures.h
View File

@@ -25,7 +25,6 @@
#ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
#define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
#include <ghoul/fmt.h>
#include <ghoul/glm.h>
#include <ghoul/logging/logmanager.h>
#include <algorithm>

1
include/openspace/util/json_helper.inl
View File

@@ -22,7 +22,6 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <ghoul/fmt.h>
#include <ghoul/glm.h>
#include <ghoul/misc/dictionaryjsonformatter.h>
#include <type_traits>

1
include/openspace/util/spicemanager.h
View File

@@ -25,7 +25,6 @@
#ifndef __OPENSPACE_CORE___SPICEMANAGER___H__
#define __OPENSPACE_CORE___SPICEMANAGER___H__
#include <ghoul/fmt.h>
#include <ghoul/glm.h>
#include <ghoul/misc/assert.h>
#include <ghoul/misc/boolean.h>

1
modules/audio/ext/soloud Submodule

Submodule modules/audio/ext/soloud added at 1157475881

2
modules/fieldlinessequence/CMakeLists.txt
View File

@@ -30,6 +30,7 @@ set(HEADER_FILES
util/commons.h
util/kameleonfieldlinehelper.h
tasks/kameleonvolumetofieldlinestask.h
tasks/findlastclosedfieldlinestask.h
)
source_group("Header Files" FILES ${HEADER_FILES})
@@ -39,6 +40,7 @@ set(SOURCE_FILES
util/commons.cpp
util/kameleonfieldlinehelper.cpp
tasks/kameleonvolumetofieldlinestask.cpp
tasks/findlastclosedfieldlinestask.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})

5
modules/fieldlinessequence/fieldlinessequencemodule.cpp
View File

@@ -26,6 +26,7 @@
#include <modules/fieldlinessequence/rendering/renderablefieldlinessequence.h>
#include <modules/fieldlinessequence/tasks/kameleonvolumetofieldlinestask.h>
#include <modules/fieldlinessequence/tasks/findlastclosedfieldlinestask.h>
#include <openspace/documentation/documentation.h>
#include <openspace/util/factorymanager.h>
#include <ghoul/filesystem/filesystem.h>
@@ -66,13 +67,15 @@ void FieldlinesSequenceModule::internalInitialize(const ghoul::Dictionary&) {
FactoryManager::ref().factory<Renderable>();
ghoul_assert(factory, "No renderable factory existed");
fTask->registerClass<KameleonVolumeToFieldlinesTask>("KameleonVolumeToFieldlinesTask");
fTask->registerClass<FindLastClosedFieldLinesTask>("FindLastClosedFieldLinesTask");
factory->registerClass<RenderableFieldlinesSequence>("RenderableFieldlinesSequence");
}
std::vector<documentation::Documentation> FieldlinesSequenceModule::documentations() const
{
return {
KameleonVolumeToFieldlinesTask::documentation(),
FindLastClosedFieldLinesTask::Documentation(),
KameleonVolumeToFieldlinesTask::Documentation(),
RenderableFieldlinesSequence::Documentation()
};
}

26
modules/fieldlinessequence/tasks/findlastclosedfieldlines.cpp Normal file
View File

@@ -0,0 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2025 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/fieldlinessequence/tasks/findlastclosedfieldlines.h>

51
modules/fieldlinessequence/tasks/findlastclosedfieldlines.h Normal file
View File

@@ -0,0 +1,51 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2025 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_FIELDLINESSEQUENCE___FINDLASTCLOSEDFIELDLINESTASK___H__
#define __OPENSPACE_MODULE_FIELDLINESSEQUENCE___FINDLASTCLOSEDFIELDLINESTASK___H__
#include <openspace/util/task.h>
#include <filesystem>
namespace openspace {
class FindLastClosedFieldlinesTask : public Task {
public:
FindLastClosedFieldlinesTask(const ghoul::Dictionary& dictionary);
~FindLastClosedFieldlinesTask();
std::string description() overrider;
void perform(const Task::ProgressCallback& progressCallback) override;
static documentation::Documentaion Documentation();
private:
std::string _tracingVar;
std::filesystem::path _inputPath;
size_t _numberOfPointsOnBoundary = 0;
std::filesystem::path _outputFolder;
};
} // namespace openspace
#endif // __OPENSPACE_MODULE_FIELDLINESSEQUENCE___FINDLASTCLOSEDFIELDLINESTASK___H__

1
modules/globebrowsing/ext/geos Submodule

Submodule modules/globebrowsing/ext/geos added at e9ca7617f6

6
settings.json Normal file
View File

@@ -0,0 +1,6 @@
{
"config": "",
"profile": "default",
"started-before": true,
"version": 1
}

1
support/doxygen/css Submodule

Submodule support/doxygen/css added at 8cea9a073e