Commit Graph

3184 Commits

Author SHA1 Message Date
Kalle Bladin d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -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
Kalle 93d661bfc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex 2016-07-22 17:06:02 -04:00
Kalle 5883d75047 Update render function in renderable model to avoid precision errors and remove psc dependency. 2016-07-22 17:05:34 -04:00
Kalle 1de4e47621 Add debugmodel scene to test and rewrite model rendering. 2016-07-21 19:17:57 -04:00
Erik Broberg 1b1fe181ed Fix invalid image file paths. Set focus node to OsirisRex 2016-07-21 18:12:21 -04:00
Erik Broberg d677cb10e7 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-07-21 18:09:32 -04:00
Erik Broberg 73e3c71b9a Init StatsCollector to disabled and delete committed stats data 2016-07-21 17:42:35 -04:00
Erik Broberg 0ce065db2b Fix invalid paths to debug texture in mod files 2016-07-21 17:30:50 -04:00
Kalle c7aa6f8de2 Merge osirisrex with globe browsing branch 2016-07-21 17:23:30 -04:00
Erik Broberg 58a8c1dc1b Remove debug textures from lodearth and lodmars, keep them in debugglobe 2016-07-21 17:21:03 -04:00
Erik Broberg dd01953f7c Enable disabling rendering of RenderableGlobe 2016-07-21 17:13:55 -04:00
Erik Broberg e081cae980 Fix file structure for data/scene/lodearth/map_service_configs 2016-07-21 17:05:04 -04:00
Erik Broberg 3a3980a716 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-21 16:58:01 -04:00
Erik Broberg f4fa144606 Use shorter struct name. Previous name caused linker error LNK1179 2016-07-21 16:57:48 -04:00
Kalle ede5efdf6d Set interaction mode to globe browsing in debugglobe scene 2016-07-21 16:04:09 -04:00
Erik Broberg 469f0ea22b Add a RenderableGlobe at OsirisRex position 2016-07-21 15:14:27 -04:00
Erik Broberg b44e761eba Merge branch 'develop' into feature/globebrowsing 2016-07-21 13:29:33 -04:00
Jonathas Costa e5206cccb4 Fixed predefined macros for Windows. 2016-07-20 15:02:15 -04:00
Alexander Bock 3fcf23f3cb Update SGCT reference 2016-07-20 20:14:15 +02:00
Alexander Bock a2bc9adecd Updated Ghoul reference 2016-07-20 17:43:04 +02:00
Alexander Bock aedfaeda50 Merge branch 'feature/sgct' into develop 2016-07-20 17:10:41 +02:00
Alexander Bock a0fec7f6a0 Update Ghoul reference 2016-07-20 16:36:44 +02:00
Alexander Bock 8dc2cdbbea Correctly set SGCT default values 2016-07-20 16:24:00 +02:00
Alexander Bock 6a56e4c83c Link GLFW library requirements
Update SGCT reference
2016-07-20 14:52:24 +02:00
Alexander Bock 65ddeba70c Add SGCT as submodule
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock 2b01b300b5 Update Spice reference
Update CMake requirement from 3.0 to 3.4 due to usage of WINDOWS_EXPORT_ALL_SYMBOLS in Spice CMake
2016-07-20 11:10:52 +02:00
Alexander Bock bc137ab377 Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux 2016-07-20 10:41:06 +02:00
Alexander Bock bc3fe218b9 Updated Spice reference 2016-07-20 08:55:17 +02:00
Erik Broberg cde5c1b469 Add BennuTrail 2016-07-19 18:14:54 -04:00
Erik Broberg ea4c3061b9 Add and read Osiris Rex spice kernels 2016-07-19 16:52:21 -04:00
Erik Broberg 85810372b4 Add empty osirisrex scene and event data 2016-07-19 14:36:12 -04:00
Erik Broberg f222219a6d Fix spice positioning bug in lodearth.mod 2016-07-19 13:37:16 -04:00
Erik Broberg d6aed778c4 Update globebrowsing.scene. Add level-of-detail data folders for Earth and Mars 2016-07-19 11:39:48 -04:00
Alexander Bock eeb20d2cb7 Add Spice as a submodule 2016-07-19 15:03:23 +02:00
Erik Broberg b442e21091 Use shorter names for interaction modes 2016-07-18 18:10:33 -04:00
Kalle Bladin 541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock a244defdbc Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
 - The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
 - The setPropertyValueRegex Lua function allows a full regular expression to be used

Closing #108
2016-07-18 20:12:24 +02:00
Erik Broberg 6691dab91e Init default rotation matrix to unit matrix explicitly 2016-07-18 13:50:47 -04:00
Alexander Bock a2db1bed99 Include fixes for performance measurements 2016-07-18 16:25:55 +02: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 1b7ede6d5c Add Lua functions to load and unload SpiceKernels 2016-07-18 14:41:27 +02:00
Alexander Bock f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock 34054d789a Add missing lua callback file for OpenSpaceEngine 2016-07-18 12:15:52 +02:00
Alexander Bock c4e9c88e91 Only display actually included modules in the CMake log (closing #122) 2016-07-18 12:02:29 +02:00
Alexander Bock d39b9e91e2 Compile fix in InteractionHandler 2016-07-18 00:40:40 +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
Alexander Bock 5c95c34752 Move the Gui rendering into a postdraw call so that it works for non-standard rendering techniques (like fisheye)
Closing #119
2016-07-16 16:47:00 +02:00
Erik Broberg 50735fde80 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 19:01:15 -04:00
Kalle Bladin 1d9aab6e63 Remove datasets from debugglobe.mod 2016-07-15 18:57:03 -04:00