Commit Graph

636 Commits

Author SHA1 Message Date
Alexander Bock
735d6378d9 More work on loading screen
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
Alexander Bock
9577f2dd49 Start adding loading screen code 2017-11-02 16:56:49 -04:00
Alexander Bock
78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Emil Axelsson
96f512484b Asset loading fix on mac 2017-11-01 14:54:03 +01:00
Emil Axelsson
fba556b11f Always create a camera 2017-10-31 10:55:20 +01:00
Alexander Bock
0f8adec9aa Show on-screen information about friction status 2017-10-30 14:28:03 -04:00
Emil Axelsson
8059fb05e9 More work on asset management 2017-10-27 16:43:04 +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
9b6028028a Clean up RenderEngine 2017-10-24 03:16:29 -07:00
Alexander Bock
5a9ebe552b Add the ability to remove Tags 2017-10-24 01:47:14 -07:00
Alexander Bock
269dda8aff Remove runTime from OpenSpaceEngine and place in WindowWrapper instead 2017-10-24 01:33:53 -07:00
Alexander Bock
eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -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
27dea20520 Work on asset loading 2017-10-19 13:24:21 +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
Emil Axelsson
18c50afeb5 Work on data management. Add some tests 2017-10-13 16:56:53 +02:00
Alexander Bock
327779d88f Implemented Space/Time ImGui widget 2017-10-11 15:58:41 -04: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
4cdae984e9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e Only display commit hash text overlay if there is information available
Add version and commit information into a global property
2017-08-31 11:37:22 -04:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
2017-08-30 14:56:02 -04: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
Emil Axelsson
6c36fa7bfd Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	include/openspace/util/concurrentjobmanager.h
	include/openspace/util/concurrentjobmanager.inl
	include/openspace/util/concurrentqueue.h
	include/openspace/util/concurrentqueue.inl
	include/openspace/util/threadpool.h
	modules/globebrowsing/tile/tileloadjob.h
	modules/sync/syncmodule.cpp
	src/util/threadpool.cpp
2017-08-15 11:34:54 +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
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock
036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Emil Axelsson
9491e920ad Work on asset loader and synchronization module 2017-07-21 15:36:09 +02:00
Alexander Bock
77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Emil Axelsson
8c124955fd Compile fixes after merge 2017-07-18 14:21:17 +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
0963184293 Removing more warnings 2017-07-18 01:05:59 -04: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
Alexander Bock
c3929f5d6d Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file 2017-07-13 14:52:13 -04:00
Kalle Bladin
6e16466755 Back to LF line endings (#359)
* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Add .editorconfig

This is a tool that allows you to tell multiple editors what type of code
style and configuration that should be used. It unifies the settings and
makes the risk of running into config-related issues smaller.
2017-07-13 16:49:42 +02:00
Alexander Bock
83cbe7f891 Print parsing errors in openspace.cfg 2017-07-11 15:17:11 -04:00
Alexander Bock
6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Emil Axelsson
f091444972 Make it possible to toggle asset dependencies in the gui 2017-07-11 17:02:21 +02:00
Matthew Territo
2d1661679c Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine. 2017-07-10 11:53:15 -06:00
Alexander Bock
1cf53d5479 Make console work with Fisheye rendering 2017-07-08 17:11:50 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00