Commit Graph

187 Commits

Author SHA1 Message Date
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350)
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
9401579cc0 Jenkins compile fix by specifying compile settings for applications 2017-07-15 15:53:45 -04:00
Alexander Bock
3a0023e45c Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set 2017-07-13 13:42:23 -04:00
Kalle Bladin
6e16466755 Back to LF line endings (#359)
* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Add .editorconfig

This is a tool that allows you to tell multiple editors what type of code
style and configuration that should be used. It unifies the settings and
makes the risk of running into config-related issues smaller.
2017-07-13 16:49:42 +02:00
Alexander Bock
6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Matthew Territo
2d1661679c Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine. 2017-07-10 11:53:15 -06:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Alexander Bock
467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
Alexander Bock
24485d8032 Use icon for Launcher 2017-07-01 17:53:23 -04:00
eriksunden
0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Matthew Territo
46179922b7 Remove if guard on libtorrent's find_package(Boost). Enable Boost multithreading. (#341) 2017-07-01 12:51:19 -04:00
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Klas Eskilson
3b2ca27562 [Cmake] Rename use renamed ghl_copy_files macro 2017-06-02 09:47:51 -04:00
Matthew Territo
17b0034384 Put _optionParser back into use. 2017-05-19 15:22:00 -06:00
Matthew Territo
ade212665e Change tab to spaces 2017-05-19 12:15:39 -06:00
Matthew Territo
ce83666ec0 Cleanup Launcher config comments, unecessary changes, etc. 2017-05-19 12:08:55 -06:00
Matthew Territo
92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs
# Conflicts:
#	ext/sgct
#	openspace.cfg
2017-05-12 15:40:06 -06:00
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
Matthew Territo
08aea81e1e Merge commit 'd94940e6d2b0a5a8de390eee107d4dcf5e91ad72' into feature/launcherconfigs
* commit 'd94940e6d2b0a5a8de390eee107d4dcf5e91ad72':
  * cleaner coding to only select default checkbox for Launcher sync
  * When Launcher first starts only the default scene is selected.
2017-02-20 08:39:49 -07:00
Matthew Territo
a6e3972fa9 Merge commit '30477f49f846c77193418f31653cb692bcdf58b2' into feature/launcherconfigs
* commit '30477f49f846c77193418f31653cb692bcdf58b2':
  * Launcher checkbox colors are green (not so bright) or grey (not red) * Changed "Cancel" button to "Exit"
2017-02-20 08:39:36 -07: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
Matthew Territo
fd7d9b5dbb Update LogManager singleton initialization 2017-02-16 12:18:36 -07:00
Matthew Territo
dbd2bf34d0 Merge remote-tracking branch 'origin/develop' into feature/launcherconfigs 2017-02-16 10:36:48 -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
Matthew Territo
154ff289a3 Merge branch 'feature/launcherconfigs' of https://github.com/OpenSpace/OpenSpace into feature/launcherconfigs 2017-02-15 21:58:58 -07:00
Matthew Territo
e319f87350 Log level set via config file 2017-02-15 21:53:43 -07:00
Matthew Territo
a491a65e04 Merge branch 'develop' into feature/launcherconfigs 2017-02-15 17:07:16 -07:00
Matthew Territo
895ad51e39 Add Launcher key to ConfigurationManager. Initial work. 2017-02-15 17:05:59 -07: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