Commit Graph

4311 Commits

Author SHA1 Message Date
Jonathas Costa
cfdff58ea6 Added Gamma Correction Control. 2017-06-01 13:39:35 -04:00
Jonathas Costa
47cb1cb17f Changed Tone Mapping Operator. 2017-06-01 11:49:14 -04:00
Alexander Bock
997d9844cf Add additional trace information
Prevent crash if console shader is missing
2017-05-31 17:51:58 -04:00
Jonathas Costa
e3e1155a0e Enabled G-Buffer for space items. 2017-05-31 17:12:44 -04:00
Alexander Bock
9ea188cb2e Fixing star shaders for Mac 2017-05-31 16:55:19 -04:00
Jonathas Costa
c87527e792 Fixed bug in shader. 2017-05-31 16:41:02 -04:00
Jonathas Costa
0cb741e024 Improved code and changed some hdr parameters. 2017-05-30 15:42:25 -04:00
Jonathas Costa
c37cf66a52 Reflectance not working correctly yet. 2017-05-30 15:11:14 -04:00
Jonathas Costa
96e9067eed Changes to allow the correct reflectance inside ATM (code commented right now). 2017-05-30 14:23:06 -04:00
Jonathas Costa
2854435458 Fixed normal in renderable planet. Added different tone mappings (not enabled by default). 2017-05-30 11:55:44 -04:00
Jonathas Costa
f33a31b214 Improve blending. Enabled stars with ATM. 2017-05-29 00:58:19 -04:00
Jonathas Costa
4ad0843cc4 Enabled G-Buffer for Stars. 2017-05-29 00:57:47 -04:00
Jonathas Costa
71aab2a187 Fixed weird black line rendered in ATM. Improved blend function. 2017-05-29 00:38:16 -04:00
Jonathas Costa
1986e6992f Enabled milkway and stars. 2017-05-29 00:37:33 -04:00
Jonathas Costa
6f987cbba2 Enabled G-Buffer for Trails. 2017-05-29 00:36:52 -04:00
Jonathas Costa
c1799560ba Enabled G-Buffer for Milkway. 2017-05-29 00:36:00 -04:00
Jonathas Costa
49f03ba958 Fixed bug in Sun position inside ATM. 2017-05-26 16:20:13 -04:00
Jonathas Costa
33fbe90dc5 Removed unsued code from main shader file. 2017-05-26 14:40:12 -04:00
Jonathas Costa
f134eb3531 Changed normals from Eye to Model space in GlobeRendering G-Buffer. Fixed and improved ground irradiance reflection. 2017-05-26 14:32:02 -04:00
Jonathas Costa
741eb0c895 Added Aerial Perspective effect. Needs tweaking. 2017-05-25 16:50:59 -04:00
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
788d5f4b04 Add build timeout (#317) 2017-05-24 15:52:14 +02: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
Matthew Territo
3a5635d2a8 Merge pull request #312 from OpenSpace/feature/launcherconfigs
Merge feature/launcherconfigs
2017-05-22 00:03:59 -06:00
Alexander Bock
1add9be22f Implement a first working version of extra long strings in console 2017-05-19 17:26:05 -04:00
Matthew Territo
17b0034384 Put _optionParser back into use. 2017-05-19 15:22:00 -06:00
Alexander Bock
f22be1273a Fix property visibility to correctly ignore hidden properties 2017-05-19 16:57:12 -04:00
Alexander Bock
302d3eb64e Don't use outline fonts for Console
Update Ghoul repository
2017-05-19 16:39:58 -04:00
Matthew Territo
ade212665e Change tab to spaces 2017-05-19 12:15:39 -06:00
Matthew Territo
ce83666ec0 Cleanup Launcher config comments, unecessary changes, etc. 2017-05-19 12:08:55 -06:00
Matthew Territo
5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06:00
Alexander Bock
4adae3afa1 Merge pull request #309 from OpenSpace/feature/luaconsole
Feature/luaconsole
2017-05-18 15:21:25 -04:00
Alexander Bock
36be013578 Merge remote-tracking branch 'origin/master' into feature/luaconsole 2017-05-18 15:09:06 -04:00
Alexander Bock
e7a48f150a Remove clang warning
Make the opening speed DPI scaling-dependent
2017-05-18 14:59:17 -04:00
Alexander Bock
ba19348b58 Speed up console opening (and make it depenent on the current frametime, rather than the average)
Make the ESC key close the console
Make the Numpad Enter key work the same as regular Enter key
2017-05-18 14:53:03 -04:00
Jonathas Costa
d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Kalle Bladin
8f415ff907 Remove unnecessary misstake 2017-05-18 14:04:31 +02:00
Kalle Bladin
b46a5be65a Merge branch 'feature/luaconsole' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 13:57:32 +02:00
Kalle Bladin
28bdf4eb32 Fix OSX issues 2017-05-18 13:57:11 +02:00
Emil Axelsson
187b7b6506 Add missing includes 2017-05-18 12:59:29 +02:00
Emil Axelsson
abaed50afb Add keybindings 2017-05-18 10:57:41 +02:00
Emil Axelsson
05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Matthew Territo
0a1101d0e4 Missing Destructors: Issue #307 (#308)
* Adding empty destructor for Scene.

* RenderEngine Destructor empty/no longer default

* Create empty ~ScreenLog
2017-05-18 10:13:20 +02:00
Emil Axelsson
4671928754 Merge branch 'master' of github.com:OpenSpace/OpenSpace
Conflicts:
	modules/base/rendering/multimodelgeometry.cpp
2017-05-18 09:39:15 +02:00
Emil Axelsson
d2d6810451 Change include to cstring 2017-05-18 09:38:21 +02:00