Commit Graph

76 Commits

Author SHA1 Message Date
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
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
Alexander Bock
4184740ce8 Code cleanup 2017-06-09 16:09:58 -04:00
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -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
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -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
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -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
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190 Move network status into parallel connection class 2016-09-30 13:36:35 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson
e8f9d4b37b clean up time sync 2016-09-23 00:31:47 +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
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Emil Axelsson
41fafcb5df begin refactor parallel connection 2016-09-08 18:04:06 +02:00
Erik Broberg
9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Alexander Bock
65ddeba70c Add SGCT as submodule
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Kalle Bladin
45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Michael Nilsson
2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
293faf8ca9 Adopted cleaned up fontrendering code 2015-11-23 20:18:38 -05:00
Alexander Bock
a59ed82ec5 Linux compile fix 2015-07-16 14:39:51 +02:00
Alexander Bock
5fcc8792a2 Updated OpenSpace Version
Rename capitalized include to non-capitalized
2015-07-16 14:32:09 +02:00
Joakim Kilby
2f801a4171 adding a password check when changing hosts 2015-07-07 15:29:56 +02:00
Joakim Kilby
326f42f224 changed it so the buffer is completely flushed if there are messages queued when send function is called 2015-07-07 14:05:09 +02:00
Joakim Kilby
b75743a0ba stability fix to ensure socket isn't shutdown when first message has not yet been queued 2015-07-07 13:37:23 +02:00
Joakim Kilby
414e8d1182 renaming function for sending
minor bugfix
2015-07-07 13:23:32 +02:00
Joakim Kilby
9cdc9c30d2 code cleanup and optimisation in the way threads are handled 2015-07-07 12:49:48 +02:00
Joakim Kilby
2a0787386e adding a forced time jump to trigger recomputation of trails when an init message is received 2015-07-07 08:21:10 +02:00
Joakim Kilby
987af4fb76 removing more obsolete functions 2015-07-06 18:55:49 +02:00
Joakim Kilby
bf14a2bcc2 Merge branch 'feature/remote_redesign' of openspace.itn.liu.se:/openspace into feature/remote_redesign
* 'feature/remote_redesign' of openspace.itn.liu.se:/openspace:
  Fixing proper decoding of initialization messages
2015-07-06 18:49:21 +02:00
Joakim Kilby
b0eef21a2c removing obsolete functions and lua scripts 2015-07-06 18:49:17 +02:00
Joakim Kilby
07a3c6fb0c Fixing proper decoding of initialization messages 2015-07-06 18:44:47 +02:00
Joakim Kilby
36db7c37bf minor fix 2015-07-06 15:09:08 +02:00
Joakim Kilby
0550ffd0db recommit of previous fix 2015-07-06 15:06:48 +02:00
Joakim Kilby
f01278be60 test 2015-07-06 14:56:02 +02:00
Joakim Kilby
51bab14dcc adding initialization messages functionality 2015-07-06 14:06:54 +02:00
Joakim Kilby
e8809ac84c changes to syncing of scripts for properties 2015-07-06 11:28:15 +02:00
Joakim Kilby
34412b7a8b more work on communication protocol 2015-07-06 10:00:07 +02:00