mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,328 Commits 85 Branches 47 Tags
342ed2f161e33a3fadded0304e64c47a9c42e5ae
Commit Graph

136 Commits

Author SHA1 Message Date
Emil Axelsson 0b3cbaa961 fix bug in multimodelgeometry loading, initializing w to 0 for all vertices 2016-03-23 11:52:29 +01:00
Michael Nilsson 85225946b9 solved merge conflict 2016-03-18 13:57:28 -04:00
Sebastian Piwell 48021a46e2 Sort screenspacerenderables in correct render order 2016-03-18 12:02:46 -04:00
Sebastian Piwell d77ba76d33 Crop framebuffers 2016-03-18 11:11:42 -04:00
Sebastian Piwell daa06cb387 Scale fix 2016-03-17 18:11:47 -04:00
Sebastian Piwell 8bc736acec Add render functions to screenspaceframebuffer 2016-03-17 17:52:07 -04:00
Sebastian Piwell ac40c0a7d6 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-17 15:38:36 -04:00
Sebastian Piwell 31f1e91b06 Tests for screenSpaceFramebuffer 2016-03-17 15:38:21 -04:00
Michael Nilsson e8175ee54c solved merge conflict, fix for close(socket) in paralellconnection 2016-03-17 14:41:05 -04:00
Sebastian Piwell 5bb4e3640d Solved merge conflict 2016-03-16 17:42:51 -04:00
Sebastian Piwell 171aa46150 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 
Conflicts:
	include/openspace/rendering/screenspacerenderable.h
	modules/base/rendering/screenspaceimage.cpp
	src/rendering/screenspacerenderable.cpp
 2016-03-16 17:42:13 -04:00
Sebastian Piwell 0f963ee3b8 Created screenspaceframebuffer 2016-03-16 17:27:10 -04:00
Michael Nilsson fd5a3a7a1f fix issue with abufferrenderer not working with screenspacerenderables 2016-03-16 16:38:05 -04:00
Sebastian Piwell cab6951140 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-16 11:47:58 -04:00
Sebastian Piwell e6aca4b836 Spherical and Euclidean coordinate update each other 2016-03-16 11:47:53 -04:00
Michael Nilsson f5d223c557 include camera in screenspaceimage 2016-03-16 09:19:28 -04:00
Michael Nilsson e9a3bbd44d Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-16 09:10:31 -04:00
Michael Nilsson f95bb727d7 removed camera parameter from screenspaceimage render function 2016-03-16 09:10:14 -04:00
Sebastian Piwell 6bea326151 Correct euclidean to spherical conversion 2016-03-16 09:09:22 -04:00
Jonathas Costa 7c57b870f0 Changes to accept the new multi-geometry handler, removed wavefrontgeometry header file include and identation fixes. 2016-03-16 09:03:55 -04:00
Jonathas Costa 69e8a1a163 New multi-geometry model handler. 2016-03-16 08:56:18 -04:00
Michael Nilsson 49aa80c859 rotation instead of translation in polar coordinates mode 2016-03-15 09:20:29 -04:00
Michael Nilsson 09f00fe81a convertion to polar coordinates on flatscreen disable 2016-03-14 17:45:37 -04:00
Michael Nilsson a94f877ac7 add occlusionDepth uniform to screenspaceimage 2016-03-14 10:39:20 -04:00
Sebastian Piwell cfd68f2921 ScreenSpaceImage occlussion 2016-03-11 17:08:05 -05:00
Michael Nilsson 7dfdb2083e solved merge conflict 2016-03-11 15:09:07 -05:00
Michael Nilsson c746338553 added viewprojection matrix to screenspaceimage shaderprogram 2016-03-11 09:36:49 -05:00
Sebastian Piwell f01299fe69 Add screenspacerenderables at runtime 2016-03-10 17:41:10 -05:00
Michael Nilsson fe2d90eb8f solved conflict 2016-03-10 15:57:59 -05:00
Michael Nilsson 9b3f2141a2 windows fix in screenspaceimage 2016-03-10 15:52:48 -05:00
Sebastian Piwell 540f7821b8 Compile fix 2016-03-10 15:08:43 -05:00
Sebastian Piwell d27560957d Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 
Conflicts:
	modules/base/rendering/screenspaceimage.cpp
 2016-03-10 15:06:34 -05:00
Sebastian Piwell a53e289a20 Position, scale and texturepath properties 2016-03-10 15:04:44 -05:00
Michael Nilsson 49eece4d43 change test image url to relative path in screenspaceimage 2016-03-10 14:44:15 -05:00
Sebastian Piwell afc3883d4d Flat screen property 2016-03-10 13:01:05 -05:00
Sebastian Piwell 07d6662957 ScreenSpaceRenderabled enabled propery in GUI 2016-03-10 11:19:22 -05:00
Sebastian Piwell bdaf8dd956 Texture on screnspaceimage 2016-03-09 16:57:29 -05:00
Sebastian Piwell dab046b302 Create ScrenSpaceImage at runtime for testing purposes 2016-03-09 10:45:53 -05:00
Michael Nilsson 5a2833743d add support for screenspacerenderables in renderengine 2016-03-08 17:59:06 -05:00
Michael Nilsson aef82d5c9e create screenspacerenderable 2016-03-08 15:11:59 -05:00
Alexander Bock df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock 7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +01:00
Alexander Bock 794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Alexander Bock 877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +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 bae8d0aa76 Making OpenSpaceTest application compile with API change 
Set default start to July 2015
Move default window out of the corner
Compile fixes
 2016-01-14 16:05: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 177571195c Completely remove references to constants.h 2015-12-14 17:36:15 -08:00