mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,343 Commits 83 Branches 46 Tags
16595db09f0e7feed89a94aa20c840568dfbfe35
Commit Graph

57 Commits

Author SHA1 Message Date
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Emil Axelsson
fd550fc372 Fix compilation issues and bugs on windows 2017-12-18 10:22:42 +01:00
Emil Axelsson
df259f6d02 Multithreaded scene initialization 2017-12-17 17:34:46 +01:00
Emil Axelsson
62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
 2017-11-12 10:50:11 -05:00
Emil Axelsson
19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +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
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
 2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style 
Add strict mode to check_style_guide script
 2017-11-08 10:35:39 -06: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
97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +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
Alexander Bock
ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -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
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
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
15dc2c3441 Fix bugs in scene graph manipulation API 2017-07-07 13:33:29 +02:00
Alexander Bock
f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Emil Axelsson
4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289) 
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
 2017-04-18 09:58:27 +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
Gene Payne
4a312c70b8 Merge branch 'master' into feature/grouping 2017-04-13 11:23:15 -06:00
GPayne
ae2cb222b0 Switched to using propertyowners in grouping, and group/tag name in group syntax 2017-03-21 11:35:09 -06:00
Emil Axelsson
92df9caf5a Clean up scene loading 2017-03-07 16:33:56 +01: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
2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs 
Adjust accordingly
 2017-03-01 22:03:48 -05:00
Alexander Bock
4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock
8fd60ce8e6 - Remove documentation.h include and replace with forward declaration 
- Move Documentation struct into documentation namespace
 2017-03-01 18:13:15 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Emil Axelsson
4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Emil Axelsson
ad3921fda5 Remove unused postRender method for scene graph nodes and renderables 2016-12-14 14:14:53 +01:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core 
Remove unused files
 2016-12-09 13:54:22 +01:00
Alexander Bock
ed4b8c9fa8 Store Translation, Rotation, and Scaling Performance measurements 
If no special sorting is requested in Performance GUI, sort by name
 2016-10-28 12:52:54 +02:00
Alexander Bock
4b9bed3b21 Make Translation, Rotation, and Scaling available as Properties in SceneGraphNode 2016-10-28 11:52:44 +02:00
Alexander Bock
7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
29c989ab82 Add documentation to the documentation and verifier classes 
Add static const member variable to the DocumentationEntry class for Wildcards
 2016-09-18 20:47:41 +02:00
Alexander Bock
1778a7cdb6 Add documentation to SceneGraphNode 2016-09-15 13:28:52 +02:00
Kalle Bladin
a9b8bec7b4 Remove parts of bounding sphere definition in SceneGraphNode. 2016-08-17 00:38:18 -04:00
Kalle Bladin
542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Kalle Bladin
2f05c8a5f0 Enable scene graph nodes to have transforms relative to parent node. 2016-08-15 13:08:30 -04:00
Kalle Bladin
bd867ec402 Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model. 2016-08-12 12:28:56 -04:00
Kalle Bladin
4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Kalle
916916f82b Fix bug that caused change in camera direction when switching between interaction mode. 2016-07-12 14:52:00 -04:00
Kalle
031461307c Solve problem with unsynched world position between interaction handler and renderer. 2016-06-30 22:43:27 -04:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Alexander Bock
906470f28e Untabify the rest of the source files 
Update Ghoul repository
 2016-04-18 20:14:29 +02:00
Alexander Bock
019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Emil Axelsson
ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00