Commit Graph

129 Commits

Author SHA1 Message Date
Emil Axelsson
2fa42859cd Decentralize resource synchronization. Remove notion of SynchronizationJob. 2017-11-12 19:09:16 +01:00
Emil Axelsson
19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Emil Axelsson
a73f2e0d00 Work on asset synchronization 2017-11-11 18:48:07 +01:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Emil Axelsson
cb07af4a2b Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-10 16:07:58 +01:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +01:00
Emil Axelsson
1f33359697 Cleanup and better configuration of resource syncs 2017-11-05 23:17:51 +01:00
Emil Axelsson
c7f16189d8 Compile fix for macOS 2017-11-01 14:31:14 +01:00
Emil Axelsson
a7a0715200 Restructure sync directories and change sync API 2017-11-01 12:31:40 +01:00
Emil Axelsson
2313a275d3 Resource syncing infrastructure 2017-10-31 17:46:48 +01:00
Emil Axelsson
fba556b11f Always create a camera 2017-10-31 10:55:20 +01:00
Emil Axelsson
19393feac8 Work on syncing and initialization of assets 2017-10-31 10:04:02 +01:00
Emil Axelsson
a9c74977fd Work on asset management 2017-10-27 14:42:45 +02:00
Emil Axelsson
f9ec20812d Introduce AssetManager 2017-10-27 10:57:39 +02:00
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
eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Alexander Bock
97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Emil Axelsson
6d8ec8a7c6 Compile fix for clang 2017-10-22 20:54:55 +02:00
Emil Axelsson
9e5a033cd2 Use shared pointers for assets 2017-10-19 15:48:07 +02:00
Emil Axelsson
97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Emil Axelsson
81298f10be Work on asset synchronization and initialization 2017-10-16 19:08:22 +02:00
Alexander Bock
bb5f4d4381 Rename GuiGrouping to GuiPath
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Emil Axelsson
18c50afeb5 Work on data management. Add some tests 2017-10-13 16:56:53 +02:00
Alexander Bock
ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -04:00
=
6ebfb92a8d Work on asset loading 2017-10-12 19:00:51 +02:00
=
6f3cc8f6a5 Work on asset loading 2017-10-11 17:06:51 +02:00
Emil Axelsson
c0b9e1d1a7 Clean up code 2017-10-10 16:43:12 +02:00
Emil Axelsson
b6bee846a2 Work on data management 2017-09-21 16:29:21 +02:00
Emil Axelsson
f4901fa4cf Work on asset management 2017-09-18 18:13:20 +02:00
Emil Axelsson
8a30251fcb Work on asset management 2017-09-18 12:56:55 +02:00
Emil Axelsson
aaed6ab6d7 Work on asset loader and assets 2017-09-15 14:05:43 +02:00
Emil Axelsson
bf45937619 Compile fix in asset and assetloader 2017-09-15 11:13:46 +02:00
Emil Axelsson
af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +02: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
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
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Emil Axelsson
84a52c091a Work on assets 2017-07-20 17:06:34 +02:00
Emil Axelsson
5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +02: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
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
Emil Axelsson
5c342ed6a2 Work on asset organization, cleanup code, handle dependencies better 2017-07-13 17:36:50 +02:00
Emil Axelsson
f091444972 Make it possible to toggle asset dependencies in the gui 2017-07-11 17:02:21 +02:00
Emil Axelsson
5ef5db1c6a Introduce asset toggles 2017-07-10 15:05:18 +02:00
Emil Axelsson
15dc2c3441 Fix bugs in scene graph manipulation API 2017-07-07 13:33:29 +02:00
Emil Axelsson
58a423fc56 Loading and unloading assets 2017-07-06 22:33:11 +02:00
Emil Axelsson
ee36a97762 Improve asset lua interface. Simplify scene loading. 2017-07-06 16:40:35 +02:00
Emil Axelsson
2e4b908318 Work on asset loading 2017-07-05 20:17:23 +02:00