bb3c9f013e
Merge branch 'master' into feature/model-opacity
...
* Resolve conflicts in shaders for models and modelprojections
2023-04-06 13:43:23 +02:00
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
f636b76469
Address more PR comments
2023-03-27 11:26:43 +02:00
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
a3b5300684
Update model shader example shaders
2023-03-08 10:24:26 +01:00
bc647e8f23
Some model asset files clean up
2023-03-01 17:31:10 +01:00
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
ac228c9c87
Add a new dashboard item that shows the state of input devices ( closes #2415 )
2023-01-21 18:29:17 +01:00
4f4764209f
Happy new year
2023-01-02 11:19:33 +01:00
574b789338
Merge branch 'master' into feature/model-opacity
...
* Solve conflicts in nebula and asset_helper assets
2022-12-01 10:20:05 +01:00
bf25e4562a
Invert the disable properties culling and depth test in models
...
* disableFaceCulling -> enableFaceCulling
* disableDepthTest -> enableDepthTest
2022-11-25 10:01:46 +01:00
44e5b17ec9
Global pass over the code to remove trailing spaces
2022-11-22 21:06:52 +01:00
9619711d6f
Remove luastatemachine example asset, closes #2193
2022-11-01 16:26:05 +01:00
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
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
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
046213dd31
Merge branch 'master' into issue/1989
2022-04-28 10:04:57 +02:00
516be81ecd
Simplify setting of deadzone size in assets
2022-04-25 10:45:54 +02:00
12ba9f8bc0
Fix specification error
2022-03-31 14:43:20 +02:00
6f25dd31e5
Make the Sun asset export the Sun as a light source ( closes #1870 )
2022-03-19 13:56:16 +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
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
d81644ecc5
Move temporal information from the XML file format into the asset file
2021-12-31 12:23:28 +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
8766ba1242
Remove local variable in example
2021-11-30 17:22:46 +01:00
cc0a7b05ce
Add example asset for binding property to joystick
2021-11-30 12:11:08 +01: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
d7f9c1a124
merge with master
2021-10-14 11:07:01 -04:00
76dd45e5ce
Event System ( #1741 )
...
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00
9d503ff86e
Merge branch 'master' into thesis/2020/radiation
2021-09-17 11:06:15 -04:00
af95d9895e
update slidedeck example for actions
2021-09-14 12:25:05 -04:00
423d854615
Merge branch 'master' into thesis/2020/radiation
2021-09-13 18:23:33 -04:00
82ecf60ea2
Issue/1527 - GlobeRotation ( #1737 )
...
* Add GlobeRotation and example
* Put latitude before longitude in GlobeTranslation files
2021-09-06 09:28:12 +02:00
b649509bf0
Feature/model shader ( #1723 )
...
* Add support for RenderableModel to take custom shader code
* Added example to highlight usage
2021-08-24 10:45:19 +02:00
34985f64a6
Feature/keybindings ( #1708 )
...
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
2a5e6dc502
Make state machine's enter/exit scripts optional
2021-08-17 08:33:00 +02:00
743e2452f8
merge master to thesis branch
2021-08-16 15:23:49 -04:00
8d7d8b9ba4
Feature/state machine ( #1705 )
...
* Fix script error in old state machine example
* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations
* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine
Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com >
2021-08-16 09:29:45 +02:00
53c05ef1af
updated globetranslation example to code changes
2021-08-03 11:24:16 -04:00
b248e23ea4
some minor fixes from notes on PR
2021-07-23 12:40:40 +02:00
7461303aa5
Fix to make slide deck work with new strict Lua
2021-07-13 09:03:49 +02:00
89fa6de0b9
Add simple animation example asset
2021-06-17 11:16:29 +02:00
Malin E