9532e998b0
cleanup with using namespace in header files, start of new interaction class for touch input
2017-03-08 20:43:17 -07:00
1451d26851
Include right directories on posix files as well
2017-03-07 10:48:22 -07:00
436da23cd2
Include posix files in lubTUIO if its built on a UNIX unit. Small cleanup in touchmodule
2017-03-07 10:24:07 -07: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
403bb3c144
Compile fix for new property enum specification
2017-03-06 09:56:44 -05: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
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
4a2d70b88d
merge with develop for jenkins build messages
2017-03-03 12:10:41 -07: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
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
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
dbc5f806f4
isMaster no longer exists
2017-03-02 15:57:36 -07:00
4b8111439c
merge with develop
2017-03-02 15:49:54 -07: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
436d573c75
lastList is now a pair of id and the last frames TuioPoint. Makes check to only process if we get new input
2017-03-02 14:35:41 -07: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
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
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
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
1225119a7d
Add missing include in SequenceParser
2017-03-01 22:27:17 -05:00
6877fc4170
Add missing include in ImageSequencer
2017-03-01 22:24:08 -05:00
2f2fa3b031
Update Ghoul repository to have the factory return unique_ptrs
...
Adjust accordingly
2017-03-01 22:03:48 -05:00
fbea8389c8
- Add check in style guide that prevents ‘using namespace’ in header files
...
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
2017-03-01 21:02:33 -05:00
4e52f27f9e
Remove Dictionary include with forward declarations
2017-03-01 19:20:00 -05:00
8fd60ce8e6
- Remove documentation.h include and replace with forward declaration
...
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
6694cfd98c
Remove warning from iSWA manager download
2017-02-28 21:23:10 -05:00
2500b5f72b
Add Dictionary constructor to TileIndexTileProvider ( closes #248 )
2017-02-28 21:22:42 -05:00
8910aac834
- Replace window name check with tag check for GUI code (closing #258 )
...
- Only show GUI, console, and screenlog on the GUI window
2017-02-28 20:38:58 -05:00
6199289e91
Code cleanup
2017-02-27 23:03:07 -05:00
36a7c62acb
attempt to make rotation work well
2017-02-27 18:59:47 -07:00
283c83e37c
Removing code analysis warnings
...
Start cleaning RenderEngine
2017-02-26 23:45:39 -05:00
5bf729dca9
Compile fix for Dataconverter
2017-02-25 18:40:34 -05:00
6c4efc4eec
Move OpenSpaceEngine::isMaster method into WindowWrapper class
2017-02-25 11:29:28 -05:00
Jonathan Bosson