Commit Graph

1810 Commits

Author SHA1 Message Date
Alexander Bock d61bb20992 Some more work on RenderableFov
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04:00
Alexander Bock ea4d9c8e44 Cleanup of RenderableCrawlingLine
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Alexander Bock 6e9d8103ac Do not enable KameleonVolume and ToyVolume on default to limit dependencies 2017-03-10 09:32:57 -05:00
Alexander Bock bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Emil Axelsson d92d001364 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-07 13:19:07 +01:00
Emil Axelsson 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
Alexander Bock 78ae311a1f Fix length of RenderableFov when target is not in field-of-view 2017-03-06 15:56:13 -05:00
Alexander Bock 403bb3c144 Compile fix for new property enum specification 2017-03-06 09:56:44 -05:00
Alexander Bock dcc9d6228d Some minor cleanup 2017-03-05 20:08:24 -05:00
Alexander Bock 9b92a4e9ca Reenable Hybridparser (closes #221) 2017-03-05 18:46:31 -05:00
Alexander Bock 6aa774283d Make Labelparser more robust by ignoring whitespaces 2017-03-05 17:46:29 -05:00
Alexander Bock 34f1b55c3c Enable shifting the meridian of a RenderablePlanetProjection by 180 for Pluto 2017-03-05 17:26:22 -05:00
Alexander Bock b6ddf2a879 Fix clang compile error regarding std::abs 2017-03-04 20:53:13 -05:00
Alexander Bock 63af7e67f9 Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260) 2017-03-03 18:39:35 -05:00
Alexander Bock 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
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
Emil Axelsson b32c416615 Improvements from code review 2017-03-03 17:39:23 +01:00
Alexander Bock 9d30d3323b Update Ghoul repository
Adapt to changed signature of ghoul_assert macro
2017-03-03 10:55:20 -05:00
Alexander Bock fb67e805ac Various cleanup
Add script that counts the number of includes
2017-03-02 19:50:05 -05:00
Alexander Bock 1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -05:00
Alexander Bock 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
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 5faff1d3bf Change to correct include guard name 2017-03-02 18:53:06 +01:00
Emil Axelsson 0377737843 Adapt to new interfaces 2017-03-02 18:53:05 +01:00
Emil Axelsson c2fa08716b Cleanup 2017-03-02 18:53:05 +01:00
Emil Axelsson dd0d5d86af Update branch to work with changes in develop 2017-03-02 18:53:03 +01:00
Emil Axelsson 442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Emil Axelsson 6cd91ef44c Clean up volume rendering code 2017-03-02 18:20:06 +01:00
Emil Axelsson 17cc48621a Fix inside volume rendering crash on certain platforms 2017-03-02 18:20:05 +01:00
Emil Axelsson e665bca128 Compile fixes 2017-03-02 18:20:04 +01:00
Emil Axelsson 2a234befe8 Begin implementing clip plane support for kameleon volumes
Conflicts:
	modules/volume/CMakeLists.txt
2017-03-02 18:20:04 +01:00
Emil Axelsson 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
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 1225119a7d Add missing include in SequenceParser 2017-03-01 22:27:17 -05:00
Alexander Bock 6877fc4170 Add missing include in ImageSequencer 2017-03-01 22:24:08 -05:00
Alexander Bock 2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock 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
Alexander Bock 4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock 8fd60ce8e6 - Remove documentation.h include and replace with forward declaration
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
Alexander Bock 6694cfd98c Remove warning from iSWA manager download 2017-02-28 21:23:10 -05:00
Alexander Bock 2500b5f72b Add Dictionary constructor to TileIndexTileProvider (closes #248) 2017-02-28 21:22:42 -05:00
Alexander Bock 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
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Jonathas Costa 3c4bf23317 Merged develop into NewAtmosphere branch. 2017-02-27 15:02:02 -05:00
Jonathas Costa 4dd076260b Merged Linux Features in Windows. 2017-02-27 14:51:19 -05:00
Jonathas Costa 6183ed3e90 Added texture clean up shaders in Windows. 2017-02-27 14:16:30 -05:00
Jonathas Costa 4170e9cf3c Included new module in Windows. 2017-02-27 14:15:11 -05:00
Alexander Bock 283c83e37c Removing code analysis warnings
Start cleaning RenderEngine
2017-02-26 23:45:39 -05:00
Alexander Bock 5bf729dca9 Compile fix for Dataconverter 2017-02-25 18:40:34 -05:00