Commit Graph

285 Commits

Author SHA1 Message Date
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
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
Alexander Bock
6e9d299dda Update Ghoul repository
Adapt to Ghoul changes in function names
2016-07-07 13:49:36 +02:00
Alexander Bock
e40d393824 Make the DownloadManager not a singleton (closing #43) 2016-06-30 00:43:03 +02:00
Alexander Bock
5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Alexander Bock
a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +02:00
Alexander Bock
cf80788067 More cleanup of Gui code
Added IswaGroup properties to the iSWA properties list
Enable sorting the performance measurements by total time
2016-06-28 19:22:50 +02:00
Alexander Bock
9fb7814145 Add visibility toggle to Property base class
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
438e34b272 Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup 2016-06-27 02:11:49 +02:00
Alexander Bock
3fe802ae1f Merge branch 'develop' into release/ips 2016-06-16 13:51:34 +02:00
Gene Payne
d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02:00
Alexander Bock
8e6bdf5f06 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-14 22:52:15 +02:00
Alexander Bock
2dd29e5ecb Fixing bug with disappearing SGCT arguments 2016-06-14 09:19:11 +02:00
Kalle Bladin
012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Alexander Bock
30264fb00e Add Lua function to check whether a specific module is loaded (closing #36) 2016-06-04 19:38:56 +02:00
Alexander Bock
1e8d329e3d Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95) 2016-06-02 13:12:28 +02:00
Alexander Bock
0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Alexander Bock
a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Alexander Bock
00d8445825 Increase the Syncbuffer to deal with larger scripts 2016-05-30 12:26:06 +02:00
Kalle Bladin
ceb7d0fa63 Remove use of old mousecontroller 2016-05-25 21:32:52 -04:00
Sebastian Piwell
a28abd7774 iSWA Screen Space Options 2016-05-12 15:10:17 -04:00
Sebastian Piwell
e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Sebastian Piwell
39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Michael Nilsson
f05672436e removed iswamanager update function and create cygnet through scripts instead 2016-05-03 15:07:22 -04:00
Sebastian Piwell
dfd1968f0b Lua script to add cygnet 2016-05-03 13:24:17 -04:00
Alexander Bock
20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +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
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
6c6555bbce Print out the number of warnings, errors, and fatal errors that happened during initialization and each frame after
Updated to new Ghoul version
2016-04-18 16:44:44 +02:00
Alexander Bock
f0748505b7 Include VisualStudioOutputLog
Correctly allow '/' character in SceneGraph description files
2016-04-18 15:12:40 +02:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Alexander Bock
df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock
598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Emil Axelsson
73cf15beb6 - Add currentDrawBufferResolution method in WindowWrapper
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
  eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Emil Axelsson
a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
85d564767b Fix #define None include error on X11 systems 2016-01-18 18:05:57 +01:00
Alexander Bock
aee6146d3f Xlib compile error 2016-01-18 17:52:14 +01:00
Alexander Bock
c87fdfd38b Fixes for Windows
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
0735d0fc2d More cleanup of FactoryManager 2015-12-14 17:55:24 -08:00
Alexander Bock
177571195c Completely remove references to constants.h 2015-12-14 17:36:15 -08:00
Alexander Bock
c99666e75a Cleaning ConfigurationManager and OpenSpaceEngine
Updated Ghoul version
2015-12-14 16:44:13 -08:00
Alexander Bock
adfc7d244c Cleanup of WindowWrapper classes 2015-12-14 15:55:28 -08:00
Alexander Bock
6eca5c0f68 More module cleanup 2015-12-14 11:46:44 -08:00
Alexander Bock
2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00