mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-26 05:58:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,914 Commits 83 Branches 46 Tags
d06de8b9c047a7eb072a4d079d8d4e9af9b351a1
Commit Graph

5534 Commits

Author SHA1 Message Date
Ylva Selling
c1e9993c27 Add option to have actions in a milestone in mission UI 2023-05-11 14:58:54 -04:00
Alexander Bock
9447a351b4 Increase the TilePixelSize for heightmaps loaded from info files 2023-05-10 23:13:27 +02:00
Alexander Bock
a5b8368b50 Fix bugs in videoplayer (#2678) 
Remove from syncable list after destruction; only use one fbo; remove code no longer used

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
 2023-05-09 20:04:15 +02:00
Ylva Selling
487a0a8733 Add missing property dimensions to screenspace browser 2023-05-08 14:10:02 -04:00
Ylva Selling
142aba3684 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-27 11:30:38 -04:00
Ylva Selling
b5d6ddc25a Only show properties that are valid for real time playback when real time playback is selected 2023-04-27 11:30:34 -04:00
Ylva Selling
d827d0a3c2 Add property for toggling looping of video 2023-04-27 11:29:49 -04:00
Alexander Bock
6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +02:00
Ylva Selling
2b3333c9ac Merge branch 'feature/documentation-cleanup' 2023-04-26 17:37:50 -04:00
Ylva Selling
d6ddd86a35 Rewrite asset json function to nlohmann::json 2023-04-26 17:30:51 -04:00
Ylva Selling
9a1e6b8002 Remove old json functions 2023-04-26 16:58:55 -04:00
Micah Acinapura
5ea6f1d21c handled underscore and period special in c++ for cef bug; also remove… (#2643) 
* handled underscore and period special in c++ for cef bug; also removed F5 special code and changed to keybinding; closes #853; closes #896

* removed extra line

* fix formatting from review
 2023-04-26 08:22:48 -04:00
Emma Broman
1762bec1c2 Make the Enabled properties advanced, show in GUI, and change name 
Update GUI hash to show enabled property
 2023-04-25 11:29:41 +02:00
Alexander Bock
d0d65e4234 Update CMake folders 2023-04-23 12:33:11 +02:00
Emma Broman
d58a52df2c Fix broken ImGui time picker unit dropdown (closes #2639) 2023-04-21 09:26:29 +02:00
Micah Acinapura
5a9bb529f3 Feature/night sky items (#2613) 
* added night sky items and camera event
---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
 2023-04-16 17:29:48 -04:00
Alexander Bock
8a62752434 Jenkins fix for LibMPV on Ubuntu (#2621) 
* Correctly add non-Windows dependencies
* Make libraries depend on the correct OpenSpace module
* Add missing destructor
 2023-04-16 23:15:57 +02:00
Micah Acinapura
9be88fdea8 added more scale objects and helper file (#2605) 
* added more scale objects and helper file

* Update file identifiers

* reworked scale models with node support script

* using url sync for models that need to be updated

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2023-04-15 17:26:38 -04:00
Alexander Bock
db002d4cf7 Fix CMake issues when disabling unit tests, Add new CMake flag OPENSPACE_ENABLE_ALL_MODULES to change default behavior of module inclusion 2023-04-15 22:39:35 +02:00
Alexander Bock
27ba567af8 Add the ability to set the default property visibility in the openspace.cfg file, which can be overridden with the OPENSPACE_LEVEL environment variable 2023-04-15 18:22:21 +02:00
Emma Broman
c714a7f57d Feature/geojson (#2595) 
Add the option to add geojson components to globes, from geojson files. One geojson file creates one GeoJsonComponent, which in turn may contain multiple GlobeGeometryFeatures

Geojson is a format that supports points, lines, and polygons. In addition to the basic functionality, extra features have been added that will long-term allow rendering the geometry needed to represent KML files (another format for geospatial geometry data). Here are links to references for both formats:

    Geojson: https://geojson.org/
    KML: https://developers.google.com/kml/documentation/kmlreference

data/assets/examples/geojson includes some example files that I have used for testing. Any geojson file can also be added through drag-n-drop. Note however that you might need to change the AltitudeMode or HeightOffset properties for the feature to be visible.
 2023-04-15 11:35:28 +02:00
Alexander Bock
8c7beea8a4 Reprivatize the registerUpdateRenderBinFromOpacity function 2023-04-15 10:20:39 +02:00
Alexander Bock
ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +02:00
Ylva Selling
668cba8788 Merge pull request #2604 from OpenSpace/feature/documentation-overhaul 
Feature/documentation overhaul
 2023-04-14 18:42:44 -04:00
Ylva Selling
7fef92802d Merge pull request #2608 from OpenSpace/feature/video-module 
Video module
 2023-04-14 18:28:35 -04:00
Ylva Selling
9e20326c25 Fix bugs that appeared when addressing comments in PR 2023-04-14 17:53:30 -04:00
Ylva Selling
89b0fadf16 Add some example assets and fix issue in videoplayer.cpp 2023-04-14 16:47:27 -04:00
Ylva Selling
5789d86dab Address comments on PR 2023-04-14 16:29:42 -04:00
Ylva Selling
b4ad158ee5 Merge pull request #2603 from OpenSpace/feature/missions 
Feature/missions
 2023-04-14 15:19:37 -04:00
Alexander Bock
eb08968bc6 Compile fix for merge conflict 2023-04-13 23:29:12 +02:00
Malin E
0fb624164b Issue/2272 (#2580) 
* Add actions for zodiac constellations + some improvements
* Add fade to actions
* Add fade scripts that is able to take regex identifiers and fade screen space renderables
 2023-04-13 21:42:35 +02:00
Emma Broman
1d240aa1f5 Fix opacity not being settable from asset for some fadeables 2023-04-13 20:56:55 +02:00
Malin E
f77a028153 Add property to RenderablePlanes to rescale depending on content 2023-04-13 19:01:31 +02: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
c2457e5c41 Address PR comments 2023-04-13 14:54:49 +02: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
a017006ec6 Add todo comment from discussion in PR 2023-04-13 12:35:51 +02:00
Malin E
71caf31f02 Small clean up 2023-04-13 11:27:11 +02:00
Malin E
6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02: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
Ylva Selling
0ccd5d63bd Structured milestones and phases in missions file so they are structured the same 2023-04-12 17:22:01 -04:00
Alexander Bock
7565a91196 Cleanup lambda expressions and directly address Fadeable properties when adding properties 2023-04-12 23:20:53 +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
Malin E
94e8f90d1a Take into account the scale in the gui when calculating distance culling 2023-04-12 16:50:08 +02:00
Alexander Bock
811d099fdc Make CMake download the prebuilt version of libmpv from our server; Add example asset that downloads its video on include 2023-04-12 13:59:23 +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