mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 07:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,621 Commits 83 Branches 46 Tags
b4ad158ee556d2518733f40fec3f1c90411b7aca
Commit Graph

2284 Commits

Author SHA1 Message Date
Ylva Selling
b4ad158ee5 Merge pull request #2603 from OpenSpace/feature/missions 
Feature/missions
 2023-04-14 15:19:37 -04:00
Malin E
d500c93c8e Merge pull request #2550 from OpenSpace/feature/model-opacity 
Feature/model opacity
 2023-04-13 17:26:22 +02:00
Ylva Selling
3a5015e182 Fix comments on PR 2023-04-13 11:25:23 -04:00
Malin E
4bda27dcdf Start to address PR comments 2023-04-13 13:30:16 +02:00
Malin E
e0a33a257a Merge branch 'master' into feature/min-max-distance 2023-04-13 12:43:35 +02:00
Malin E
6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02:00
Alexander Bock
19642e8120 Jenkins compile fix 2023-04-12 22:26:19 +02:00
Ylva Selling
51a48d2112 Merge remote-tracking branch 'origin/master' into feature/missions 2023-04-12 16:09:42 -04:00
Malin E
dccd439dde Merge branch 'master' into feature/model-opacity 
* Solve conflicts in renderablemodel.cpp and renderabletrail.cpp
 2023-04-12 17:03:40 +02:00
Ylva Selling
bb7079a845 Rename important date to milestone 2023-04-11 15:58:24 -04:00
Ylva Selling
5a1caf31dc Add link to mission 2023-04-11 15:24:48 -04:00
Ylva Selling
24e1fe2baf Add image & description to mission topic 2023-04-10 16:18:28 -04:00
Alexander Bock
9022aad479 Adding static Settings to Renderable (#2578) 
* Add settings to Renderable to control whether the renderbin is updated based on Opacity
* Remove duplicate RenderBin specification for RenderableSphere
* Remove unnecessary RenderBin specifications of Lagrange points
* Don't automatically update the renderbin for RenderableLabel and RenderablePlane
* Remove extra `setRenderBinFromOpacity` from RenderableSpheres
* Move information about whether a renderable should be updated when disabled
* Some cleanup of Renderable class
* Don't update the renderbin automatically if the user specified the renderbin manually
 2023-04-10 20:49:01 +02:00
Ylva Selling
15ec4aa41a Add important dates to misson 2023-04-10 09:43:01 -04:00
Malin E
bb3c9f013e Merge branch 'master' into feature/model-opacity 
* Resolve conflicts in shaders for models and modelprojections
 2023-04-06 13:43:23 +02:00
Emma Broman
554373eb3e Fading of propertyowners through GUI, and more owners with fade property (#2557) 
* Add property in OpenSpaceEngine for fading duration when enabling / disabling

* Add interface for fadeable components and apply to renderable

* Make layers a fadeable component

* Make globelabels a fadeable component

* Make labelscomponent a fadeable, and give it an enabled property

* Make screenspace renderables fadeable components

* Introduce concept of parent fadeables, to fade out subowners with parent

* Make rings fadeable as well

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
 2023-04-06 12:49:49 +02:00
Emma Broman
4de3713107 Add a central function to create an identifier from string, and also expose it through Lua 2023-04-03 11:40:19 +02:00
Alexander Bock
0e2d5e245d Add the ability to configure the Console key through the openspace.cfg (closes #2573) 2023-04-03 10:53:09 +02:00
Alexander Bock
1057b369c9 Harmonize the handling of the IsLocal vs Synchronized state of actions (closes #2566) 2023-04-03 10:29:20 +02:00
Ylva Selling
33f1b97c0f Merge remote-tracking branch 'origin/master' into feature/missions 2023-03-28 16:52:20 -04:00
Ylva Selling
c1245fc9c5 Add actions to missions topic 2023-03-28 13:51:57 -04:00
Malin E
96f7ac1d69 Some small clean up 2023-03-28 10:17:04 +02:00
Malin E
99d52ce144 Merge branch 'master' into feature/min-max-distance 
* Solve conflicts
 2023-03-27 15:43:22 +02:00
Alexander Bock
31c0b4a623 Send the origin and the destination scene graph nodes along with the events signalling the beginning or the end of a camera path (closes #1834) 2023-03-23 23:35:42 +01:00
Malin E
be2e9d5caf Address PR comments 2023-03-22 13:37:30 +01:00
Ylva Selling
99edcfc4e7 Merge remote-tracking branch 'origin/master' into feature/missions 
# Conflicts:
#	data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission
#	data/assets/scene/solarsystem/missions/perseverance/perseverance.asset
#	include/openspace/mission/missionmanager.h
#	modules/server/src/connection.cpp
#	src/mission/missionmanager.cpp
#	src/mission/missionmanager_lua.inl
 2023-03-21 12:03:10 -04:00
Gene Payne
00c8543306 Switch to std::list for adding & removing assets in deterministic order (#2543) 2023-03-17 16:07:17 -06:00
Malin E
ee4eb081a0 Merge branch 'master' into feature/model-opacity 
* Solve conflict in framebufferrenderer.cpp
 2023-03-14 13:59:37 +01:00
Alexander Bock
ddcbe85b51 Add events when paths are started or finished (closes #1834) 2023-03-11 17:20:20 +01:00
Alexander Bock
3df65ae899 Simplify property handling; Fix unit tests 2023-03-11 15:58:40 +01:00
Alexander Bock
23ee2ee5da Add new verifier to handle identifiers and update codegen to be able to use them (closes #2522) 2023-03-11 13:18:12 +01:00
Alexander Bock
6fa589c880 Adding option for constant velocity flight (closes #2150) 
Using adapted code from James H
 2023-03-11 00:16:54 +01:00
Alexander Bock
d40c60dd0a Fix property extraction from Lua for IntProperty 2023-03-10 13:10:14 +01:00
Emma Broman
4a50c4cbc0 Double renderbins for renderables (#2520) 2023-03-08 10:59:32 +01:00
Alexander Bock
60d842ab3f Another property fix 2023-03-07 13:01:48 +01:00
Alexander Bock
4d9c448764 Reintroduce Lua conversions to BoolProperty as it doesn't derive from NumericalProperty 2023-03-07 12:57:53 +01:00
Alexander Bock
0831b00a77 Centralize the extraction of Lua values and fix bug when trying to extract the first parameter of a Lua parameter pack 2023-03-07 01:56:17 +01:00
Alexander Bock
1aef976911 Show error message when trying to save navigation state to an invalid file path (closes #2508) 2023-03-07 00:05:31 +01:00
Alexander Bock
a711591c09 Update Doxygen (#2537) 
* Modernizing Doxygen
* Remove warnings for Doxygen
 2023-03-06 23:41:24 +01:00
Alexander Bock
8c7c932c78 Update codegen, make use of source location information 2023-03-06 15:50:31 +01:00
Alexander Bock
24ba6d5c7e Adjust to new Ghoul update 2023-03-04 21:12:35 -07:00
Adam Rohdin
88972fc27b New function that resets screenshot index to 0. Usefull when capturing png sequence for video 2023-03-02 14:36:03 +01:00
Alexander Bock
32af3cc675 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-02-28 05:57:14 -07:00
Alexander Bock
35a92b6e4d Add the ability to start a profile paused (closes #2228). Bump profile version to 1.2 2023-02-27 18:03:35 +01:00
Emma Broman
3ffb29b9be Add option to invert idle behavior (fixes #2379) 
Both through separate property and by allowing negative speed factor
 2023-02-27 16:06:15 +01:00
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