mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 09:41:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,885 Commits 99 Branches 46 Tags
6dfd0cd3a8844cebf16cdcea67d1c85453b71e7b
Commit Graph

694 Commits

Author SHA1 Message Date
Ylva Selling
9a1e6b8002 Remove old json functions 2023-04-26 16:58:55 -04:00
Ylva Selling
d267bc0dad Remove documentation generator 2023-04-25 16:44:10 -04:00
Ylva Selling
948fdd024b Remove generateJson function from the DocumentationGenerator and move sortJson function to json_helper 2023-04-25 16:32:04 -04:00
Ylva Selling
3ff6169771 Merge remote-tracking branch 'origin/master' into feature/documentation-overhaul 
# Conflicts:
#	src/scripting/scriptengine.cpp
 2023-04-12 17:37:28 -04:00
Alexander Bock
a711591c09 Update Doxygen (#2537) 
* Modernizing Doxygen
* Remove warnings for Doxygen
 2023-03-06 23:41:24 +01:00
Ylva Selling
c645fa81b6 Merge remote-tracking branch 'origin/master' into feature/documentation-overhaul 
# Conflicts:
#	src/properties/propertyowner.cpp
#	src/scripting/scriptengine.cpp
 2023-03-02 11:28:33 -05:00
Alexander Bock
ac7bf6f8f7 Use the et2utc function in case the normal date conversion fails 2023-01-26 18:24:30 +01:00
Ylva Selling
38fee89eec Use nlohmann::json for all documentation. 
The printout is verified to be the same as before, except for 1) some escape characters which are no longer necessary and 2) strings that contained arrays have now become arrays in the json
 2023-01-10 17:20:20 -05:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Alexander Bock
6249fa6d89 Collection of a number of changes (#2286) 
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
 2022-10-30 12:54:14 +01:00
Alexander Bock
aeb366ae61 Add new dashboard item to show elapsed times (closes #2234). Cleanup handling of TimeConversion and add unit testing 2022-10-15 00:08:22 +02:00
Alexander Bock
664eb60f4f Increase the compile times by including more precompiled headers (#2217) 
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
 2022-08-26 16:32:21 +02:00
Alexander Bock
a4e3af700c Add option to break on floating point exceptions 2022-08-01 14:29:45 +02:00
Alexander Bock
163ac4dcef Cleanup of mostly asset files 
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
 2022-07-28 17:21:59 +02:00
Alexander Bock
9cc4c595a8 Code Cleanup (#2191) 
* constexpr const -> constexpr
* const char* -> std::string_view
 2022-07-25 15:57:45 +02:00
Alexander Bock
10ec6d3013 Revert pragma warnings 2022-07-11 14:26:13 +02:00
Alexander Bock
0b62d5cc4b Disable unknown pragma warnings and adapt to it 2022-07-05 14:27:40 +02:00
Alexander Bock
9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163) 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
 2022-06-28 00:46:01 +02:00
Alexander Bock
9715d22af0 Include the version number in the uid of the HttpSynchronization (closes #2081) 2022-05-06 00:53:56 -07:00
Alexander Bock
5751fe26d3 Cleanup handling of warnings (#2030) 2022-04-16 20:57:29 +02:00
Alexander Bock
d360f2ae59 Address Visual Studio analyzer warnings 2022-04-12 00:58:11 +02:00
Alexander Bock
5fc5ce318a Set default values for starting time and start camera (closes #1981) 2022-04-08 16:05:56 +02:00
Alexander Bock
3844df20c9 Feature/codegen lua (#1906) 
Adapting Lua functions to new codegen functionality
Improve the documentation itself
Add some styling to generated documentation
Have parameter names for Lua-defined Lua function documentation

Co-authored-by: Emma Broman <emma.broman@liu.se>
 2022-03-21 09:05:37 +01:00
Alexander Bock
78fd5b78da Wait for initialization when adding assets at runtime. Correctly destroy the RenderableGalaxy shader when deinitializing (closes #1601) 2022-02-22 23:24:37 +01:00
Alexander Bock
40ed640bc8 Simplify the function signature of the FactoryManager function 2022-02-12 00:55:15 +01:00
Emma Broman
91b0581d39 Introduce engine modes to handle Camera path and session recording transitions 
* Clarifies which system is control over time and camera at what time
* Fixes #1845
* Prevent invalid switching between session recoring and camera path playback
* Some cleanup, mosly of SessionRecording and NavigationHandler. Also, remove ExternInteraction and some other unused/nonexisting functions
 2022-02-03 16:08:21 +01:00
Alexander Bock
21df9066e1 Make use of the new map feature in codegen (#1801) 2022-01-02 13:36:41 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
debcb43ade Feature/assets (#1784) 
General overhaul of the Asset loading system
 2021-12-19 18:04:01 +01:00
ElonOlsson
d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
Alexander Bock
4a860fb01d Some code facelifting 2021-10-14 10:31:46 +02:00
Alexander Bock
76dd45e5ce Event System (#1741) 
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
 2021-10-11 21:53:00 +02:00
ElonOlsson
03371c6cdb Merge branch 'master' into thesis/2020/radiation 2021-10-05 14:52:38 -04:00
GPayne
a4d84d8703 Code review changes on new profile initialization 2021-09-16 23:11:02 -06:00
ElonOlsson
423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
GPayne
51f6c9d45b Rearranged profile initializations and verified that all init correctly 2021-09-12 21:05:00 -06:00
GPayne
cd50c3e4cf Working non-assetized initializations for profile sections besides modules and interesting nodes 2021-09-07 21:55:44 -06:00
Alexander Bock
34985f64a6 Feature/keybindings (#1708) 
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
 2021-08-18 10:58:20 +02:00
ElonOlsson
743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths 
# Conflicts:
#	src/rendering/abufferrenderer.cpp
 2021-08-09 15:21:08 +02:00
GPayne
2e746e14f1 Formatting changes per code review 2021-07-30 13:41:49 -06:00
GPayne
283e1b5c16 Merge master into issue/1669 to fix build conflict 2021-07-30 13:13:14 -06:00
Alexander Bock
5b3a66156c Remove unnecessary template specification for lock_guard 2021-07-30 14:48:08 +02:00
GPayne
892adf62bf Eliminate duplicate frames at time transitions when saving screenshot frames during playback 2021-07-19 23:33:10 -06:00
Emma Broman
de8005be4d Split up path helper functions to separate, more specific, files 
Some in Ghoul and some in OpenSpace core util
 2021-07-14 10:22:48 +02:00
Emma Broman
18a0a89030 Remove fogotten camera file (moved to another folder) 2021-07-14 10:22:41 +02:00
GPayne
14af0e5a93 Time manager uses simulated application time during playback-with-frames 2021-07-11 14:43:54 -06:00
Emma Broman
16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts 
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
 2021-07-09 15:43:17 +02:00
Malin Ejdbo
21204e8367 Address PR comments 2021-07-01 17:38:28 +02:00
Malin Ejdbo
9dc2b3348b Clean up 2021-06-29 10:06:19 +02:00