mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 16:01:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,480 Commits 84 Branches 46 Tags
87815ac1796bd6da215842a51681f839b2184e46
Commit Graph

313 Commits

Author SHA1 Message Date
Erik Broberg
87815ac179 Clean up ScriptScheduler and add doxygen comments 2016-09-13 17:35:45 -04:00
Erik Broberg
c20cd80eaa Merge globebrowsing, resolve conflicts 
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
 2016-09-07 17:37:27 -04:00
Erik Broberg
2bb3379d66 Log isUsingSwapGroups and isSwapGroupMaster after initialization and before deinitialization 2016-09-01 15:30:07 -04:00
Erik Broberg
6b1369f58c Log at info level when scheduled scripts are executed 2016-08-30 13:16:10 -04:00
Erik Broberg
b74b01d294 Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua 2016-08-29 16:16:11 -04:00
Erik Broberg
6875e8c1c7 Re-fix, after doing git submodule update 2016-08-22 15:55:42 -04:00
Erik Broberg
fd76e8063e Fix compilation error after git pull 2016-08-22 15:26:19 -04:00
Kalle Bladin
d042f6c4be Merge branch 'develop' into feature/osirisrex 2016-08-19 12:33:49 -04:00
Alexander Bock
adf02bd5f6 Updated Ghoul 
- Adapted to CommandlineParser changes
 2016-08-19 16:42:19 +02: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
7ecc8d397f Use the new way of updating and syncing camera 2016-08-08 17:13:32 -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
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
48b5ae9166 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-08-01 09:39:49 +02:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties 
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
 2016-07-31 19:26:55 +02:00
Matthew Territo
c159e027ee Fix for GUI on multi-node setups. 
Reinstated tests for _isMaster and isRegularRendering() with GUI to prevent slave crashes
 2016-07-29 14:27:58 -06:00
Alexander Bock
4068ec747b Remove CppCheck warnings 2016-07-28 18:04:08 +02:00
Matthew Territo
9a435ac74d Extended temporary fade functionality 
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
 2016-07-27 19:25:49 -06:00
Matthew Territo
94625e541b FIXED: Slightly rearrange/cleanup OpenspaceEngine::initialize 
Simplify scene file config/commandline logic, group scene and renderEngine work

(Stashed changes took over real changes)
 2016-07-27 17:02:24 -06:00
Matthew Territo
10e00b0d3c Slightly rearrange/cleanup OpenspaceEngine::initialize 
Simplify scene file config/commandline logic, group scene and renderEngine work
 2016-07-27 16:58:04 -06:00
Matthew Territo
fdb90f74ac Added scene selector in the SettingsEngine, in the GUI under Global Properties. 
Has placeholder functionality for what's coming in the next commit.
 2016-07-27 16:45:43 -06: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
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
nusic
5f2d692230 Fix: last commit did not consider the updated FontRenderer interface 2016-07-13 14:22:36 -04:00
Kalle
1ebfe3ae7d Fix bug where interaction handler is updates on wrong place. 2016-07-11 21:45:14 -04:00
Kalle
d1c8c12cc6 Roll back to updating interaction handler in pre synchronization. 2016-07-10 19:44:00 -04:00
Alexander Bock
6e9d299dda Update Ghoul repository 
Adapt to Ghoul changes in function names
 2016-07-07 13:49:36 +02:00
Kalle
031461307c Solve problem with unsynched world position between interaction handler and renderer. 2016-06-30 22:43:27 -04: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