92b480f708
registerModuleCallback from touchmodule to call interaction handler
2017-02-17 15:44:03 -07:00
990d2047de
Merge branch 'multitouch' of https://github.com/OpenSpace/OpenSpace into multitouch
2017-02-17 10:49:12 -07:00
5e84b7f6a2
new touch module with TUIO library to make OpenSpace tuio-aware
2017-02-16 12:52:39 -07:00
8167228d69
Add global try-catch block around main function
...
Add additional LDEBUG and LTRACE for debugging
2017-02-16 12:30:58 -05:00
0d03177d43
Feature/globebrowsingcleanup ( #230 )
...
* Initial restructuring of the Globebrowsing branch
* Update Ghoul repository
Fix include guards
* More cleanup
* Split texttileprovider subclasses into separate files
* Move TileProviders into namespace
* Convert static class methods into free functions
* Splitting tile subclasses into their own files
Remove `using namespace` from header file
* Split TileDataSet subclass into separate file
Update SGCT reference
* Move shader preprocessing data into internal class
* More Globebrowsing cleanup
* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01:00
efe205c209
- Add initial tracing calls adapting to new Ghoul change of adding a
...
loglevel of ‘Trace’
- Adapt js and css files to show trace files in log
2017-02-14 18:10:28 -05:00
8456087cf5
Add a style check that checks whether the correct GLM header is used
...
Adapted files to use the correct GLM headers
2017-02-14 13:12:59 -05:00
e3cfba8fec
Merge commit '48e77f6106979c9d2b602534e6bccebcbb1aadad' into develop
...
# Conflicts:
# apps/OpenSpace/main.cpp
2017-02-13 16:17:49 -05:00
48e77f6106
Modified launcher checkboxes to have clearly defined check-indicators; ( #228 )
...
green indicates a check, whereas red does not.
2017-02-13 22:12:35 +01:00
23ea86949f
Updated check_style_guide to test for include guards and copyright
...
notices
- Fix include guards
- Fix copyright header indentation
- Update copyright years
2017-02-09 23:55:39 -05:00
ea485fd418
More include guard fixes
2017-02-09 22:20:17 -05:00
6d9dc2bfeb
Fixed include guards
...
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
a6c422c38e
Fix runtime error with moving classes from base to space module
...
Add additional logging information to initialization
2017-02-08 14:42:28 -05:00
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
2d6d7cefa6
Remove the out-of-order logging as it causes OpenSpace to crash when master is running at different speeds from slaves due to race conditions on the std::stringstream
2017-01-26 17:20:09 -07:00
17900049c5
Remove extra <thread> headers.
2017-01-07 19:40:36 -05:00
dbe46b8134
Merge branch 'develop'
2016-12-14 23:03:28 +01:00
aa2ac511ff
Adapt to Ghoul changes of moving LogLevel out of LogManager
2016-12-14 22:59:22 +01:00
41ec729d16
Update main.cpp
...
Added #include <thread> to main.cpp for Mac
2016-12-12 07:39:47 -05:00
80d806d62c
Remove nonfunctioning keyboard bindings
2016-12-09 10:34:11 +01:00
341bc8b105
Merge branch 'develop' into feature/globebrowsing
...
# Conflicts:
# modules/globebrowsing/chunk/chunkrenderer.cpp
# modules/globebrowsing/globes/renderableglobe.cpp
# modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
fe436748bf
Implementing Translation classes for Keplerian elements as well as two-line element formats ( #172 )
2016-12-02 15:05:49 +01:00
357a447435
Update ghoul reference
...
Wrap OpenSpace main with an exception handler that logs exceptions
2016-11-23 18:35:02 +01:00
a617261bde
Solve conflict
2016-11-23 13:34:38 +01:00
e543163612
Updating Ghoul reference
...
Adapt to the API changes
2016-11-14 14:45:26 +01:00
c516dc5b25
Solve conflict in scripts/common.lua
2016-10-11 17:51:57 +02:00
2c3804ccac
Added required header to allow compilation under MacOSX.
2016-10-06 14:47:25 -04:00
cf331dd523
Solve mac OSX errors.
2016-09-22 14:49:56 +02:00
aada13a656
Add debug functionalities: Busy wait for decode() and Log SGCT out-of-order errors
2016-09-06 12:44:03 -04:00
3cac5858be
Proof of concept: Compensate async decode() with busy wait in postSync()
2016-09-04 05:52:00 -04:00
ac38c02001
Detect incorrect main callback function order!!
2016-09-04 03:40:41 -04:00
3dbcd20de8
Require the Qt5 modules in the Launcher application
2016-08-26 19:32:28 +02:00
21e9599888
SyncWidget in Launcher must also compare base directory before removing duplicates (closing #126 )
2016-08-18 17:33:08 +02:00
bf4989d396
Changing request URL for the Launcher
...
Update gitignore file
2016-08-01 13:59:10 +02:00
81c18b2b62
Updated URLs in code or comments
2016-08-01 11:05:50 +02:00
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
fb39949daf
_downloadManager.reset() on deconstructor, not .release()
...
Whoops. That's that I meant to do. Ah, brain: you are soooooo reliable.
2016-07-05 16:42:50 -06:00
b96b1d8a84
Updated Launcher sync widget to work with newly un-singleton-ed DownloadManager.
...
Created new member "_downloadManager" to take old "DlManager's" place.
2016-07-05 16:36:06 -06:00
c253e5734f
Add a todo to Launcher
...
Update to newest Ghoul
2016-06-16 22:37:55 +02:00
1901166640
improved galaxy rendering
2016-06-03 11:16:57 +02:00
2911168e5b
volume conversion tools and really basic data converter app
2016-05-18 11:56:06 +02:00
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
a21c9538b6
Untabify more files
2016-04-18 15:15:30 +02:00
7e44ac0621
Fixed Launcher to work with new possible module directory structure
2016-04-15 15:05:24 -04:00
46b207b379
Removing some cppcheck warnings
2016-04-14 22:49:03 -04:00
f5012d496d
Compile fix for the SyncWidget in the Launcher
2016-04-14 21:16:25 -04:00
0d0f761d6e
downloadmanager return shared_ptr to FileFutures instead of bare pointers
2016-04-05 11:33:58 -04:00
5181d812cd
Update Ghoul repository
2016-03-20 23:30:54 +01:00
fd5f26f757
Linux/Mac Launcher fix
2016-03-08 16:44:43 -05:00
ec9261e1da
fix function call to logmanager
2016-03-07 09:37:45 -05:00
Jonathan Bosson