mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,991 Commits 85 Branches 48 Tags
55f002ad6fce141b88329430eb3327713c196cfb
Commit Graph

3991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock 55f002ad6f Move the disabling of the rendering on the master into the RenderEngine 
instead of specifying it in the OpenSpaceEngine
 2017-03-01 10:39:29 -05:00
Alexander Bock 3e2c56c940 Steps towards moving dedicated lua functions into properties 2017-02-28 23:15:11 -05:00
Alexander Bock 6694cfd98c Remove warning from iSWA manager download 2017-02-28 21:23:10 -05:00
Alexander Bock 2500b5f72b Add Dictionary constructor to TileIndexTileProvider (closes #248) 2017-02-28 21:22:42 -05:00
Alexander Bock 59c8ba6700 - Replace window name check with tag check for GUI code (closed #258) 
- Only show GUI, console, and screenlog on the GUI window
 2017-02-28 20:39:34 -05:00
Alexander Bock 8910aac834 - Replace window name check with tag check for GUI code (closing #258) 
- Only show GUI, console, and screenlog on the GUI window
 2017-02-28 20:38:58 -05:00
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock 78f2f0a35e Some more cleanup of RenderEngine 2017-02-27 16:40:50 -05:00
Alexander Bock 57ba41bb10 Update the leap second kernel 2017-02-27 16:39:58 -05:00
Alexander Bock a45d6b7e19 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2017-02-27 13:59:59 -05:00
Alexander Bock a08e0cea4e Update Ghoul repository to update GLM 2017-02-27 11:10:50 -05:00
Alexander Bock 283c83e37c Removing code analysis warnings 
Start cleaning RenderEngine
 2017-02-26 23:45:39 -05:00
Alexander Bock 6704491fdc More cleanup in OpenSpaceEngine 2017-02-25 19:19:31 -05:00
Alexander Bock 3cd5bfe138 Update Ghoul repository 2017-02-25 18:41:20 -05:00
Alexander Bock 5bf729dca9 Compile fix for Dataconverter 2017-02-25 18:40:34 -05:00
Alexander Bock bc75334eb4 Use exceptions instead of success return values for initialize and 
create methods
 2017-02-25 18:08:53 -05:00
Alexander Bock 6c4efc4eec Move OpenSpaceEngine::isMaster method into WindowWrapper class 2017-02-25 11:29:28 -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 5db26ad44b Windows compile fix when compiling without WMI support 2017-02-24 17:08:50 +01:00
Alexander Bock 8665cbe957 Update the Juno trajectory to the new format 2017-02-22 15:53:59 -05:00
Alexander Bock 85c3de9152 Feature/modular sgct config (#239) 
* Initial work to create SGCT configuration files from Lua

* More work on modularizing the SGCT configs
 - Removing almost all pregenerated config files
 - Working functions to create configurations with single and fisheye
   rendering viewports

* Some more work on modular SGCT configurations
  - Make more objects configurable
  - Add documentation
  - Make use of new `sgct.config.single` and `sgct.config.fisheye` functions

* Fix accidental commit

* Enable single configuration as default

* Do not remove single_fisheye.xml for inspiration

* Update single_fisheye.xml

* Update configuration_helper.lua

* Place multiview and multinode configuration files back
 2017-02-22 15:35:55 -05:00
Alexander Bock 965cf6bd9a Fix crash that occurs if there is an error in the SGCT configuration file 2017-02-22 15:31:59 -05:00
Eric Myers 2ee1f9984c Merge pull request #238 from OpenSpace/issue155 
Launcher checkbox colors are green (not so bright) or grey (not red)
 2017-02-21 19:48:26 -05:00
Eric Myers 578c63fe32 Merge pull request #236 from OpenSpace/issue234 
When Launcher first starts only the default scene is selected.
 2017-02-21 19:19:12 -05:00
Eric Myers d94940e6d2 * cleaner coding to only select default checkbox for Launcher sync 2017-02-19 18:37:06 -05:00
Alexander Bock 1e294d6e36 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2017-02-19 16:21:53 -05:00
Alexander Bock b876c3553b Feature/luaextensions (#232) 
* Add systemcapabilities bindings that make the functions of
GeneralSystemCapabilitiesComponent and OpenGLSystemCapabilitiesComponent
available in Lua scripts

* Windows compile fix

* Return OpenGL extensions as array in Lua
 2017-02-19 22:17:00 +01:00
Alexander Bock 1ac45a9077 Fix OsirisRex configuration file 2017-02-19 15:55:18 -05:00
Eric Myers c104eeffc7 * When Launcher first starts only the default scene is selected. 2017-02-19 10:54:54 -05:00
Eric Myers 30477f49f8 * Launcher checkbox colors are green (not so bright) or grey (not red) 
* Changed "Cancel" button to "Exit"
 2017-02-19 09:13:45 -05:00
Alexander Bock 6d1f0c7029 Updated version number to 0.7.0 (prerelease-12 NAOJ) releases/v0.7.0 2017-02-19 04:12:19 +01: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
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