Commit Graph

2407 Commits

Author SHA1 Message Date
Alexander Bock
4328476d26 Use more filesystem::path where applicable 2024-04-06 23:55:59 +02:00
Alexander Bock
4049501406 Adding a function to return whether OpenSpace currently is paused 2024-04-04 17:09:34 +02:00
Emma Broman
a82af895d7 Issue/3016 - Settings for jumpTo (#3080)
* Add script for jumpTo scene graph node and navigation state

* Add property to control how long the fading takes (navigation handler)

* Update GUI hash

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-04 10:20:24 +02:00
Emma Broman
19f0f707dc Issue/2174 - Show items with no GUI tag in asset in the GUI (#3133)
* Always add GUI properties, even if tag is not in the asset

To make objects wihtout GUI tag be included in the UI

* Hide the hover circle, to clean up scene menu list a little

* set root node gui hidden property to true

* Properly add the gui properties for all scene graph nodes (even root)

* Update GUI hash
2024-04-03 09:23:49 +02:00
Gene Payne
d16e016d49 Update refs to sgct and ghoul from master 2024-03-28 09:52:17 -06:00
Emma Broman
3f8bff5a62 General performance improvements (#3142)
* Adding some Tracy zones
* Move point cloud dataset loading to initialize function to speed up startup 
* Switch order of operations in memoryaware tile cache to speed up startup
* Move point cloud dataset loading to initialize function
* Add more Zone Scoped and rearrange SDSS loading
* More speed up

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2024-03-28 01:10:07 +01:00
Gene Payne
6146cf16b2 Merge-in all updates from master 2024-03-25 18:35:57 -06:00
Alexander Bock
49fc538c17 Rename fmt.h to format.h and enable audio module on default 2024-03-25 23:19:52 +01:00
Ylva Selling
f625dc296b Update PR according to comments 2024-03-25 11:23:00 +01:00
Ylva Selling
b347659510 Merge branch 'master' into issue/2645
# Conflicts:
#	src/documentation/documentationengine.cpp
#	src/properties/propertyowner.cpp
#	src/scripting/scriptengine.cpp
#	src/util/factorymanager.cpp
2024-03-25 11:14:09 +01:00
Alexander Bock
3ba346a227 Remove fmt::format and replace with std::format 2024-03-24 20:19:14 +01:00
Emma Broman
d2f5dd43a5 Include timestamp in navigation state (#3078)
* Add optional timestamp to navigation state

* add option to include timetamp when setting/loading navigation state

* Don't require file extension when loading navstate

for symmetry with save function

* Update Navstate docs

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-03-21 20:48:57 +01:00
Alexander Bock
e0ab7ae1d6 Coding style fixes 2024-03-19 14:49:44 +01:00
Emma Broman
f36868d1c4 Feature/textured points (#3068)
* WIP: Start usign texture arrays instead of just a single texture

Now the texture array is sucessfully created, sent over and sampled on the GPU

* Include information about the texture format alpha channel and do a conversion

* Make one draw wcall per texture array

* Add scale to size mapping and move to a separate component

* WIP: Make single textures work again, with texture array

Although this breaks the polygon cloud..

* Also make the polygon cloud work again

* Refactor rendering code

* handle array layer seprately from texture coordinates

* Make sure use size mapping uniform is always set

Fixes point cloud disappearing when multi-textures points are enabled

* Add has value check to size mapping

* Fix indentation

* Make sure points are rendered even when no texture is used

* Clean up texture handling a bit and add comment about storage creation

* Add comment and temporary asset changes

* Clean up handling of color mode (number of colro channels)

* Make interpolated points work with new rendering code

* Refactor

* Bring back check for valid index for color and size data

* Make sure to check if the provided data file exists

* Fix full path ont showing in error message

* Refactor rendering code a bit

* Change how the multitexture setup is configured in the asset and add documentation

Separating made documentation a lot easier..

* Add a todo comment for future discussion

* Add settings for texture compression

* Preserve aspects ratio of rendered textures

* Restructure input parameters for texture details

* Simplify color mode - we decided to not support grayscale

* Add option to set "useAlpha" from asset

* Enable texture per default and fix aspect ratio problem when no texture is used

* tiny refactor

* Fix polygon rendering that broke when adding texture compression

* Remove color in polygon shader

The color would be applied twice in rendering

* Restructure textures code and prevent loading the same texture twice

* Better handling of extra texture parameter in speck files

That does not lead to limitations in using dashes in texture names

* Add some docs and communicate texture mode to the user

* Fix so that single texture can be changed during runtime

* Allow changing compression and usealpha during runtime

* Update texture storage allocation to something that works in older OpenGL versions

* Add a check that checks if we use more texture layers than allowed

* Even more robust check of texture line in speck file (allow extra whitespaces)

* Update data mapping to include texture information and clean up code a bit

* Error handling and prevent loading non-used textures in texture map

* Update some docs

* Small cleanup

* Add one more error message for fault texture map file format

* Remove test version of tully images dataset

* Small refactor

* Add example asset

* Update Ghoul - for larger uniform cache

* Purge texture from ram when we're done with it

* Cleanup (comments, ugly png check, etc)

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

* Adress some more review comments and fix broken asset

* More code review fixes

* Read provided sizemapping parameter from asset

* Fix warnings from trying to shift 16 bit int 32 bits :)

* simplify datamapping hash string

* Update comment that was not 100% correct. The file names may be specified as relative paths to a folder

* Small update based on previous code review comments

* Fix multi textured points gui path not same as other points

* Update Folder description to reduce some confusion

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Prevent updates to polygon cloud texture during runtime

This lead to rendering problems.

* Add describing comments to data files

* Clarify why speck version is disabled per default

* Update and clarify confusing size mapping parameters

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Apply suggestions from code review

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
2024-03-19 13:17:25 +01:00
Alexander Bock
534f92c485 Second linting pass and adding .clang_tidy file (#3128) 2024-03-18 22:46:17 +01:00
Alexander Bock
6c89de373a Add the ability to convert TLE files to SPICE kernels and apply change to ISS (#3073)
* Fix orientation of ISS with dynamic frame kernel
2024-03-17 00:59:36 +01:00
Alexander Bock
2759c00e4b Pass through the code to address clang-tidy linting (#3083) 2024-03-17 00:58:50 +01:00
Alexander Bock
8cdea01b22 Remove support for XML configuration files in SGCT 2024-03-11 15:16:42 +01:00
Alexander Bock
9a6fe47d17 Fix up text formatting as path's no longer get quoted 2024-03-08 20:19:06 +01:00
Alexander Bock
fff6f8a627 General pass for code cleanup 2024-03-08 00:36:54 +01:00
GPayne
210e17b0bb Replaced std::getline usages with new ghoul::getline 2024-03-04 15:37:21 -07:00
Ylva Selling
fc2d48fa06 Rename functions for consistency 2024-03-04 14:14:23 +01:00
Alexander Bock
86c2c75b01 Coding style 2024-03-04 13:32:56 +01:00
Alexander Bock
b77e03dce2 Some general cleanup 2024-03-04 13:03:40 +01:00
Ylva Selling
1ceb3d1f5a Merge remote-tracking branch 'origin/master' into issue/2645 2024-03-04 10:55:49 +01:00
Ylva Selling
ecc930c24b Add event documentation 2024-03-01 16:14:46 +01:00
Alexander Bock
7a2efc66d6 Simplify profile loading and handling of the loading screen 2024-02-28 00:19:06 +01:00
Ylva Selling
2e078e4e32 Remove includes for json where they are no longer needed 2024-02-26 09:58:35 +01:00
Ylva Selling
4a8e964f89 Move generate json function from EventEngine to DocumentationEngine 2024-02-26 09:45:56 +01:00
Ylva Selling
a911f340ce Move action json generation from actionManager to DocumentationEngine 2024-02-26 09:19:45 +01:00
Ylva Selling
3fdac4a6d0 Move function from SceneLicenseWriter to DocumentationEngine and remove SceneLicenseWriter files 2024-02-26 09:10:52 +01:00
Alexander Bock
2fbcb0544e NavigationState handling (#3023)
* Change the navigation state format from Lua to JSON.  Add the ability to set the navigation state in the profile editor based on a file
2024-02-25 01:09:32 +01:00
Ylva Selling
74f4e27f43 Move property owner json documentation to documentation engine 2024-02-23 16:44:49 +01:00
Ylva Selling
126c62dc3a Move json documentation generation from keybindings to documentation engine 2024-02-23 16:44:22 +01:00
Ylva Selling
94aa098457 Move generated json documentation from factory manager to documentation engine 2024-02-23 16:17:02 +01:00
Ylva Selling
8bea02585c Remove unused function from DocumentationEngine that creates a string 2024-02-23 16:03:27 +01:00
Ylva Selling
5fdd2e9938 Move documentation generation for script engine from script engine into documentation engine 2024-02-23 15:53:28 +01:00
Ylva Selling
373f4ca924 Move documentation function from openspace engine to the documentation engine 2024-02-23 13:56:38 +01:00
Ylva Selling
e77443b825 Add events to documentation 2024-02-22 10:41:03 +01:00
Ylva Selling
6751b30c03 Add actions to documentation file 2024-02-22 09:10:51 +01:00
Emma Broman
8fddd55851 Fix a couple of point cloud related problems
* crash that occurs when loading an empty dataset
* trying to access outside of range when sampling color or size values
2024-02-20 08:40:00 +01:00
Alexander Bock
815dfe11f1 Add the ability to specify properties and requiring confirmation (#3006) 2024-02-15 15:56:19 +09:00
Alexander Bock
adad4ab0ff Make the DestinationFrame in the SpiceRotation option and use GALACTIC if it is not specified 2024-02-12 11:39:08 +09:00
Alexander Bock
1691b92575 Fix compile issue with the previous commit 2024-02-12 09:11:03 +09:00
Alexander Bock
15e3cbbb68 Add documentation to JSON loading functions 2024-02-10 10:23:20 +01:00
Alexander Bock
fa1847d235 Add Lua function to load a JSON file 2024-02-10 10:18:57 +01:00
Alexander Bock
d67cabf578 Coding style update 2024-02-06 16:34:12 +01:00
Alexander Bock
6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Emma Broman
2323a8ce50 Issue/2985 - Add asset with default cmaps (#3004)
* Allow changing color map during runtime

* Stary building asset with colormaps (currently using local files)

* Add option to invert the color maps

* Remove final use of local viridis file in example and fix broken cmap update

* Use synced resource for colormap files

* Update advanced colormapping example

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update data/assets/util/default_colormaps.asset

* Capitalize first letter of exported keys, to be more consistent with rest of code base

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-02-05 15:47:25 +01:00
Andreas Engberg
04ff09814d Add event topic (#3010)
* Add event topic

Add ability to subscribe to events via js-api

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Output an error if no status or event object is passed to payload

* fixed typo

* Report a warning if user tries to unsubscribe to a non registered event/type combination

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-01-24 13:51:55 +01:00