mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-18 10:59:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,991 Commits 86 Branches 46 Tags
1bb36635c6d04e7bbe30ce76eeaaf6887506ff5c
Commit Graph

118 Commits

Author SHA1 Message Date
Malin E
2a3a11d03a Some simplifications to joystick assets 2023-05-31 13:47:01 +02:00
Alexander Bock
705c898ccd Asset File cleanup (#2713) 
* Updating all assets to new coding style
* Cleaning up asset files
* Moving default_actions and default_keybindings files
* Changing procedural globes to explicitly specified globes
* Move Spice loading explicitly to the initialize part and also deinitialize
* Removing unused asset files
  * Removing asset_helper
  * Removing scale_model_helper asset
  * Removing script_scheduler_helper
  * Removing testing_keybindings
  * Remove procedural_globe
 2023-05-28 17:23:20 +02:00
Alexander Bock
0eb86d2c57 Fix capitalization of example video 2023-05-26 23:24:07 +02:00
Ylva Selling
c13747bb9c Add tiny resolution video to local resource video example 2023-05-26 12:31:23 -04:00
Malin E
6054a817d8 Move model loading code to initialiseGL, fixes #1838 2023-05-24 16:40:17 +02:00
Malin E
decbd33f81 Merge pull request #2702 from OpenSpace/issue/2647 
Issue/2647
 2023-05-23 09:41:29 +02:00
Malin E
0490e94350 Fix modelshader example in Debug mode 2023-05-22 11:37:28 +02:00
Malin E
ec15624ab0 Remove unused Roll Y movement for camera 2023-05-17 11:12:18 +02:00
Malin E
c0a1dc7e79 Dont allow axis flipping for propertry axis 2023-05-17 10:50:35 +02:00
Ylva Selling
b5a2403782 Add a local video example asset 2023-05-15 15:34:40 -04:00
Ylva Selling
fbf40a4d79 Show animation in example asset modelshader.asset 2023-05-11 10:00:18 -04:00
Alexander Bock
0655d3328c Move video examples 2023-04-15 11:47:54 +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
Ylva Selling
7fef92802d Merge pull request #2608 from OpenSpace/feature/video-module 
Video module
 2023-04-14 18:28:35 -04:00
Ylva Selling
f797d7db64 Set version number in new asset to 1.0 2023-04-14 18:08:56 -04:00
Ylva Selling
0c2bb7d5aa Add example asset for stretching video 2023-04-14 18:05:08 -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
Malin E
71caf31f02 Small clean up 2023-04-13 11:27:11 +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
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
Alexander Bock
3379393af7 Harmonize capitalization of action names (#2579) 
* Harmonize capitalization of action names (closes #2215)
* Fix confusion between delta time and simulation time (closes #2536)
 2023-04-05 17:58:18 +02:00
Malin E
f636b76469 Address more PR comments 2023-03-27 11:26:43 +02:00
Malin E
184a8b59ac Fix hole cutting or side by side stereo 
* And disable face culling for Orion model that is a one sided plane
 2023-03-08 11:49:55 +01:00
Malin E
a3b5300684 Update model shader example shaders 2023-03-08 10:24:26 +01:00
Malin E
bc647e8f23 Some model asset files clean up 2023-03-01 17:31:10 +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
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
4f4764209f Happy new year 2023-01-02 11:19:33 +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
Malin E
bf25e4562a Invert the disable properties culling and depth test in models 
* disableFaceCulling -> enableFaceCulling

* disableDepthTest -> enableDepthTest
 2022-11-25 10:01:46 +01:00
Alexander Bock
44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Malin E
9619711d6f Remove luastatemachine example asset, closes #2193 2022-11-01 16:26:05 +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
Malin E
34aa515f16 Fix issue with grid for different x and y values 
* Also adjust grid example asset to showcase the highlight feature
 2022-09-19 14:37:42 +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
Malin E
046213dd31 Merge branch 'master' into issue/1989 2022-04-28 10:04:57 +02:00
Malin E
516be81ecd Simplify setting of deadzone size in assets 2022-04-25 10:45:54 +02:00
Malin E
12ba9f8bc0 Fix specification error 2022-03-31 14:43:20 +02:00
Alexander Bock
6f25dd31e5 Make the Sun asset export the Sun as a light source (closes #1870) 2022-03-19 13:56:16 +01:00
Alexander Bock
8b74493d96 Removing the asset_helper file (#1868) 
- Remove the asset_helper file and call the onInitialize and onDeinitialize functions directly
 - Small compile fix on Windows
 - Removes the need for the registerIdentifierWithMeta function by automatically doing that for all asset.export statements
 - Allow the passing of either identifiers (as before) or entire tables to the removeSceneGraphNode, removeScreenSpaceRenderable, deleteLayer, removeAction, and export methods. In that case, the Identifier key from the table is extracted and used instead
 2022-02-01 23:44:36 +01:00
Alexander Bock
ba16dfccad Add and apply an explicit mode parameter 2022-01-14 12:02:51 +01:00
Alexander Bock
550faec8fb Fix example, don't store DefaultTileProvider as unique_ptrs 2022-01-01 13:07:15 +01:00
Alexander Bock
cdac4942b6 Merge branch 'master' into feature/tileproviders 
# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h
 2022-01-01 12:34:42 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
60b2f1b78b Make use of the new temporal tile provider type 2022-01-01 11:41:59 +01:00
Alexander Bock
e97ce70107 Bring the example back to life 2021-12-31 16:04:23 +01:00
Alexander Bock
d81644ecc5 Move temporal information from the XML file format into the asset file 2021-12-31 12:23:28 +01:00
Alexander Bock
064a483b81 Cleanup and unifying coding style for asset files 2021-12-28 23:40:09 +01:00
Alexander Bock
fdd995ba01 No longer require the filenames from a synced resource to start with a / 2021-12-28 00:10:01 +01:00