Commit Graph

17 Commits

Author SHA1 Message Date
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
Alexander Bock
fb67e805ac Various cleanup
Add script that counts the number of includes
2017-03-02 19:50:05 -05: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
Alexander Bock
6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock
e3d5a9ca38 Cleaned up Doxygen
Removed Doxygen warnings
Documented Property specializations (closing #10)
2016-09-05 17:01:32 +02:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Emil Axelsson
7db9bf0d98 start on experimental hybrid renderer 2016-04-26 10:20:54 +02:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Emil Axelsson
80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson
ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00
Emil Axelsson
73cf15beb6 - Add currentDrawBufferResolution method in WindowWrapper
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
  eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
d0f4ab6f60 Removing Jenkins warnings 2016-02-05 23:28:45 +01:00
Emil Axelsson
a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00