Emil Axelsson
48bd41ad9f
merge in changes from develop
2016-04-12 16:29:35 +02:00
Emil Axelsson
4ff0205eae
bring in support for multiresolution volume rendering
2016-04-11 16:56:44 +02:00
Alexander Bock
7c750ff2a2
Merge branch 'develop' into feature/newhorizons
2016-04-08 13:54:23 +02:00
Emil Axelsson
90f3193236
Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop
2016-04-01 17:48:45 +02:00
Emil Axelsson
568a6a3416
fix bug when numberOfSamples is 0
2016-04-01 17:47:00 +02:00
kalbl
86debebdd9
Fix compilation errors for OSX.
2016-03-30 15:20:20 -04:00
Michael Nilsson
2ca5d52fa3
fix for linux
2016-03-28 11:25:04 -04:00
Emil Axelsson
80fe89dbc8
change interfaces from pointer to reference
2016-03-23 14:00:40 +01:00
Emil Axelsson
a44eed992f
Merge remote-tracking branch 'origin/feature/volumerendering' into develop
2016-03-21 18:55:32 +01:00
Emil Axelsson
ebe10a29b5
Volume rendering compatible with abuffer and framebuffer renderers
2016-03-21 16:40:24 +01:00
Alexander Bock
8031a8c2d4
Fixed RenderableModelProject problem with degrees v radians
...
Added 67P coordinate system to onscreen gui
2016-03-18 23:00:37 +01:00
kalbl
1b8eae5157
Added texture reader and writer for SOIL in renderengine. This solves a problem when using SOIL for image reading which made the program unable to load textures.
2016-03-04 10:47:25 +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
312d52c038
Minor changes
2016-02-07 14:05:59 +01:00
Alexander Bock
71f7a1958b
Change single.xml to use PlanarProjection and (0,0,0) user pos instead
...
Remove computed detection of view direction
2016-02-07 14:05:44 +01:00
Alexander Bock
7e3024959a
Remove the disabling of the blend function after an image projection that caused flickering
...
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Alexander Bock
86e6c21f96
- Make missing SGCT a non-fatal error in CMake
...
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
2016-02-04 21:41:17 +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
Alexander Bock
13510e1085
Merge branch 'feature/cleanup' of openspace.itn.liu.se:/openspace into feature/cleanup
2016-01-02 21:40:29 +01:00
Alexander Bock
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
52971caef5
Cleaning the ScreenLog
2015-12-23 17:18:59 -05:00
Alexander Bock
1a4ea8763e
Fix performance window access to SharedMemory
2015-12-23 14:41:17 -05:00
Alexander Bock
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
Alexander Bock
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock
adfc7d244c
Cleanup of WindowWrapper classes
2015-12-14 15:55:28 -08:00
Alexander Bock
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
8260f5701d
Updated Ghoul
...
Adapted to Ghoul API change
2015-12-12 13:29:09 -05:00
Alexander Bock
ae55078ff8
Updated Ghoul version
...
Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
2015-12-11 16:50:21 -05:00
Alexander Bock
cd3a819541
Updating Ghoul version
...
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Alexander Bock
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
Alexander Bock
383c7028a8
Applied changes in texture reading io classes to OpenSpace
2015-11-24 18:15:23 -05:00
Alexander Bock
293faf8ca9
Adopted cleaned up fontrendering code
2015-11-23 20:18:38 -05:00
Alexander Bock
443963a151
Finished cleanup of SpiceManager
2015-11-20 18:36:03 -05:00
Alexander Bock
2c84368b0b
More cleaning of SpiceManager
2015-11-20 00:54:19 -05:00
Alexander Bock
16897bb8d4
Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it
2015-11-19 15:33:57 -05:00
Alexander Bock
11fec9387b
More changes on the documentation and Exception handling in SpiceManager
...
Change some interfaces on SpiceManager
Removed target position return in powerscaled coordinates and only use glm::dvec4 instead as the Spice library does not have higher accuracy anyway
2015-11-19 13:40:44 -05:00
Alexander Bock
4f7ab5321f
Cleanup RenderEngine to completely rely on Ghoul font rendering
2015-11-17 17:31:43 -05:00
Alexander Bock
2cf7dfb27d
Changed RenderEngine to use Ghoul fontrendering instead of SGCT
2015-11-16 19:21:05 -05:00
Alexander Bock
177ec6d568
Apply new changes to Fontrendering
2015-11-11 00:32:30 -05:00
Alexander Bock
c61d1cc861
Use correct window parameter for font rendering
2015-11-03 20:53:01 -05:00
Alexander Bock
bbb622f555
Initial work on integrating fontrendering into ghoul
2015-11-02 21:40:45 -05:00
Alexander Bock
20861d68ad
Changing WindowWrapper from pointer to reference
2015-10-26 15:10:15 -05:00
Alexander Bock
f3fd055db8
Rename WindowHandler to WindowWrapper
2015-10-26 15:00:46 -05:00
Alexander Bock
77857975a4
Changing the RenderEngine to use the SGCT window wrapper
2015-10-26 11:44:16 -05:00
Alexander Bock
062817b7fb
More work moving code to window wrapper
...
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock
f8f48acb98
Implementation of the windowhandler interface
2015-10-20 23:30:40 +02:00
Alexander Bock
d4da374c23
Reenable colored font rendering
2015-10-08 22:59:36 +02:00
Alexander Bock
35e95b94e7
First version to update OpenSpace to the new SGCT version
2015-10-05 00:07:38 +02:00