0cdceddeee
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 10:33:30 +01:00
8e0a37fb7a
Compile fixes related to change in documentation namespace
...
Configuration fix, making the default scene default again
2017-03-03 17:51:39 -05:00
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
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
4f64cbb141
First step of main.cpp cleanup
...
Updated SGCT repository
2017-02-25 10:59:59 -05:00
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
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
729bffb0f9
Improve SpecificationError reporting
...
Fix spelling error in ModuleEngine
2017-02-14 18:11:20 -05:00
b3be4180de
Clean data/scene folder; remove lodesritest and restructure lodglobes folders
...
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
dc3ded891b
Started with code cleanup of Globebrowsing
2016-12-04 10:34:25 +01:00
0db02995bd
Update Ghoul repository
2016-11-08 13:30:11 +01:00
70af0f0073
Add an option to the configuration manager to append the scene name to the cache directory (closing #159 )
2016-11-07 13:39:01 +01:00
329986c0c6
Merge branch 'develop' into feature/globebrowsing
...
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
7235df2fe3
Place ScriptLog file in base directory
2016-09-20 10:12:53 +02:00
a25a9b4a2d
Add the ability to the FactoryManager to write documentation about all registered classes
...
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
2016-09-16 17:37:02 +02:00
17a65e3816
Writing general Documentation as HTML
...
Add HTML to gitignore
Set default documentation to HTML
2016-09-16 11:56:15 +02:00
408280a533
Rearrange and rename constants in ConfigurationManager
...
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
ae65b8f306
Clean up globe browsing module files.
2016-09-14 21:17:26 -04:00
a02c5714c4
Use html instead of HTML for logging
2016-09-14 16:44:48 +02:00
c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
16b79759b9
Don't flush log immediately
2016-09-03 18:09:55 -04:00
b5b6b38dce
Use globe browsing scene
2016-08-30 19:24:49 -04:00
e55cbaff8c
Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex.
2016-08-29 13:48:05 -04:00
67f1a389d2
Move back to default.scene
2016-08-29 14:55:37 +02:00
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
09ad585be5
Rebase to feature/globebrowsing
2016-08-17 19:16:01 -04:00
1199acc7b9
Re-add and revert back to old ThreadPool. See ticket #128
2016-08-17 18:22:27 -04:00
964953da89
Use stripped out debug scene
2016-08-17 18:17:25 -04:00
fb87842b1b
Update path rendering to higher precision.
2016-08-08 22:35:37 -04:00
d128e09691
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-08 17:20:45 -04:00
d91dd3dbb7
Implement ability to update camera in two steps. still using old method.
2016-08-04 19:16:36 -04:00
d6aa4216cc
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-02 19:25:39 -04:00
64668e9feb
Merge from feature/globebrowsing
2016-08-02 19:25:23 -04:00
4e0bbe2da0
Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision
2016-08-02 19:14:52 -04:00
244c18fdc7
Solve merge conflicts: develop --> globebrowsing
2016-08-02 18:50:10 -04:00
e39a7983aa
Generate keyboard mappings on default
2016-07-29 13:37:38 +02:00
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
444f7b6e25
Enable additional warnings
...
Update Ghoul reference
Fix relative path in test_gdalwms
2016-07-27 14:38:37 +02:00
c7aa6f8de2
Merge osirisrex with globe browsing branch
2016-07-21 17:23:30 -04:00
85810372b4
Add empty osirisrex scene and event data
2016-07-19 14:36:12 -04:00
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
9df88a6a79
Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117 )
2016-07-18 14:54:36 +02:00
6d8a16f19e
Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119 )
...
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120 )
- ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
- The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
1d94dfeb1b
Prep presentation
2016-07-11 16:53:02 -04:00
1ed4a293d4
Use globebrowsing scene
2016-06-30 20:54:20 -04:00
debe475647
Updating to newest Ghoul version
...
Reenabling default.scene as the default scene
2016-06-22 15:30:16 +02:00
3d4e1ec19c
Merge branch 'develop' into release/ips
...
Conflicts:
tests/main.cpp
2016-06-17 11:31:11 +02:00
5925bd9c63
Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp
2016-06-16 17:03:48 +02:00
da956af2bc
Update matrix type in atmosphere (new issues present to be fixed).
2016-06-09 15:21:12 -04:00
b2c895dab0
Merged branch Atmosphere.
2016-06-09 11:45:56 -04:00
Emil Axelsson