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
Emil Axelsson
c97813c851
Linux compile fix: add missing include
2017-05-18 09:31:25 +02:00
Emil Axelsson
d7e46e2824
Formatting
2017-05-17 21:34:14 +02:00
Emil Axelsson
4fcb92385c
Fix inconsistent order of members in header file and initialization
2017-05-17 21:28:20 +02:00
Emil Axelsson
1eee40887d
Tweak animation and appearance of lua console + Remove some duplicate code
2017-05-17 21:21:51 +02:00
Jonathas Costa
87843b57a5
Removed dummy texture units. Fixed empty ATM.
2017-05-17 14:11:26 -04:00
Alexander Bock
70aeaeaed5
Added missing line ending
2017-05-17 11:32:41 -04:00
Alexander Bock
11c3e29ca0
Rendering a cursor to show the current text entry state
2017-05-17 11:27:43 -04:00
Alexander Bock
cefedabd84
More work on LuaConsole
2017-05-17 10:49:28 -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
65d284efc7
More work on LuaConsole
...
Don't have the console consume function keys
2017-05-16 16:13:52 -04:00
Alexander Bock
38e2521743
Some more work on new LuaConsole
...
Add Inconsolata font
2017-05-16 14:47:44 -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
