380e317f34
More cleanup before pull request
2022-02-22 16:25:46 -05:00
d96ea9189d
Reset files that shouldn't be changed for pull request
2022-02-22 16:20:40 -05:00
bcf463ad66
Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
...
# Conflicts:
# data/assets/util/asset_helper.asset
# data/assets/util/webgui.asset
2022-02-22 10:25:46 -05:00
9e69300642
unified renderbin to renderable; adapted orbitalkepler to codegen; fi… ( #1843 )
...
* unified renderbin to renderable; adapted orbitalkepler to codegen; fixes 1842
* update for pr comments
* update for pr comments2
2022-02-17 10:58:32 -05:00
3406407435
Update gui hash (to get fix for #1775 )
2022-02-11 17:10:49 +01:00
8b2e58ba9a
Correctly mark dependency of EDL asset on Mars ( closes #1872 )
2022-02-10 22:49:00 +01:00
0e49606706
Feature/Science on the Sphere ( #1863 )
...
Add all available Science-on-a-Sphere datasets from their public FTP as assets. Many of the datasets include large files that are downloaded the first time the asset is loaded
2022-02-10 13:53:30 +01:00
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
56460f818e
Feature/asset meta update part2 ( #1855 )
...
* changes to asset/loader/meta to support adding nodes created at runtime
* update assets meta.
* update tle helper and gui to work with changes
* fixes #1840
* group titan trail and atmosphere with globe
* license for magnetosphere
Co-authored-by: ElonOlsson <olssonelon@gmail.com >
2022-01-31 15:58:41 -05:00
5128056272
Make hover circle work again and remove unneccessary conversion function
2022-01-26 05:41:46 -05:00
0462a0084d
Fixed incorrect lowercase filename causing crash on non-windows systems
2022-01-24 21:31:27 -07:00
26f5ce4c78
Update gui hash to get layer reordering feature
2022-01-18 19:14:16 +01:00
ba16dfccad
Add and apply an explicit mode parameter
2022-01-14 12:02:51 +01:00
550faec8fb
Fix example, don't store DefaultTileProvider as unique_ptrs
2022-01-01 13:07:15 +01:00
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
d7d279ea16
Happy new year
2022-01-01 12:32:55 +01:00
60b2f1b78b
Make use of the new temporal tile provider type
2022-01-01 11:41:59 +01:00
e97ce70107
Bring the example back to life
2021-12-31 16:04:23 +01:00
90dbb6a01f
Rename Generative to Prototyped; Remove restriction on date format
2021-12-31 15:01:38 +01:00
d81644ecc5
Move temporal information from the XML file format into the asset file
2021-12-31 12:23:28 +01:00
d8226f7c1d
Moving the map service configs in with the asset files
2021-12-29 13:50:15 +01:00
064a483b81
Cleanup and unifying coding style for asset files
2021-12-28 23:40:09 +01:00
fdd995ba01
No longer require the filenames from a synced resource to start with a /
2021-12-28 00:10:01 +01:00
01e17266b6
Merge pull request #1787 from OpenSpace/feature/multiple-joysticks
...
Feature/multiple joysticks
2021-12-22 13:22:01 +01:00
debcb43ade
Feature/assets ( #1784 )
...
General overhaul of the Asset loading system
2021-12-19 18:04:01 +01:00
1fe86fe843
Cleanup, make hover circle add itself via lua function to the module. Make functions consistent how they interact with WWT
2021-12-01 13:48:12 -05:00
8766ba1242
Remove local variable in example
2021-11-30 17:22:46 +01:00
0e548b4a1b
Merge branch 'master' into thesis/2021/skybrowser
...
# Conflicts:
# data/assets/util/webgui.asset
# modules/webbrowser/src/screenspacebrowser.cpp
# src/rendering/renderengine.cpp
2021-11-30 10:47:46 -05:00
cc0a7b05ce
Add example asset for binding property to joystick
2021-11-30 12:11:08 +01:00
2753de1ab9
Merge branch 'master' into feature/multiple-joysticks
2021-11-30 10:14:45 +01:00
01a04a6faa
Fix missing keybind for taking screenshots ( closes #1786 )
2021-11-26 14:50:19 +01:00
979ba8544f
Update asset file to new structure
2021-11-23 15:51:29 -05:00
54ed28ce66
Update assethelper to new version
2021-11-23 15:49:02 -05:00
27d68556ec
Update the structure of the renderable sky browser to inherit fronm renderable plane and wwtcommuicator
2021-11-23 09:48:07 -05:00
2c7bbc5dee
Update GUI hash
...
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
80e4e26b43
Remove old screen space sky browser
2021-11-17 10:59:52 -05:00
78b1f2c6e1
Remove support for sticky axis and sensitivity to Property type
2021-11-17 16:57:05 +01:00
5ae9bfcd14
Fix shouldInvert default value for joysticks
2021-11-15 12:56:38 +01:00
f591ba2195
Fix roll for controllers
2021-11-15 11:25:12 +01:00
3fdae48092
Exchange normalisation property for joysticks to JoystickType
...
* Joysticks can either be "JoystickLike" or "TriggerLike", where the
triggers are normalized and have the deadzone close to -1 instead to 0
* Solves issue with zoom friction not to turn off for controllers
2021-11-12 11:46:17 +01:00
2b4e1ae8fd
Update name in PS4 and Xbox assets
2021-11-11 09:26:04 +01:00
2b1de9eebb
Use Pair class to communicate with the target and browser
2021-11-05 10:07:30 -04:00
5ed69aea6b
Update joysitck assets
...
* NOTE: Xbox and PS4 names have not yet been added
2021-11-05 13:03:10 +01:00
d5422f429d
Restructure and clean up
2021-11-03 10:37:20 -04:00
24ce66aad4
Feature/tileinterpolation ( #1769 )
...
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
* Asset file for testing interpolation
Co-authored-by: tobiasp93 <tobias.pettersson@liu.se >
Co-authored-by: Alexander Bock <alexander.bock@liu.se >
2021-11-01 09:24:40 +01:00
c895f24989
Cleanup
2021-10-25 09:38:09 -04:00
c94ce3c78a
Move reparent script
2021-10-25 11:05:31 +02:00
a8c74979c1
Merge branch 'master' into feature/animation-fixes
2021-10-25 10:51:13 +02:00
d7f9c1a124
merge with master
2021-10-14 11:07:01 -04:00
d0dfa67641
removed a space
2021-10-14 11:01:50 -04:00
sylvass