Commit Graph

69 Commits

Author SHA1 Message Date
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson
2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Jonathas Costa
785d0ad294 Changes in framebuffer and atm code fixing wrong merge (still need clean up). 2018-03-19 12:29:05 -04:00
Emil Axelsson
5a23a3e93f Fix atmosphere stereo bugs 2018-02-19 22:11:12 +01:00
Jonathas Costa
4b3a11c4aa Initial fixes in ATM for stereo rendering. 2018-02-14 11:35:58 -05:00
Emil Axelsson
499879c84e Start to implement stereo support with adaptive stereoscopic depth 2018-02-14 15:05:52 +01:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06: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
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Emil Axelsson
7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Emil Axelsson
4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Erik Broberg
ee0cc6d165 Remove explicit syncing in Time and Camera and let SyncEngine do the work 2016-09-15 17:03:46 -04:00
Erik Broberg
d287b08c51 Enable toggling use of doublebuffering for camera and time 2016-09-13 11:52:54 -04:00
Erik Broberg
5cb6d2cb05 Move camera and time serialization and deserialization to cpp-files 2016-09-12 14:05:26 -04:00
Erik Broberg
9c5deaba82 Use double buffering for time and camera syncing 2016-09-07 21:39:29 -04:00
Erik Broberg
3a887fef02 Remove non-descriptive preSync and postSync methods from Camera class 2016-09-03 21:02:30 -04:00
Erik Broberg
796f80e511 Remove local, shared, synced Camera members, and keep one source of truth 2016-09-03 20:54:21 -04:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Kalle Bladin
b0d8dd59f4 Update function focusPosition in Camera and add a solar path for OSIRIS REx. 2016-08-12 16:13:24 -04:00
Kalle Bladin
1ebbeb746d Clean up camera class cache variables. 2016-07-11 21:12:56 -04:00
Kalle Bladin
ddd44ad837 Fix bug in camera class 2016-07-11 20:54:16 -04:00
Kalle Bladin
35a095c448 Change camera dictionary state representation to consider position, rotation and focus node. 2016-06-29 15:23:37 -04:00
Kalle Bladin
6cb82f691a Save and restore camera state as lua tables. 2016-06-29 13:04:41 -04:00
Kalle Bladin
5807919ac7 Start changing camera write and restore functions. 2016-06-29 10:45:26 -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
7c0e80b866 Enable basic saving and restoring camera position between runs 2016-06-22 17:37:55 -04:00
Kalle Bladin
d7278bfcc8 Update camera class. 2016-06-05 21:07:36 -04:00
Kalle Bladin
309c97098c Changed interface of camera class 2016-05-20 16:09:35 -04:00
Kalle Bladin
74f190ef7e More clean up in camera class. 2016-05-20 11:46:36 -04:00
Kalle Bladin
e057f60a18 Remove psc internally from camera class. 2016-05-20 10:31:33 -04:00
Kalle Bladin
1db9f2f60c Clean up camera class. 2016-05-19 23:21:48 -04:00
Kalle Bladin
9dda48d44b Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class. 2016-05-19 12:22:55 -04:00
Kalle Bladin
0215c63bab Camera class compiles but missing implementation of two functions. 2016-05-19 11:29:31 -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
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00
Alexander Bock
cb27e37778 Fixes to make the new GLM version compatible 2015-10-05 14:40:21 +02:00
Joakim Kilby
41dd524d38 changes to how mutex protection of camera works.
moved mutex locking of camera variables into camera class and changed where locks occur inte interaction handler to avoid deadlocks
2015-07-03 15:30:34 +02:00
Joakim Kilby
74ab05ec37 rename of mutex 2015-06-17 08:39:49 +02:00
Alexander Bock
597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Joakim Kilby
7c7b4f1f97 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby
5b3742961e added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position) 2015-02-17 13:29:45 +01:00