mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,040 Commits 99 Branches 46 Tags
0cdceddeeec8a84b9356ec0d280eddff46c27017
Commit Graph

4040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emil Axelsson
0cdceddeee Rename None to Hidden, to avoid collision with X11 and reset data path 2017-03-06 10:33:30 +01: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
ad2b627c0e Fix LogFactory to actually use the presented values 2017-03-05 17:28:06 -05:00
Alexander Bock
437db6c6f6 Rename PlutoProjection to Pluto 2017-03-05 17:27:43 -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
84903b5ad5 Merge pull request #266 from OpenSpace/pr/kameleonvolume 
Pr/kameleonvolume
 2017-03-03 18:30:19 +01:00
Emil Axelsson
4307c06d92 Compile fix 2017-03-03 18:19:10 +01:00
Emil Axelsson
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
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
f726324f7e Merge branch 'develop' into pr/kameleonvolume 2017-03-03 17:49:23 +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
522b3a7829 Update include finding script 2017-03-02 19:53:55 -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
c12bd7182b Some cleanup of ModuleEngine 
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
 2017-03-02 17:24:44 -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
Alexander Bock
a9cc253a93 - Remove documentation.h include and replace with forward declaration 
- Move Documentation struct into documentation namespace
 2017-03-02 18:53:04 +01:00
Alexander Bock
a61209f945 Some cleanup of ConfigurationManager 2017-03-02 18:53:04 +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
bf0d5528d0 Resolve some A-buffer related shader issues 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
dbe8857e42 Clarify spice comments 2017-03-02 18:20:03 +01:00
Emil Axelsson
81d1358236 Update spice frames 2017-03-02 18:20:03 +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
99f265c1ed Update Ghoul repository 2017-03-01 22:38:49 -05: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
2b07cf8c05 Add check for correct indenting of copyright header 2017-03-01 21:19:27 -05:00
Alexander Bock
3274882ec2 Add checks for inline files in style checker 2017-03-01 21:17:12 -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
6748305267 Some cleanup of ConfigurationManager 2017-03-01 11:30:54 -05:00
Alexander Bock
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