mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,570 Commits 99 Branches 46 Tags
db472030de710180ff96c9c8c707c19ef3bcfe41
Commit Graph

8570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Micah
2f32ddaf28 updating earth Terrain WMS to new esri server 2021-08-20 14:02:15 -04:00
Micah
27c270b217 update to rawtilereader size calculation. Closes #1716 2021-08-20 13:21:14 -04:00
Emma Broman
37d39868a9 Make flyTogeo work again 
Broke after lua function cleanup PR
 2021-08-20 16:41:54 +02:00
Malin E
80d7cfcbdf Merge pull request #1724 from OpenSpace/feature/qt6 
Add support for Qt6
 2021-08-20 16:38:52 +02:00
Alexander Bock
4fea3d8019 Explicitly request the Qt version 2021-08-20 16:30:27 +02:00
Malin E
e0312d32e8 Add support for Qt6 2021-08-20 15:41:01 +02:00
Emma Broman
41c146654f Add function to print out state machine to a dot file (#1721) 2021-08-20 13:20:35 +02:00
Alexander Bock
b2d12476dd Correctly specify the model size of the Apollo capsules (closes #1718) 2021-08-20 12:43:47 +02:00
Alexander Bock
af617d1d10 Feature/lua function cleanup (#1719) 
General cleanup of Lua functions and handling of variable extract from a Lua state
 2021-08-19 16:02:14 +02:00
Alexander Bock
8175a7eb5b Compile fix 2021-08-18 15:46:43 +02:00
Alexander Bock
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
Emma Broman
b651170565 Merge branch 'thesis/2019/camera-paths' 2021-08-17 15:52:46 +02:00
Emma Broman
39a6220678 Provide useful error message on SpecificationError when creating a camera path 2021-08-17 15:46:50 +02:00
Emma Broman
11a901fa2f Fix forgotten property rename when creating camera path 2021-08-17 15:39:01 +02:00
Emma Broman
b9661392b4 Merge pull request #1667 from OpenSpace/thesis/2019/camera-paths 
Thesis/2019/camera paths
 2021-08-17 08:57:20 +02:00
Emma Broman
2a5e6dc502 Make state machine's enter/exit scripts optional 2021-08-17 08:33:00 +02:00
Emma Broman
97f6d5aa6c Rename path instruction "Type" to "TargetType", for clarity 2021-08-16 16:29:46 +02:00
Emma Broman
5d11af00dc Rename curve type to path type 
And clarify documentation a little. "Path type" makes more sense to a user, who is never actually exposed to the concept of curves
 2021-08-16 12:59:00 +02:00
Emma Broman
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
Emma Broman
a39dcf2567 Adress review comments 2021-08-15 19:34:10 +02:00
Emma Broman
5cf5824607 Add option to flyToGeo with North as up vector 2021-08-15 18:47:15 +02:00
Emma Broman
4ccc47161c Add an AvoidCollisionWithLookAt curve 
Same path as AvoidCollision, but with lookat rotation instead of slerp. Useful (needed) for some cases in the interactive installations, but should be replaced later on as it leads to fast rotations
 2021-08-13 15:55:06 +02:00
Emma Broman
1765296e5b Fix problem with ignored model translation when going to specific position 2021-08-12 19:25:00 +02:00
Gene Payne
afe1f960cd Fixed image type for GHRSST L4 MUR sea temperature 2021-08-11 14:01:44 -06:00
Malin E
883403a332 Merge pull request #1706 from OpenSpace/feature/model-update 
Update .osmodels
 2021-08-11 13:02:58 +02:00
Malin Ejdbo
ae1c929001 Update Ghoul 2021-08-11 13:00:15 +02:00
Malin Ejdbo
54e4b4cbbe Update models to the new .osmodel format 2021-08-11 10:16:22 +02:00
Malin Ejdbo
30f7396ec1 Update Ghoul with new .osmodel file format 2021-08-11 10:15:44 +02:00
Emma Broman
0c0b9c9fc1 Fix faulty include 2021-08-10 09:02:52 +02:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths 
# Conflicts:
#	src/rendering/abufferrenderer.cpp
 2021-08-09 15:21:08 +02:00
Alexander Bock
c5b71d13a5 Update CREDITS.md releases/v0.17.1 2021-08-05 17:20:55 +02:00
Alexander Bock
7efacd139a Update version number to 0.17.1 2021-08-05 17:19:24 +02:00
Alexander Bock
f4a1baeeb1 Reload UI after adding screenspace renderables or assets (closes #1703) 2021-08-04 13:46:16 +02:00
Micah
88708e3bf4 fixed an issue when loading specified SGCT config files; issue/1624 2021-08-03 15:44:03 -04:00
Micah
8211b4a113 update apollo boulders for new model code 2021-08-03 14:38:05 -04:00
Micah
96c0b36c54 update pioneer model to include textures 2021-08-03 12:37:38 -04:00
Micah
53c05ef1af updated globetranslation example to code changes 2021-08-03 11:24:16 -04:00
Gene Payne
d7d3ad93c8 Merge pull request #1698 from OpenSpace/issue/1461 
Added warning to keybinding editor for duplicate assignments
 2021-07-30 14:42:18 -06:00
GPayne
f035ba57f8 Added casts to prevent conversion warnings 2021-07-30 14:37:49 -06:00
Gene Payne
e9bb2cade5 Merge pull request #1690 from OpenSpace/issue/1669 
Issue/1669
 2021-07-30 13:49:57 -06:00
GPayne
2e746e14f1 Formatting changes per code review 2021-07-30 13:41:49 -06:00
GPayne
283e1b5c16 Merge master into issue/1669 to fix build conflict 2021-07-30 13:13:14 -06:00
Alexander Bock
dfca605d63 Add the optional ability to print a stacktrace with an OpenGL error (closes #1700) 2021-07-30 15:37:03 +02:00
Alexander Bock
90157ce463 Warnings and compile fixes for MSVC 2021-07-30 15:01:21 +02:00
Alexander Bock
c96764aa1c Remove Clang warnings 2021-07-30 14:56:55 +02:00
Alexander Bock
5b3a66156c Remove unnecessary template specification for lock_guard 2021-07-30 14:48:08 +02:00
Alexander Bock
f6d74870bb Don't disable the CEF UI when turning off Master rendering (#1699) 2021-07-30 12:24:46 +02:00
Alexander Bock
c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock
c0941a1243 Reset the anchor/aim node when removing a scenegraph node (closes #1402) 2021-07-29 14:22:41 +02:00