Commit Graph

326 Commits

Author SHA1 Message Date
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
Michael Nilsson f95bb727d7 removed camera parameter from screenspaceimage render function 2016-03-16 09:10:14 -04:00
Sebastian Piwell 2a110768c8 Better test mouse controls for screenspaceimages 2016-03-15 09:21:17 -04:00
Michael Nilsson 09f00fe81a convertion to polar coordinates on flatscreen disable 2016-03-14 17:45:37 -04: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
Sebastian Piwell a53e289a20 Position, scale and texturepath properties 2016-03-10 15:04:44 -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
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
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 c92fc923f9 Remove constants.h file
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock 293faf8ca9 Adopted cleaned up fontrendering code 2015-11-23 20:18:38 -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 bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -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 7401b7d48b Enable FrameBuffer-based rendering on Windows 2015-06-18 15:42:41 +02:00
Alexander Bock 37a54ab22b Move specification of RenderingMethod into renderengine 2015-05-28 20:44:12 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock 4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +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 8860a1cd1f Remove vao, vbo and ibo property declarations from simplespheregeometryprojection class 2015-05-19 01:09:57 +02:00
Alexander Bock dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock abdd1af2a9 Cleaning up abuffer classes
Make ABuffer type selectable in openspace.cfg
2015-05-19 00:47:47 +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
Michal Marcinkowski 1369e5caf5 adding capability to clear images on the fly
- (rest will be done on antons machine)
2015-05-13 15:19:41 -04:00
Alexander Bock 597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Anton Arbring 906bcf10a5 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderengine.cpp
2015-05-12 23:29:14 -04:00
Anton Arbring 481f247a23 Pre presentation mods
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
2015-05-12 23:23:29 -04:00
Alexander Bock b5aa86873a Fix many warnings 2015-05-12 13:05:35 +02:00
Anton Arbring cf857fc0f2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-11 18:41:25 -04:00
Anton Arbring 1cebc07939 Modified projections, removed fading and some key binds 2015-05-11 18:39:35 -04:00
Alexander Bock c345774a0d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-05-11 23:30:12 +02:00
Alexander Bock 5027b32f9d Add RenderableCrawlingLine for REX instrument on New Horizons 2015-05-11 23:29:27 +02:00
Anton Arbring d6eaa0a81c Added renderablePath with timestamps
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
2015-05-11 14:41:27 -04:00