Commit Graph

595 Commits

Author SHA1 Message Date
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock a08e0cea4e Update Ghoul repository to update GLM 2017-02-27 11:10:50 -05:00
Alexander Bock 3cd5bfe138 Update Ghoul repository 2017-02-25 18:41:20 -05:00
Alexander Bock 4f64cbb141 First step of main.cpp cleanup
Updated SGCT repository
2017-02-25 10:59:59 -05:00
eriksunden 87f5654bf8 Feature/openvr (#180)
* Updated SGCT to latest commit, to include OpenVR convenience functions.

* Made OpenSpace application support OpenVR. Check CMake option "OPENSPACE_OPENVR_SUPPORT" to enable this functionality.

* Merged latest SGCT to remove ogl_header dependency in SGCTOpenVR header

* Merged latest SGCT with minor Mac gl/glew include fix for including SGCTOpenVR as it relies on inclusion of gl headers.

* CMake fix in OpenSpace app for resetting variables after unchecking OPENVR_SUPPORT.

* Created separate SGCT config files for Oculus Rift and HTC Vive HMD

* Update Ghoul to enable experimental GLM features

* Update SGCT repository

* Updated to latest SGCT version for latest fixes.
2017-02-24 20:41:40 -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 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 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 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Matthew Territo 77d0b38282 Update Ghoul with typo fix (#224)
Yey \o/
2017-02-08 23:41:11 -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 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05: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
Alexander Bock 2165fa7f39 Ghoul reference update 2016-12-09 23:39:31 +01:00
Alexander Bock 921cc59a23 Update the OpenSpace version to 0.6.0 (AGU)
Update Ghoul reference
2016-12-06 08:54:38 +01:00
Alexander Bock ee8d129da6 Update Ghoul and SGCT repository 2016-11-28 14:20:32 +01:00
Alexander Bock 357a447435 Update ghoul reference
Wrap OpenSpace main with an exception handler that logs exceptions
2016-11-23 18:35:02 +01:00
Alexander Bock ceac5db8c5 Updated Ghoul repository 2016-11-21 17:29:35 +01:00
Alexander Bock 789f931979 Change 'addImage' to add the image when enter is pressed
Automatically show performance window when performance is measured
Cleanup of GUI module
2016-11-15 21:56:38 +01:00
Alexander Bock 3831e406cf Convert native path tokens to Lua supported tokens for adding a screenspace image (closing #168) 2016-11-14 18:52:57 +01:00
Alexander Bock cea6edd7ae Update Ghoul reference 2016-11-14 16:15:22 +01:00
Alexander Bock e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +01:00
Rickard Lindstedt 6f126dea7d Update ghoul repository 2016-11-09 16:23:00 +01:00
Alexander Bock 0db02995bd Update Ghoul repository 2016-11-08 13:30:11 +01:00
Alexander Bock c21bb3bb4d Make SGCT work between Debug and Release without manual removal 2016-10-31 15:24:46 +01:00
Alexander Bock c7809cb6cf Some initial work to make OpenGL 3.3 work
Make OpenSpace not crash if the FontRenderer shader cannot be compiled
2016-10-29 16:55:02 +02:00
Alexander Bock f9b7953ebf Updated Ghoul repository (Closing #145) 2016-10-24 14:31:30 +02:00
Emil Axelsson 7698f97660 update ghoul 2016-09-29 20:56:08 +02:00
Alexander Bock 6d9b12878b Update Ghoul 2016-09-26 13:50:19 +02:00
Alexander Bock 568ebd51ff Update SGCT, make use of new googletest submodule in Ghoul 2016-09-25 19:50:59 +02:00
Alexander Bock 1b4b0f49b6 Update SGCT 2016-09-20 10:11:59 +02:00
Alexander Bock 6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Alexander Bock d8f61e736a Clean up gitignore file 2016-09-19 14:02:04 +02:00
Alexander Bock 45d034ad2a Enabling optional arguments
Adding tests to the OpenSpaceTest
2016-09-13 20:27:29 +02:00
Alexander Bock 8f4f4c101f Updated Ghoul repository 2016-09-13 15:29:03 +02:00
Alexander Bock 0376300732 Update Ghoul
Change TriangleSoup and StatsCollector to use new Boolean class
2016-09-11 19:37:15 +02:00
Alexander Bock 69f72718c0 Enable the change of projection texture size in ProjectionComponent (closing #105)
Make the Shadowmapping in RenderableModelProjection optional by setting a value in the mod file
2016-09-07 14:16:16 +02:00
Alexander Bock e3d5a9ca38 Cleaned up Doxygen
Removed Doxygen warnings
Documented Property specializations (closing #10)
2016-09-05 17:01:32 +02:00
Alexander Bock 227554ce40 Update Ghoul repository 2016-08-29 00:37:50 +02:00
Alexander Bock adf02bd5f6 Updated Ghoul
- Adapted to CommandlineParser changes
2016-08-19 16:42:19 +02:00
Alexander Bock c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock 214a3ffde6 Update Ghoul reference 2016-08-15 10:28:19 +02:00
Alexander Bock af672b6a4e - Update Ghoul reference
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
2016-08-11 11:12:15 +02:00
Alexander Bock 42542bbb68 Include Jenkins compile fix 2016-08-03 11:08:57 +02:00
Alexander Bock 662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Alexander Bock 3312ebd0fe Correctly increase the reference count on PerformanceManager 2016-08-01 23:55:49 +02:00