Commit Graph

5940 Commits

Author SHA1 Message Date
Jonathan Fransson
7b33d9e9a6 merge 2019-03-25 14:37:10 -06:00
Elon
08e123a3db Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-03-22 10:54:22 -06:00
Elon
95f1c5d2e7 some code to test 1 sgn, more renderables 2019-03-22 10:54:14 -06:00
Jonathan Fransson
cdf4a11848 scene setup 2019-03-22 10:53:35 -06:00
Jonathan Fransson
b360c11661 added spaceDebris scene 2019-03-18 16:09:02 -06:00
Elon
ea4907dc42 include debris in default scene 2019-03-15 16:17:34 -06:00
Micah Acinapura
8ff4a63b02 fix for session recording to support macro variables (#802)
Fix for session recording to support macro variables
2019-03-11 16:41:12 +01:00
Emil Axelsson
70babdbd85 Update sgct 2019-03-11 13:58:27 +01:00
Emil Axelsson
87e2dcd788 Update Ghoul 2019-03-11 13:15:13 +01:00
Alexander Bock
b65b8b3f42 Update SGCT and Ghoul 2019-03-08 11:52:57 +01:00
Gene Payne
63c1ac89fb Changes to touch module to allow it to build with or without webbrowser module enabled (#808) 2019-03-07 11:15:45 +01:00
Alexander Bock
f49202c36c Update the gitignore file
Update SGCT
2019-03-06 13:07:59 +01:00
Emil Axelsson
5a8a944c61 Fix bug with hierarchical rotations in the scene graph 2019-03-05 18:55:34 +01:00
Emil Axelsson
6b28bac054 Fix anchor-and-aim related errors 2019-03-04 22:59:06 +01:00
Emil Axelsson
b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +01:00
Gene Payne
c44290fe1f Feature/touch web gui support (#798)
* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
2019-02-21 07:35:47 -07:00
Alexander Bock
21fd957f28 Add an option for hardcoding a fixed bounding sphere that is used if there is no renderable attached to a scenegraph node 2019-02-20 16:55:48 +01:00
Emil Axelsson
3e5b59b46a Add missing BIN path to TaskRunner to fix issue with config file 2019-02-20 12:49:19 +01:00
Emil Axelsson
738a5900d4 Patch imgui to work with new anchor and aim structure 2019-02-20 10:26:09 +01:00
Emil Axelsson
2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
mingenuity
df9fbf8195 Add support for zoom sensitivity adjustment with Ctrl/Shift (#792)
* Add support for zoom adjustment with Ctrl/Shift using Z (speed up zoom) and X (slow down zoom)
2019-02-18 18:42:46 +01:00
Neal McBurnett
cdac35619e README: Note OpenGL 3.3 requirment; fix wiki links (#795)
Closes #794
2019-02-18 18:34:03 +01:00
Gene Payne
f6e27b7500 Gaia scene file needs to have capitalized to compare against loaded OpenSpace modules 2019-02-13 12:31:40 -07:00
Emil Axelsson
075625c223 Prevent file handles to leak into nodejs server application 2019-02-13 17:08:29 +01:00
Micah Acinapura
a1a1ee71db added res tag for gui window in spherical config 2019-02-04 17:35:56 -05:00
Emil Axelsson
f60371bdbc Pass on modifier keys to CEF for mouse events (#790)
* Update sgct
* Pass on modifier keys to CEF for mouse events
2019-02-04 15:14:51 +01:00
Emil Axelsson
59b1f2b741 GaiaStars: Fix bug with setting shader option from dictionary 2019-01-31 13:33:19 +01:00
Alexander Bock
9a31205d89 Feature/jenkins2 (#789)
Build all targets on all platforms
2019-01-25 14:53:07 +01:00
Alexander Bock
99a43747e1 Update cfitsio to fix Jenkins 2019-01-24 16:02:58 +01:00
Alexander Bock
7fefaca345 Feature/jenkins (#788)
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
Emil Axelsson
8b396b6028 Fix gui scale bug 2019-01-22 10:53:26 +01:00
Emil Axelsson
c3cc53f08d Make it possible to rescale web gui 2019-01-19 19:16:56 -05:00
Alexander Bock
c7639adb15 Remove warnings in Clang 2019-01-19 14:49:31 +01:00
Alexander Bock
be6915ecc1 Add Lua function to query property identifiers 2019-01-10 23:06:35 +01:00
Alexander Bock
ebf55f3029 Fix issue preventing from setting multiple vector properties through a lua script 2019-01-08 13:57:09 +01:00
Emil Axelsson
0c6b5e95c6 Introduce ability to configure ports etc for external applications. (#785)
Introduce ability to configure ports etc for external applications, including webgui
2019-01-04 10:23:28 +01:00
Alexander Bock
acd897784e Correctly name globetranslation example assets 2018-12-04 13:02:01 -05:00
Alexander Bock
8d64020601 Add new translation that uses longitude/latitude to compute translation on a RenderableGlobe 2018-12-04 11:24:35 -05:00
Alexander Bock
ecdb05e98e Correctly compile if the sync module is compiled without libtorrent support 2018-12-04 09:02:54 -05:00
Alexander Bock
6b011d117c Make CMake scream less 2018-12-03 14:29:14 -05:00
Alexander Bock
36d0f71913 Only set CEF settings to OpenSpaceTest if OpenSpace is compiled with tests (closes #778)
Do not disable RTTI on CEF targets
Do not for Unicode on CEF targets
More graceful handling of torrent classes in Sync module
2018-12-03 14:00:08 -05:00
Alexander Bock
9d4b26a6c3 Check the correct gaia module in the gaia.scene 2018-12-03 12:52:07 -05:00
Alexander Bock
21775d07ea Update ghoul respository
Remove warning
2018-12-03 10:17:40 -05:00
Alexander Bock
203db2357e Compile fix for touch module
Compile fix for AbfferRenderer
2018-12-03 09:55:13 -05:00
Emil Axelsson
f8b72a3a04 Register interesting nodes instead of manually adding and removing 2018-12-03 10:49:25 +01:00
Alexander Bock
06b20d2fe8 Fix GUI Json creation error 2018-11-30 20:09:00 -05:00
Alexander Bock
c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock
752750bee8 Actually fix the LiU Mola Elevation WMS config (oops) 2018-11-30 15:28:15 -05:00
Matthew Territo
aa89a63f74 Fix GAIA module compile for macOS (missing #include <string>) 2018-11-29 17:18:32 -08:00
Alexander Bock
09fcbd0595 Fix LiU MOLA height map 2018-11-26 20:37:26 -05:00