Commit Graph

29 Commits

Author SHA1 Message Date
Alexander Bock
51e1541cf1 Fix static initialization fiasco with touch input
Restore backwards compatibility of mod files
Provide better feedback about specification errors
2017-07-26 16:12:13 -04:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
26682669ff More work on making use of nested namespaces 2017-07-16 01:55:35 -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
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06:00
Jonathan Bosson
d8b0800488 Merge branch 'master' into feature/multitouch 2017-07-12 12:46:18 -06:00
Alexander Bock
db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Alexander Bock
6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Jonathan Bosson
76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Emil Axelsson
5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02:00
Jonathan Bosson
4cdd4ed931 Merge fix with master 2017-05-19 12:43:58 -06: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
Jonathan Bosson
7580688f88 modification to allow gui control through touch 2017-05-05 14:00:12 -06:00
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -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
Emil Axelsson
5589de995b Feature/domecasting (#288)
* Improve dome casting feature. Add basic GUI for domecasting.

* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.

* Do not try to reconnect to parallel connection forever

* Fix interpolation bug for dome casting with globe browsing interaction mode

* Show parallel connection properties in correct GUI

* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.

* Update header file

* Clean up dome casting code

* Remove obsolete lua functions from ParallelConnection.
2017-04-13 23:16:00 +02:00
Alexander Bock
76aed0578c Feature/virtualproperty (#286)
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -04:00
Alexander Bock
63af7e67f9 Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass (closes #260) 2017-03-03 18:39:35 -05:00
Alexander Bock
d6b5bb753b - Some cleanup of LuaConsole
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
2017-03-02 14:27:18 -05:00
Alexander Bock
8910aac834 - Replace window name check with tag check for GUI code (closing #258)
- Only show GUI, console, and screenlog on the GUI window
2017-02-28 20:38:58 -05:00
Alexander Bock
6c4efc4eec Move OpenSpaceEngine::isMaster method into WindowWrapper class 2017-02-25 11:29:28 -05:00
Alexander Bock
11fbff5fbc Reduce the dependency of libOpenSpace on modules
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
2017-02-16 16:43:34 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock
5227ce2213 Renamed OpenSpaceModule's initialize method to create
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock
978b535a2f Remove setName function from OpenSpaceModule and move naming into constructor 2015-06-22 22:57:15 +02:00
Alexander Bock
77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00