Emil Axelsson
e201dec907
Start work on TorrentSynchronization
2017-11-06 19:07:52 +01:00
Emil Axelsson
43664d34b7
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-05 20:04:47 +01:00
Emil Axelsson
81e81d04e4
Force Cmake flags for Libtorrent
2017-11-05 20:04:01 +01:00
Emil Axelsson
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02:00
Alexander Bock
269dda8aff
Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
2017-10-24 01:33:53 -07:00
Alexander Bock
2bfbf82403
Fix Tully download
...
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Emil Axelsson
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
Emil Axelsson
3307b3f3bc
Update logo in Launcher
2017-10-18 17:12:30 +02:00
Emil Axelsson
7eb65c54be
Guard against concurrent downloads of the same file
2017-10-18 16:57:38 +02:00
Emil Axelsson
1862b804a9
Use libtorrent as a git submodule. Support base library functions in Lua execution of the Launcher.
2017-10-18 14:47:01 +02:00
Emil Axelsson
ed89587487
Remove libtorrent from repository
2017-10-17 14:20:55 +02:00
Emil Axelsson
2623912ec9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-16 11:07:24 +02:00
Alexander Bock
06550ea42f
Add support for OpenGL 4.6
...
Compile fix in rawvolumewriter
2017-10-11 09:05:10 -04:00
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
Emil Axelsson
2426545a05
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/sceneloader.cpp
tests/test_concurrentjobmanager.inl
tests/test_concurrentqueue.inl
tests/test_sceneloader.inl
2017-08-15 11:43:18 +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
Emil Axelsson
cb7319d5f2
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
data/scene/default.scene
modules/sync/syncmodule.h
openspace.cfg
src/engine/openspaceengine.cpp
src/scene/scene.cpp
src/scene/scene_doc.inl
src/scene/scenegraphnode.cpp
src/scene/scenegraphnode_doc.inl
src/scene/sceneloader.cpp
src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
Emil Axelsson
5ced910f79
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
include/openspace/scene/scenegraphnode.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +02: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
Emil Axelsson
58a423fc56
Loading and unloading assets
2017-07-06 22:33:11 +02: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
