Commit Graph

226 Commits

Author SHA1 Message Date
Alexander Bock
c7809cb6cf Some initial work to make OpenGL 3.3 work
Make OpenSpace not crash if the FontRenderer shader cannot be compiled
2016-10-29 16:55:02 +02:00
Emil Axelsson
cb3ff96e1a Pass window size as uniform instead of shader program constant. Fixes #143 2016-10-28 10:26:23 +02:00
Emil Axelsson
d0ec7ac735 render trails with additive blending 2016-08-25 16:32:27 +02:00
Alexander Bock
0cefde84d2 Fix shader compile error for inside volume raycasting 2016-06-17 18:30:39 +02:00
Emil Axelsson
fa1bf5873f fix fisheye rendering bug 2016-06-15 10:41:47 +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
432a29314c fix bugs in galaxy rendering 2016-05-20 14:34:03 +02:00
Emil Axelsson
7e7d27446c volumetric galaxy rendering 2016-05-20 11:01:01 +02:00
Emil Axelsson
f8007266e8 Merge branch 'feature/hybrid-renderer' into feature/galaxy 2016-05-19 15:25:10 +02:00
Alexander Bock
29187fdf52 Removing quadFrag, singlepassraycaster and twopassraycaster shaders 2016-05-01 13:24:59 +02:00
Alexander Bock
eb4904fc17 Moving pscstandard shader into base 2016-05-01 13:21:57 +02:00
Alexander Bock
14b06d7e32 Removing pointcloud and postFX shaders 2016-05-01 13:21:34 +02:00
Alexander Bock
cfb895e2e9 Move fboPass shader into NewHorizons module 2016-05-01 13:14:36 +02:00
Alexander Bock
3fbff9c0a3 Remove unused files 2016-05-01 13:14:19 +02:00
Alexander Bock
6daf8cb6a0 Move nighttexture shader into base module 2016-05-01 13:08:30 +02:00
Emil Axelsson
7db9bf0d98 start on experimental hybrid renderer 2016-04-26 10:20:54 +02:00
Alexander Bock
4b4a7805c2 Fix the image orientation in the FBO passing for planetprojection 2016-04-20 15:44:06 +02:00
Alexander Bock
c14aa7b11b Fix inverted texture problem
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +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
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +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
55660846f1 Add missing copyright statements 2016-03-21 17:04:10 +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
f266f0bcee Updated copyright header 2016-02-05 22:47:37 +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
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
bc5eec4158 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	src/util/spicemanager.cpp
2015-07-08 16:51:40 +02:00
Alexander Bock
2947a6f85a Introducing hack in ABuffer to make the backside of planetprojection not be transparent 2015-07-08 16:45:08 +02:00
Alexander Bock
9ef34a6e54 Only define the masks when using the single linked lists
Define uints using the proper constructors
2015-07-08 15:54:42 +02:00
Alexander Bock
1882bdaea3 One more minor code change 2015-07-07 18:27:22 +02:00
Alexander Bock
953e4c5161 Minor code change 2015-07-07 16:54:16 +02:00
Alexander Bock
8de6d9db05 Moving global blackout factor into RenderEngine
Cleanup of Abuffer implementations
2015-06-05 14:25:35 +02:00
Alexander Bock
77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock
ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock
154a949e8b Cleaning up more shaders 2015-05-20 11:28:51 +02:00
Alexander Bock
b8cd01ea4e Removing ghosting from renderablemodel
Organizing shaders
2015-05-20 11:18:14 +02:00
Alexander Bock
18752b9d8b Remove individual dirty flags for ProgramObjects and replace with new Ghoul version
Moved projectiveTexture shader into modules directory
2015-05-20 10:33:36 +02:00
Anton Arbring
75c268db08 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderengine.cpp
2015-05-19 12:00:02 -04:00
Alexander Bock
dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock
15908e75a3 Undo sphere changes to make stars look proper again 2015-05-18 18:52:59 +02:00
Alexander Bock
217753bf86 Reverting last changes as they do not work on Windows 2015-05-17 13:59:30 +02:00
Alexander Bock
fe9b3172c6 Committing the depth hack for renderablemodel
Adding GL_STENCIL_BIT for Mac as it seems to help with an NSOpenGL error
2015-05-17 12:07:08 +02:00
Alexander Bock
6a9fdef2e0 Fixes for Mac rendering of stars and milkyway 2015-05-14 12:50:17 +02:00
Anton Arbring
30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp
2015-05-13 16:44:03 -04:00
Anton Arbring
a0042ef219 More last minute fixes
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
2015-05-13 16:15:50 -04:00
Alexander Bock
28abe46bcf Fixing various issues that appeared in Mac
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
2015-05-13 16:52:25 +02:00
Alexander Bock
41c1293cc4 Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx 2015-05-13 14:25:08 +02:00