Commit Graph

99 Commits

Author SHA1 Message Date
Alexander Bock 58f79a8851 Issue/518 (#529)
* Adding ScreenSpaceSpout object to display spout textures in screen space
 * Enable the clearing of option properties
 * Fix crash in ScreenSpaceImageLocal specification
 * Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
 * Add RenderablePlane Spout
 * Rename Texture parameter in ScreenSpaceImageOnline into URL

Closes #518
2018-02-23 13:24:35 -05:00
Alexander Bock 47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock 026f51735b Show distance from current focus object
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Alexander Bock 7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock 78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04:00
Alexander Bock 2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock 8fd60ce8e6 - Remove documentation.h include and replace with forward declaration
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock 8867b3439f Add central location for the core to register documentations
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Alexander Bock 9fb7814145 Add visibility toggle to Property base class
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Sebastian Piwell 1e4e8919c3 Set attributes of screenspacerenderable through dictionary 2016-05-03 15:35:33 -04:00
Michael Nilsson 4d61694f75 ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory 2016-05-03 10:39:32 -04:00
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Sebastian Piwell 453fbe300e Remove screenspacerenderables in any order 2016-04-04 15:40:45 -04:00
Sebastian Piwell 3fbfb9bb33 Remove screenspacerenderables 2016-04-04 13:49:21 -04:00
Sebastian Piwell 79979fe8dd Clean up 2016-03-31 14:53:42 -04:00
Michael Nilsson e09ed7594e Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-30 09:52:01 -04:00
Michael Nilsson 3e7249157c add some documentation 2016-03-30 09:17:49 -04:00
Sebastian Piwell 48978f38fc removed mouseinteraction test for screenspacerenderables 2016-03-21 09:20:47 -04:00
Sebastian Piwell 48021a46e2 Sort screenspacerenderables in correct render order 2016-03-18 12:02:46 -04:00
Michael Nilsson 70d7d3c82a add alpha property to screenspacerenderable 2016-03-18 10:33:34 -04:00
Michael Nilsson 4b6b34cd74 added test case for screenspaceimage 2016-03-17 17:45:27 -04:00
Sebastian Piwell 31f1e91b06 Tests for screenSpaceFramebuffer 2016-03-17 15:38:21 -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
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