Commit Graph

1795 Commits

Author SHA1 Message Date
Alexander Bock 95d933328f Merge branch 'master' into feature/NewAtmosphere 2017-05-25 11:10:09 -04:00
Alexander Bock 8db2db6c1d Fix applications of Time::ref and replace with TimeManager calls 2017-05-25 11:09:19 -04:00
Jonathas Costa f3151f2070 Homogenized shaders versions. 2017-05-24 21:01:32 -04:00
Jonathas Costa 11679cc231 Added new debug system for ATM precalculated textures. Cleaned up some of the ATM shaders. 2017-05-24 18:38:47 -04:00
Jonathas Costa 0cd56d776c Merged master into NewAtmosphere. 2017-05-24 16:53:34 -04:00
Jonathas Costa 554cbcf32a Added gBuffer filling from Globebrowsing. Changed Earth Radius for ATM calculations. Removed unsused code. 2017-05-24 16:09:28 -04:00
Emil Axelsson 752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Alexander Bock f22be1273a Fix property visibility to correctly ignore hidden properties 2017-05-19 16:57:12 -04:00
Jonathas Costa d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Emil Axelsson 05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Emil Axelsson d2d6810451 Change include to cstring 2017-05-18 09:38:21 +02:00
Jonathas Costa 87843b57a5 Removed dummy texture units. Fixed empty ATM. 2017-05-17 14:11:26 -04:00
Jonathas Costa 08fa7a9e7e Changing texture units use in ATM. 2017-05-17 10:08:49 -04:00
Jonathas Costa c2e4a94825 Small improvements. 2017-05-16 16:22:55 -04:00
Alexander Bock 2e38f29eb0 Enable color picking for vec3 and vec4 properties marked as color properties 2017-05-16 14:47:17 -04:00
Jonathas Costa 46864ac744 Initial rendering of Mars with ATM (Lots of fixes still needed). 2017-05-16 14:41:01 -04:00
Jonathas Costa d7f541ec3b Changed part of the Atmosphere's shaders to work with Globebrowsing (Precision problems to be fixed). 2017-05-15 17:04:00 -04:00
Alexander Bock 4568654531 Merge branch 'master' into feature/luaconsole 2017-05-15 15:29:51 -04:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock 3d9375277b Adding LuaConsole to global property namespace
Initial reworking of LuaConsole look and feel
2017-05-14 12:47:10 -04:00
Jonathas Costa 8d95bf05ce Fixed Mars wrong radius. Added debug messages. 2017-05-12 17:53:48 -04:00
Jonathas Costa 587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -04:00
Alexander Bock 66f8043982 Adding more documentation to the space module classes 2017-05-12 13:37:04 -04:00
Alexander Bock 0b1c6706dd Remove unused RenderablePath
Add documentations to base module classes
Change RenderableSphere to not use power scaled coordinates
2017-05-12 11:28:10 -04:00
Alexander Bock 773828c057 Adding documentations to more classes 2017-05-11 22:51:11 -04:00
Alexander Bock d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Jonathas Costa 9639429980 Checking distance from planet's ground. 2017-05-09 12:49:34 -04:00
Jonathas Costa 053b2bc04e Improved atm shaders. 2017-05-05 18:05:58 -04:00
Jonathas Costa c12c51dfa2 Removed hdr and sun intensity from calculations. 2017-05-05 15:18:26 -04:00
Jonathas Costa 1bf64f6056 Fixed old bug in calculation of atmosphere. 2017-05-05 09:16:44 -04:00
Jonathas Costa 8d6fcf6635 Merged master into NewAtmopshere branch. 2017-05-01 11:33:54 -04:00
Jonathas Costa 5d25f02878 Removed unsused code, started ellipsoid rendering for globebrowsing. Added deferred framebuffer. 2017-04-28 11:10:59 -04:00
Jonathas Costa 60af5506d2 Added temporary missing files. 2017-04-28 11:08:54 -04:00
Alexander Bock 8c6efe58e4 Fix broken Pause button 2017-04-26 10:57:07 -04:00
Alexander Bock da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Emil Axelsson b141ad650b Merge branch 'master' of github.com:OpenSpace/OpenSpace 2017-04-25 20:25:50 +02:00
Emil Axelsson 28c82341bf Fix malformed mod files 2017-04-25 18:24:30 +02:00
Alexander Bock 0ff91e896b Fix style guide check
Fix style guide in files
2017-04-24 15:31:32 -04:00
Jonathas Costa dfba5e42a4 Removed intersect code from inside inscattering radiance. Fixed Mars ATM. Preparing to final G-Buffer. 2017-04-23 23:16:42 -04:00
Jonathas Costa 3713ae3f8c Added missing files. Fixed wrong camera. Activated sunRadiance transmittance again. Improved performance. 2017-04-20 21:13:15 -04:00
Alexander Bock 4511d09b10 - Correctly detect isRegularRendering flag
- Render GUI in the PostDraw function in order render it not on the cubefaces

Closes #259
2017-04-20 18:00:31 -04:00
Alexander Bock 99a128b945 Only update ScreenspaceImage texture when it is dirty 2017-04-20 11:57:02 -04:00
Alexander Bock 28e99edd8e Compile fix with RenderableFieldLines
Update Ghoul repository
2017-04-20 11:56:52 -04:00
Jonathas Costa 33edda35f8 Increased pre-calculated texture sizes for atmosphere and disabled sunRadiance attenuation temporarily. 2017-04-19 15:58:06 -04:00
Jonathas Costa 8615860686 Added Deferred Support for Atmosphere. 2017-04-19 13:45:06 -04:00
Emil Axelsson 4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289)
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
2017-04-18 09:58:27 +02:00
Jonathas Costa 454e530ad6 Added deferred rendering support files. Fixed Volume rendering in framebufferrender. 2017-04-18 00:04:29 -04:00
Alexander Bock 481ee7d821 Add extra gdal header that removes external warnings 2017-04-17 18:40:19 -04:00
Alexander Bock 0db98afe6e - Enable caching of TileProviders at startup time
- Enable path tokens in filename for temporal tile providers
 - Add support for relative paths in temporal tile providers
 - Set the GDAL temp dir to the BASE_PATH
 -
2017-04-17 18:38:36 -04:00