mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,689 Commits 83 Branches 48 Tags
e8175ee54cd834dcd732a6958372b46c15e00d4c
Commit Graph

1689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Nilsson e8175ee54c solved merge conflict, fix for close(socket) in paralellconnection 2016-03-17 14:41:05 -04:00
Michael Nilsson 910ab3458e screenspaceimage test boilerplate and first test 2016-03-17 10:49:01 -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 5a0ee0bc7a add math.h to screenspacerenderables for M_PI, windows only 2016-03-16 17:21:54 -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
Jonathas Costa 69f9e21824 New Ghoul version. 2016-03-16 11:11:50 -04:00
Jonathas Costa b09026ee42 Merge branch 'develop' into MultiModelFormatReader 2016-03-16 10:44:07 -04:00
Jonathas Costa 182e332661 New Ghoul version (with Assimp library support). 2016-03-16 10:40:25 -04:00
Michael Nilsson f5d223c557 include camera in screenspaceimage 2016-03-16 09:19:28 -04:00
Jonathas Costa 7e34f226ba CMake default module conf for NewHorizons. 2016-03-16 09:17:28 -04:00
Jonathas Costa f6b65ab8e0 Added entries for Windows thumbs files and Emacs backup files. 2016-03-16 09:15:31 -04:00
Jonathas Costa ae63941737 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:43 -04:00
Jonathas Costa 6a2460a876 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:31 -04:00
Jonathas Costa 725142334e Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:10 -04:00
Jonathas Costa 2fcb75003c Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:53 -04:00
Jonathas Costa 2e8b264717 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:30 -04:00
Jonathas Costa 994530265d Added new scene files to the configuration file (These new files are commented by default). 2016-03-16 09:10:52 -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 be34d7c303 Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project. 2016-03-16 09:08:47 -04:00
Jonathas Costa 3a9e5e5790 Removed WavefrontGeometry class register and added the MultiModelGeometry class register. 2016-03-16 09:05:16 -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
Alexander Bock c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Michael Nilsson 97a7de9f28 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-15 09:20:43 -04:00
Sebastian Piwell 2a110768c8 Better test mouse controls for screenspaceimages 2016-03-15 09:21:17 -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 34ca17563f Occlussion for fisheye and singel_two_win 2016-03-11 18:51:10 -05: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