mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-17 11:00:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,159 Commits 84 Branches 46 Tags
7d5a53fb5eba04ff6e49ec581d1925a4c8fa13ad
Commit Graph

157 Commits

Author SHA1 Message Date
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Alexander Bock
d6a4106c93 Feature/spout (#291) 
* Add initial Spout implementation

* Some cleanup
 2017-04-24 14:45:23 -04:00
Alexander Bock
79aad3e245 Only link against Dbghelp library in Visual Studio 2017-04-17 13:53:45 -04:00
Alexander Bock
e12bb3ac70 Create MiniDump file on Windows in the case of a crash 2017-04-17 13:39:11 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Alexander Bock
d7e1a21551 Define compile options as private for supressing warnings 2017-04-06 19:38:10 -04:00
Emil Axelsson
ae864b9028 OpenVR compile fix 2017-03-28 13:17:46 +02:00
Alexander Bock
dbceb169f7 Only last-chance catch exceptions if we are running not in developer mode 2017-03-10 09:27:40 -05:00
Emil Axelsson
d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume 
Conflicts:
	src/engine/openspaceengine.cpp
 2017-03-03 18:08:29 +01:00
Alexander Bock
d6b5bb753b - Some cleanup of LuaConsole 
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
 2017-03-02 14:27:18 -05:00
Emil Axelsson
dd0d5d86af Update branch to work with changes in develop 2017-03-02 18:53:03 +01:00
Emil Axelsson
cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner. 
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
 2017-03-02 18:20:01 +01: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
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
d94940e6d2 * cleaner coding to only select default checkbox for Launcher sync 2017-02-19 18:37:06 -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
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
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
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
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
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
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
17900049c5 Remove extra <thread> headers. 2017-01-07 19:40:36 -05:00
Alexander Bock
dbe46b8134 Merge branch 'develop' 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
Eric Myers
41ec729d16 Update main.cpp 
Added #include <thread> to main.cpp for Mac
 2016-12-12 07:39:47 -05:00
Alexander Bock
80d806d62c Remove nonfunctioning keyboard bindings 2016-12-09 10:34:11 +01:00
Alexander Bock
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
Alexander Bock
fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +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
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock
e543163612 Updating Ghoul reference 
Adapt to the API changes
 2016-11-14 14:45:26 +01:00
kalbl
c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
Jonathas Costa
2c3804ccac Added required header to allow compilation under MacOSX. 2016-10-06 14:47:25 -04:00
kalbl
cf331dd523 Solve mac OSX errors. 2016-09-22 14:49:56 +02:00
Erik Broberg
aada13a656 Add debug functionalities: Busy wait for decode() and Log SGCT out-of-order errors 2016-09-06 12:44:03 -04:00
Erik Broberg
3cac5858be Proof of concept: Compensate async decode() with busy wait in postSync() 2016-09-04 05:52:00 -04:00
Erik Broberg
ac38c02001 Detect incorrect main callback function order!! 2016-09-04 03:40:41 -04:00