Commit Graph

3964 Commits

Author SHA1 Message Date
Jonathan Bosson c4bd08c19e change TUIO protocol from v2.0 to v1.1 to support a wider range of sender applications 2017-02-21 14:00:36 -07:00
Jonathan Bosson 2d223dc250 using std::mutex over boost, debug prints for touch input in touchmodule 2017-02-18 22:11:48 -07:00
Jonathan Bosson 92b480f708 registerModuleCallback from touchmodule to call interaction handler 2017-02-17 15:44:03 -07:00
Jonathan Bosson 990d2047de Merge branch 'multitouch' of https://github.com/OpenSpace/OpenSpace into multitouch 2017-02-17 10:49:12 -07:00
Alexander Bock fe47845703 Windows compile fix 2017-02-16 23:13:38 +01:00
Alexander Bock 2ebc803cb7 Reduce dependency of onscreengui module in libOpenspace
Add check to `check_style_guide` that reports wrong dependencies
2017-02-16 16:54:03 -05:00
Alexander Bock 11fbff5fbc Reduce the dependency of libOpenSpace on modules
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
2017-02-16 16:43:34 -05:00
Jonathan Bosson 5e84b7f6a2 new touch module with TUIO library to make OpenSpace tuio-aware 2017-02-16 12:52:39 -07:00
Alexander Bock 8167228d69 Add global try-catch block around main function
Add additional LDEBUG and LTRACE for debugging
2017-02-16 12:30:58 -05:00
Alexander Bock 2da100c001 Windows compile fix 2017-02-16 18:19:52 +01:00
Alexander Bock 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
Alexander Bock 729bffb0f9 Improve SpecificationError reporting
Fix spelling error in ModuleEngine
2017-02-14 18:11:20 -05:00
Alexander Bock 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
Alexander Bock 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
Alexander Bock e3cfba8fec Merge commit '48e77f6106979c9d2b602534e6bccebcbb1aadad' into develop
# Conflicts:
#	apps/OpenSpace/main.cpp
2017-02-13 16:17:49 -05:00
noahdasanaike 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
Alexander Bock 15867d6849 Cleanup of warnings in external libraries 2017-02-13 13:45:27 -05:00
Alexander Bock 70020e3de7 - Add style check for correct use of components and subcomponents in
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
2017-02-10 14:46:51 -05:00
Alexander Bock 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
Alexander Bock ea485fd418 More include guard fixes 2017-02-09 22:20:17 -05:00
Alexander Bock 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock 9e4cf8196d Add script to check include guards 2017-02-09 18:23:33 -05:00
Matthew Territo 77d0b38282 Update Ghoul with typo fix (#224)
Yey \o/
2017-02-08 23:41:11 -05:00
Alexander Bock 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
Alexander Bock 5f98ec2ca9 Update Ghoul repository
Make changes to accommodate the new Lua state class
2017-02-07 17:02:43 -05:00
Alexander Bock 41fda78792 Add check for empty lines in DownloadManager 2017-02-06 19:14:42 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock 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
Eric Myers b9d5b417de Merge pull request #178 from OpenSpace/issue173
Remove extra <thread> headers.
2017-01-09 21:14:16 -05:00
Eric Myers 17900049c5 Remove extra <thread> headers. 2017-01-07 19:40:36 -05:00
Alexander Bock 0ad004bdc9 Add Python script to create new files 2016-12-18 23:28:11 +01:00
Alexander Bock 4558de8088 Converted tabs to spaces 2016-12-18 21:42:05 +01:00
Alexander Bock dbe46b8134 Merge branch 'develop' releases/v0.6.0 2016-12-14 23:03:28 +01:00
Alexander Bock aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Alexander Bock c390f6be30 Update copyright header 2016-12-14 21:36:28 +01:00
Emil Axelsson 4b688fd149 Move Rotation and Scale factories from base module to OpenSpace core 2016-12-14 14:27:12 +01:00
Emil Axelsson 9b5e6f0000 Remove unused shaders for postRender pass 2016-12-14 14:23:26 +01:00
Emil Axelsson ad3921fda5 Remove unused postRender method for scene graph nodes and renderables 2016-12-14 14:14:53 +01:00
Alexander Bock dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Eric Myers 17540472f5 Merge pull request #174 from OpenSpace/issue173
Update main.cpp
2016-12-12 07:50:55 -05:00
Eric Myers 41ec729d16 Update main.cpp
Added #include <thread> to main.cpp for Mac
2016-12-12 07:39:47 -05:00
Alexander Bock 2165fa7f39 Ghoul reference update 2016-12-09 23:39:31 +01:00
Alexander Bock d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock df543f0ec3 Cleanup of license headers
Cleanup of include guards in modules
2016-12-09 12:02:16 +01:00
Alexander Bock 80d806d62c Remove nonfunctioning keyboard bindings 2016-12-09 10:34:11 +01:00
Alexander Bock b3be4180de Clean data/scene folder; remove lodesritest and restructure lodglobes folders
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
Alexander Bock 2a3b532745 Add display of double precision properties to ImGui
Do not show date text when render information is hidden
Add Utah WMS files
2016-12-09 09:04:53 +01:00
Alexander Bock 189a68dd6d Add Utah MOLA and CTX configurations 2016-12-07 23:23:17 +01:00
Alexander Bock 8da0684ae2 More cleanup for newhorizons and globebrowsing module 2016-12-07 21:56:59 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00