mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 05:00:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,088 Commits 87 Branches 46 Tags
7f2aa891d1fe331e96c1937255d7069f8307f0a0
Commit Graph

1692 Commits

Author SHA1 Message Date
Alexander Bock
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
Alexander Bock
78b0d77101 Start removing warnings 2017-04-06 20:07:01 -04:00
Alexander Bock
d7e1a21551 Define compile options as private for supressing warnings 2017-04-06 19:38:10 -04:00
Emil Axelsson
a44978b90e Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-04-04 14:26:17 +02:00
Emil Axelsson
a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Alexander Bock
a35609c6dd Add new libCurl that supports SSL for new GIBS datasets 
Update WMS specification of GIBS datasets
 2017-04-03 15:53:56 -04:00
Emil Axelsson
b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Alexander Bock
c6fbf6902a OSX compile fix 2017-03-14 11:16:43 -04:00
Alexander Bock
b74bff45cb Allow an Image SequenceParser to not return target times (used for the HongKang parser not returning any if Lorri is ignored 2017-03-13 11:23:42 -04:00
Alexander Bock
0d157ac165 Let FloatProperty and derived properties render at higher resolution in Onscreen GUI 2017-03-13 11:17:52 -04:00
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