ca6348194e
Clean up scene loading
2017-03-14 13:40:18 +01:00
92df9caf5a
Clean up scene loading
2017-03-07 16:33:56 +01:00
d92d001364
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
2017-03-07 13:19:07 +01:00
7da999c332
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/engine/settingsengine.cpp
src/engine/syncengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/scenegraph.cpp
src/scene/scenegraphnode.cpp
tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
78ae311a1f
Fix length of RenderableFov when target is not in field-of-view
2017-03-06 15:56:13 -05:00
bb4fca593b
Automatically register core classes on first access to DocumentationEngine
2017-03-06 15:06:54 -05:00
c93af1fcfc
Make the LuaConsole not crash if the cached history file does not exist
2017-03-06 14:20:03 -05:00
403bb3c144
Compile fix for new property enum specification
2017-03-06 09:56:44 -05:00
5c1f3fd0bc
Merge pull request #268 from OpenSpace/pr/enum-compile-fix
...
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 15:33:59 +01:00
03db7a8cc3
Register the LogFactoryDocumentation prior to the Configuration
2017-03-06 09:32:27 -05:00
0cdceddeee
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 10:33:30 +01:00
dcc9d6228d
Some minor cleanup
2017-03-05 20:08:24 -05:00
9b92a4e9ca
Reenable Hybridparser ( closes #221 )
2017-03-05 18:46:31 -05:00
6aa774283d
Make Labelparser more robust by ignoring whitespaces
2017-03-05 17:46:29 -05:00
ad2b627c0e
Fix LogFactory to actually use the presented values
2017-03-05 17:28:06 -05:00
437db6c6f6
Rename PlutoProjection to Pluto
2017-03-05 17:27:43 -05:00
34f1b55c3c
Enable shifting the meridian of a RenderablePlanetProjection by 180 for Pluto
2017-03-05 17:26:22 -05:00
b6ddf2a879
Fix clang compile error regarding std::abs
2017-03-04 20:53:13 -05:00
63af7e67f9
Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass ( closes #260 )
2017-03-03 18:39:35 -05: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
84903b5ad5
Merge pull request #266 from OpenSpace/pr/kameleonvolume
...
Pr/kameleonvolume
2017-03-03 18:30:19 +01:00
4307c06d92
Compile fix
2017-03-03 18:19:10 +01:00
1381ab6600
Merge branch 'pr/kameleonvolume' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume
...
Conflicts:
src/engine/openspaceengine.cpp
2017-03-03 18:09:29 +01:00
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
f726324f7e
Merge branch 'develop' into pr/kameleonvolume
2017-03-03 17:49:23 +01:00
b32c416615
Improvements from code review
2017-03-03 17:39:23 +01:00
9d30d3323b
Update Ghoul repository
...
Adapt to changed signature of ghoul_assert macro
2017-03-03 10:55:20 -05:00
522b3a7829
Update include finding script
2017-03-02 19:53:55 -05:00
fb67e805ac
Various cleanup
...
Add script that counts the number of includes
2017-03-02 19:50:05 -05:00
1689dc4047
Move the PropertyOwner name specification into the constructor and adjust accordingly
2017-03-02 18:25:13 -05:00
aba3536caa
Don't assert if the focus node is not found if there are no nodes at all
2017-03-02 17:32:20 -05:00
c12bd7182b
Some cleanup of ModuleEngine
...
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
2017-03-02 17:24:44 -05:00
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
5faff1d3bf
Change to correct include guard name
2017-03-02 18:53:06 +01:00
0377737843
Adapt to new interfaces
2017-03-02 18:53:05 +01:00
c2fa08716b
Cleanup
2017-03-02 18:53:05 +01:00
a9cc253a93
- Remove documentation.h include and replace with forward declaration
...
- Move Documentation struct into documentation namespace
2017-03-02 18:53:04 +01:00
a61209f945
Some cleanup of ConfigurationManager
2017-03-02 18:53:04 +01:00
dd0d5d86af
Update branch to work with changes in develop
2017-03-02 18:53:03 +01:00
442969f2b1
Jenkins compilation fix
2017-03-02 18:50:11 +01:00
6cd91ef44c
Clean up volume rendering code
2017-03-02 18:20:06 +01:00
17cc48621a
Fix inside volume rendering crash on certain platforms
2017-03-02 18:20:05 +01:00
bf0d5528d0
Resolve some A-buffer related shader issues
2017-03-02 18:20:05 +01:00
e665bca128
Compile fixes
2017-03-02 18:20:04 +01:00
2a234befe8
Begin implementing clip plane support for kameleon volumes
...
Conflicts:
modules/volume/CMakeLists.txt
2017-03-02 18:20:04 +01:00
dbe8857e42
Clarify spice comments
2017-03-02 18:20:03 +01:00
81d1358236
Update spice frames
2017-03-02 18:20:03 +01:00
686fec4f9d
Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes
...
Conflicts:
data/scene/mercury/mercury.mod
data/scene/saturn/saturn/saturn.mod
2017-03-02 18:20:02 +01: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
99f265c1ed
Update Ghoul repository
2017-03-01 22:38:49 -05:00
Emil Axelsson