Commit Graph

2440 Commits

Author SHA1 Message Date
Malin E
f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Malin E
a877324c95 Make sure model rendering works with an odd number of atmospheres 2023-02-21 11:46:16 +01:00
Malin E
05252b8258 Merge branch 'master' into feature/model-opacity
* Solve conflict in iss.asset
2023-02-16 12:07:12 +01:00
Emma Broman
352c9dd5ec Touch module code cleanup (#2465)
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041

* General refactoring of code and removing redundant code

* Make touch markers prettier (change default color and smoothen edges)

* Add module property to control which renderable types are "directly touchable"

* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")

* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Alexander Bock
c242104baf Improve the reporting of specification errors 2023-02-13 22:16:23 +01:00
Adam Rohdin
756ade4e7d DashboardItem now listens to paramter 'enabled' in constructor 2023-02-13 16:09:07 +01:00
Malin E
14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E
f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Alexander Bock
3b06b53187 Provide error message if a GuiPath does not start with / ; Automatically add / in the Profile editor. Default initialize all paths to / (closes #2318) 2023-01-28 22:38:00 +01:00
Alexander Bock
f1e2765da9 Add support for multiple occurrances of -c commandline argument 2023-01-26 21:08:37 +01:00
Alexander Bock
ac7bf6f8f7 Use the et2utc function in case the normal date conversion fails 2023-01-26 18:24:30 +01:00
Alexander Bock
26d5ed0a08 Add the ability to pass a script to the setPropertyValue function that is called after interpolation has finished 2023-01-22 14:45:56 +01:00
Alexander Bock
45b1b9e7e7 Add tests for FileVerifier, DirectoryVerifier, and DateTimeVerifier (closes #1563) 2023-01-21 22:14:09 +01:00
Alexander Bock
2926250be9 Add function to return a list of all tags 2023-01-21 21:02:02 +01:00
Alexander Bock
ac228c9c87 Add a new dashboard item that shows the state of input devices (closes #2415) 2023-01-21 18:29:17 +01:00
Alexander Bock
59a8a006ee Correctly deinitialize scenegraph nodes that are added at runtime 2023-01-21 16:52:14 +01:00
Malin E
c10361d81e Undo misstake 2023-01-12 15:20:00 +01:00
Malin E
c5d2e75854 Some clean up 2023-01-12 14:33:39 +01:00
Malin E
a59ae2661d Slider adjustment for max distance property 2023-01-12 11:48:04 +01:00
Malin E
8ed9d083cb Adjust camera position if outside the max distance limit 2023-01-12 11:01:32 +01:00
Malin E
659dab821c Add property to limit zoom out distance in OrbitalNavigator 2023-01-11 17:36:19 +01:00
Malin E
a990e1679b Add lua function to set minimum allowed distance for the OrbitalNavigator 2023-01-11 16:40:57 +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
Emma Broman
53f6c8cbeb Add property to disable all mouse input in OpenSpace engine (#2361)
Solves problem with double inputs when using touch interaction
2022-12-16 14:07:22 +01:00
Malin E
560c58e499 Add manual depth test between models 2022-12-07 14:19:12 +01:00
Malin E
574b789338 Merge branch 'master' into feature/model-opacity
* Solve conflicts in nebula and asset_helper assets
2022-12-01 10:20:05 +01:00
Alexander Bock
44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Malin E
433c2cd3a9 Remove unused hdr framebuffer and texture 2022-11-15 15:57:25 +01:00
Malin E
6c223cd8ae Some clean up 2022-11-03 11:15:21 +01:00
Malin E
0bb6d25e2e Add a new bin in the end of the pipeline 2022-11-03 10:29:53 +01:00
Malin E
8e2f5450f4 Add documentation for texture access functions 2022-11-02 17:34:00 +01:00
Malin E
2fe78e949d Merge branch 'master' into feature/model-opacity 2022-11-02 13:51:22 +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
Malin E
a77e227430 Re-use textures in the FramebufferRenderer for model opacity rendering 2022-10-28 10:12:56 +02: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
524b78f5d2 Add the ability to disablee keybindings (closes #2238) 2022-10-14 11:24:44 +02:00
Ylva Selling
d998d434ea Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-07 15:04:49 -04:00
Emma Broman
06a22c2592 Fix problem with camera path not finishing properly on skipToEnd 2022-10-07 09:17:58 +02:00
Emma Broman
8192292229 Move findNodeNearTarget function from path to pathnavigator
To reduce conflicts between wisdome installation branch and master
2022-10-06 22:25:27 +02:00
Emma Broman
5a970ee6e0 Add a function to skip immediately to the end of a playing camera path 2022-10-06 22:13:06 +02:00
Ylva Selling
cfb3859bb5 Merge remote-tracking branch 'origin/feature/skybrowser-reload' into issue/2029
# Conflicts:
#	modules/skybrowser/include/renderableskytarget.h
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/skybrowsermodule.cpp
2022-10-06 15:33:40 -04:00
Alexander Bock
8f98320bf6 Add new functions into the window delegate to query node id 2022-09-21 14:34:36 +02:00
GPayne
acf45e858b Fixed file path bug with converting session recording version 2022-09-11 19:42:56 -06: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
979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Emma Broman
0cc5704b6a Add isGuiWindow check for mouse and keyboard callbacks
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)

Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup

Now, the GUI modules check to see if the clicked window is actually an interaction window
2022-08-05 11:41:10 +02:00
Alexander Bock
811c4a3138 Add the ability to pass a boolean value into the require function that gets passed into the loaded asset as a enabled property (#2187)
* Add the ability to pass a boolean value into the require function that gets passed into the loaded asset as a `enabled` property
2022-08-02 13:12:07 +02:00
Alexander Bock
41a4171aeb Expose the SGCT statistics information through a property in the RenderEngine (closes #2195) 2022-08-01 15:27:05 +02:00
Alexander Bock
a4e3af700c Add option to break on floating point exceptions 2022-08-01 14:29:45 +02:00