Commit Graph

372 Commits

Author SHA1 Message Date
Emil Axelsson
157d91d631 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-26 13:43:49 +02:00
Alexander Bock
269dda8aff Remove runTime from OpenSpaceEngine and place in WindowWrapper instead 2017-10-24 01:33:53 -07:00
Alexander Bock
eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Emil Axelsson
2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
Alexander Bock
a016fd96a6 Fix duplicate property name error 2017-08-14 15:24:41 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Emil Axelsson
cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
Alexander Bock
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock
ad5ca816a9 Move friction properties into common subowner 2017-07-29 01:33:22 -04:00
Alexander Bock
e0dc60f218 Remove duplicate specification of property in OrbitalNagivator 2017-07-28 17:55:58 -04:00
Alexander Bock
d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Alexander Bock
e93070504b Some more property documentation 2017-07-25 01:08:20 -04:00
Alexander Bock
1a475ef570 Started documenting properties
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
Alexander Bock
036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock
04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock
b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Alexander Bock
77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock
3469d19de7 Jenkins compile fix 2017-07-19 01:28:30 -04:00
Emil Axelsson
8c124955fd Compile fixes after merge 2017-07-18 14:21:17 +02:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock
ec6641038d Make use of C++17 features in LuaConsole and filesystem walking 2017-07-15 14:37:00 -04:00
Alexander Bock
6f524f4a67 Add centralized escaping of JSON strings
Enable correct escaping of " character thus removing the need to outlaw "s in comments
2017-07-14 16:58:18 -04:00
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin
2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Jonathan Bosson
d9fa55581f changes from PR comments 2017-07-13 20:10:35 -06:00
Jonathan Bosson
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06:00
Jonathan Bosson
76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Emil Axelsson
219501d4f4 Feature/luaconsole (#316)
* LuaConsole: Fix bug related to horizontal scrolling 

* LuaConsole: Sanitize input and avoid crash when the input is very long

* Split up long lines of code

* Add consts and replace auto by real type

* LuaConsole: Do not consume modifier keys
2017-05-25 18:01:21 +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
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
Jonathan Bosson
0a1cd285a3 merge fix 2017-05-19 13:04:28 -06:00
Jonathan Bosson
4cdd4ed931 Merge fix with master 2017-05-19 12:43:58 -06:00
Jonathan Bosson
612b207d19 mute mouse input when we have touch input (for feedback on linux) 2017-05-18 19:19:26 -06: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
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
abaed50afb Add keybindings 2017-05-18 10:57:41 +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
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
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