Commit Graph

954 Commits

Author SHA1 Message Date
Alexander Bock 9c7bd2af67 Restructuring documentation code 2016-09-13 16:27:42 +02:00
Alexander Bock a3dde8da41 First working implementation of automatic documentation generation 2016-09-13 15:30:11 +02:00
Alexander Bock 8f4f4c101f Updated Ghoul repository 2016-09-13 15:29:03 +02:00
Alexander Bock 0376300732 Update Ghoul
Change TriangleSoup and StatsCollector to use new Boolean class
2016-09-11 19:37:15 +02:00
Alexander Bock 7086440384 Turn property identifier and guiName specification into prerequisites
Allow NumericalProperty's min and max value to be changed after construction
2016-09-07 11:24:04 +02:00
Alexander Bock e3d5a9ca38 Cleaned up Doxygen
Removed Doxygen warnings
Documented Property specializations (closing #10)
2016-09-05 17:01:32 +02:00
Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
2016-08-29 15:53:59 +02:00
Alexander Bock 193e2bdc64 Fix linking error when OpenSpace is compiled without the globebrowsing module 2016-08-29 10:45:59 +02:00
Alexander Bock 6d20c8301f Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 01:07:27 +02:00
Alexander Bock be67131c33 Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 00:56:28 +02:00
Emil Axelsson bc58623467 add render bins to improve rendering of transparent objects using framebuffer renderer 2016-08-25 18:26:59 +02:00
Erik Broberg 337cc64ab1 Add forgotten file 2016-08-22 15:35:27 -04:00
Erik Broberg b92b5260ff Render dummy Mission phases 2016-08-19 10:58:03 -04:00
Kalle Bladin 628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Kalle Bladin ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Erik Broberg 23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Alexander Bock 6c43d8404a Added missing files 2016-08-17 16:27:13 +02:00
Alexander Bock c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Kalle Bladin a9b8bec7b4 Remove parts of bounding sphere definition in SceneGraphNode. 2016-08-17 00:38:18 -04:00
Kalle Bladin c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Kalle Bladin 64ba3d2717 Add new files supposed to be in previous commit. 2016-08-17 00:30:03 -04:00
Kalle Bladin 542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Kalle Bladin 9d04fd5593 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-15 13:08:50 -04:00
Kalle Bladin 2f05c8a5f0 Enable scene graph nodes to have transforms relative to parent node. 2016-08-15 13:08:30 -04:00
Erik Broberg 656426dbe5 Merge 2016-08-12 17:05:44 -04:00
Erik Broberg 7fc31151ea Clean up: Remove targetBody from Renderable 2016-08-12 16:42:33 -04:00
Kalle Bladin fd5355b00f Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-12 12:29:29 -04:00
Kalle Bladin bd867ec402 Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model. 2016-08-12 12:28:56 -04:00
Erik Broberg 0f21217f38 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-08-12 11:06:03 -04:00
Matthew Territo 08c9862c32 Merge branch 'develop' into feature/globebrowsing 2016-08-11 21:59:38 -06:00
Matthew Territo cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Matthew Territo c3ae58afba Add access to deltaTime/getDt in SGCT/WindowWrapper 2016-08-11 19:19:07 -06:00
Erik Broberg 1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00
Kalle Bladin d128e09691 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-08 17:20:45 -04:00
Kalle Bladin d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
Erik Broberg d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Kalle Bladin 4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock 50dd45fbb1 Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node 2016-08-01 16:20:23 +02:00
Alexander Bock 81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00
Alexander Bock 6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
2016-07-31 19:26:55 +02:00
Alexander Bock 635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Alexander Bock 0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00
Matthew Territo fdb90f74ac Added scene selector in the SettingsEngine, in the GUI under Global Properties.
Has placeholder functionality for what's coming in the next commit.
2016-07-27 16:45:43 -06:00
Matthew Territo f53c4b6193 OptionProperty: ability to get the string description by passing a value
string getDescriptionByValue(int)
2016-07-27 09:25:28 -06:00
Matthew Territo 2abd1951fa Add display option to OptionProperty
For displaying as Radio or Dropdown
2016-07-22 19:07:32 -06:00
Matthew Territo 8f40020fcb Add ability to append multiple Options to an OptionProperty
via addOptions(vector<int>, vector<string>)
2016-07-22 12:39:09 -06:00
Erik Broberg b44e761eba Merge branch 'develop' into feature/globebrowsing 2016-07-21 13:29:33 -04:00
Matthew Territo a2c96f5a36 Added ability to cycle through average frametime, FPS and average FPS
"t" and "Shift+t" are Lua bindings in common.lua
Maybe needs to be part of SettingsEngine instead, but the display code was already in RenderEngine, so it'll do for now on this branch
2016-07-20 16:33:37 -06:00