Commit Graph

32 Commits

Author SHA1 Message Date
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
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
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -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
0d03177d43 Feature/globebrowsingcleanup (#230)
* Initial restructuring of the Globebrowsing branch

* Update Ghoul repository
Fix include guards

* More cleanup

* Split texttileprovider subclasses into separate files

* Move TileProviders into namespace

* Convert static class methods into free functions

* Splitting tile subclasses into their own files
Remove `using namespace` from header file

* Split TileDataSet subclass into separate file
Update SGCT reference

* Move shader preprocessing data into internal class

* More Globebrowsing cleanup

* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01: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
d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
kalbl
0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +01:00
Alexander Bock
92676c107f Remove wrong type of whitespace
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
kalbl
dddb85d538 Solve build error when globe browsing module is inactive. 2016-10-24 10:24:42 +02:00
kalbl
2f32e67b87 Set interaction to properly depend on delta time. 2016-10-20 18:37:18 +02:00
kalbl
7f62bd7206 Create namespace globebrowsing. 2016-10-18 15:40:27 +02:00
kalbl
c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
kalbl
6ef366afdd Add smooth transition when resetting camera direction. 2016-10-05 01:47:49 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
kalbl
831664c032 Update all interaction to be possible without a middle mouse button. 2016-09-29 22:20:35 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Emil Axelsson
41fafcb5df begin refactor parallel connection 2016-09-08 18:04:06 +02:00
Erik Broberg
047e754369 Remove serialize() and deserialize() from InteractionHandler and InteractionMode 2016-09-06 13:53:31 -04:00
Alexander Bock
e3d5a9ca38 Cleaned up Doxygen
Removed Doxygen warnings
Documented Property specializations (closing #10)
2016-09-05 17:01:32 +02:00
Erik Broberg
649d8d2f67 Remove shared and synced versions of data members in MouseStates 2016-09-03 22:54:02 -04:00
Alexander Bock
193e2bdc64 Fix linking error when OpenSpace is compiled without the globebrowsing module 2016-08-29 10:45:59 +02:00
Alexander Bock
be67131c33 Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 00:56:28 +02:00
Kalle Bladin
d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
Kalle
3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
kbladin
a89f474502 Solve merge conflict and add properties for friction and interaction parameters. 2016-06-30 14:07:51 -04:00
Kalle Bladin
161d722623 Enable setting of friction, sensitivity and followscalefactor in interaction handler. 2016-06-29 21:13:04 -04:00
Kalle Bladin
e5ccf185cd Remove rotation state variables from interaction mode and enable more freely local rotation. 2016-06-28 22:28:56 -04:00
Erik Broberg
745c51c4e4 Add unimplemented initialize to InteractionModes 2016-06-22 18:22:46 -04:00
Erik Broberg
60da53c00e Divide InteractionHandler and Interaction modes into different files 2016-06-22 14:42:24 -04:00