Commit Graph

116 Commits

Author SHA1 Message Date
Alexander Bock 67f1a389d2 Move back to default.scene 2016-08-29 14:55:37 +02:00
Erik Broberg 23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg 09ad585be5 Rebase to feature/globebrowsing 2016-08-17 19:16:01 -04:00
Erik Broberg 1199acc7b9 Re-add and revert back to old ThreadPool. See ticket #128 2016-08-17 18:22:27 -04:00
Erik Broberg 964953da89 Use stripped out debug scene 2016-08-17 18:17:25 -04:00
Kalle Bladin fb87842b1b Update path rendering to higher precision. 2016-08-08 22:35:37 -04:00
Kalle Bladin d128e09691 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-08 17:20:45 -04:00
Kalle Bladin d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
Erik Broberg d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Erik Broberg 64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Kalle Bladin 4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock e39a7983aa Generate keyboard mappings on default 2016-07-29 13:37:38 +02:00
Alexander Bock 0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00
Alexander Bock 444f7b6e25 Enable additional warnings
Update Ghoul reference
Fix relative path in test_gdalwms
2016-07-27 14:38:37 +02:00
Kalle c7aa6f8de2 Merge osirisrex with globe browsing branch 2016-07-21 17:23:30 -04:00
Erik Broberg 85810372b4 Add empty osirisrex scene and event data 2016-07-19 14:36:12 -04:00
Kalle Bladin 541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock 9df88a6a79 Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117) 2016-07-18 14:54:36 +02:00
Alexander Bock 6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Erik Broberg 1d94dfeb1b Prep presentation 2016-07-11 16:53:02 -04:00
Erik Broberg 1ed4a293d4 Use globebrowsing scene 2016-06-30 20:54:20 -04:00
Alexander Bock debe475647 Updating to newest Ghoul version
Reenabling default.scene as the default scene
2016-06-22 15:30:16 +02:00
Alexander Bock 3d4e1ec19c Merge branch 'develop' into release/ips
Conflicts:
	tests/main.cpp
2016-06-17 11:31:11 +02:00
Matthew Territo 5925bd9c63 Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp 2016-06-16 17:03:48 +02:00
Jonathas Costa da956af2bc Update matrix type in atmosphere (new issues present to be fixed). 2016-06-09 15:21:12 -04:00
Jonathas Costa b2c895dab0 Merged branch Atmosphere. 2016-06-09 11:45:56 -04:00
Kalle Bladin 012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Jonathas Costa 388bb15461 Initial implementation of Atmosphere Effects. Use framebuffer to render it. 2016-06-07 10:35:18 -04:00
Jonathas Costa 700f411784 Merged develop branch into PlanetShadows. 2016-06-06 17:19:11 -04:00
Kalle Bladin 4ac19f21b7 Solve merge conflict. 2016-05-19 12:10:14 -04:00
Michael Nilsson 7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04:00
Jonathas Costa 3fa5ed39d5 Planet Shadows 2016-05-16 15:41:04 -04:00
Alexander Bock ffdaeeedcc Renamed default_nh.scene to newhorizons.scene
Remove all 'projection' suffices from newhorizons classes
2016-05-16 09:30:27 +02:00
Kalle Bladin 04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -04:00
Michael Nilsson 0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Sebastian Piwell dfd1968f0b Lua script to add cygnet 2016-05-03 13:24:17 -04:00
Alexander Bock d237ae4e1c Remove generated shaders path 2016-05-01 13:16:26 +02:00
Alexander Bock 75175512a8 First implementation of moving the startup scripts into the scene description files 2016-04-27 16:46:31 +02:00
Michael Nilsson 07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Erik Broberg 4073f4e6cb Merged in branch develop to feature/globebrowsing 2016-04-18 20:02:42 -04:00
Alexander Bock a59a1bd758 Turn off logging flush for increased performance 2016-04-18 15:15:42 +02:00
Alexander Bock ef2981f535 Enable global variables for module Lua scripts (closing #172)
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
Erik Broberg 299cd27f2c Fixed bug Camera (view rot matrix had translation components) and structured Camera code 2016-04-14 12:47:12 -04:00
Sebastian Piwell fa3fc8dc87 Transfer function to dataplan and ColorBar 2016-04-13 11:36:43 -04:00
kbladin 506c624a73 Created new scene with a debug globe in the center. 2016-04-05 15:37:10 -04:00
Michael Nilsson ba57bd4cf8 solve merge conflict 2016-03-31 09:50:50 -04:00
Sebastian Piwell c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Karl Bladin 333e7886db Change name of RenderableCelestialBody to Planet 2016-03-30 12:49:54 -04:00
Karl Bladin 6504919331 Create separate module for planet browsing with an empty class for rendering planets. 2016-03-29 17:41:41 -04:00