Commit Graph

1932 Commits

Author SHA1 Message Date
Jonathas Costa
741eb0c895 Added Aerial Perspective effect. Needs tweaking. 2017-05-25 16:50:59 -04:00
Jonathas Costa
0cd56d776c Merged master into NewAtmosphere. 2017-05-24 16:53:34 -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
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
Alexander Bock
302d3eb64e Don't use outline fonts for Console
Update Ghoul repository
2017-05-19 16:39:58 -04:00
Matthew Territo
5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06: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
d7e46e2824 Formatting 2017-05-17 21:34:14 +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
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
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
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
2c54e3675d Some more work on the LuaConsole 2017-05-15 14:34:35 -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
Matthew Territo
92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs
# Conflicts:
#	ext/sgct
#	openspace.cfg
2017-05-12 15:40:06 -06:00
Jonathas Costa
587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -04:00
Alexander Bock
2d5c292326 Fix the ScriptLog output 2017-05-12 14:03:57 -04:00
Alexander Bock
b660a84464 Code cleanup 2017-05-11 18:51:42 -04:00
Alexander Bock
5ebf2a4913 Rename Documented to DocumentationGenerator 2017-05-11 18:16:30 -04:00
Alexander Bock
17fe85afba Add documentation 2017-05-11 18:01:36 -04:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock
ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation
Apply Documented class to the InteractionHandler
Update Ghoul
2017-05-09 18:06:14 +01:00
Alexander Bock
701b3afb2c Clean up interdace of Mission class 2017-05-09 11:17:14 +01:00
Alexander Bock
ab192959c5 Position frame number rendering correctly on MacOS
Use more efficient drawing method
Small style fixes
2017-05-09 10:58:28 +01:00
Alexander Bock
fdd5a98bcd Render shutdown information correctly on MacOS 2017-05-09 10:44:20 +01:00
Alexander Bock
63d607281a Update SGCT repository
Add property to toggle date rendering independent from rendering statistics
2017-05-09 10:30:35 +01: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
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
Alexander Bock
0ff91e896b Fix style guide check
Fix style guide in files
2017-04-24 15:31:32 -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
Jonathas Costa
8615860686 Added Deferred Support for Atmosphere. 2017-04-19 13:45:06 -04:00