Commit Graph

60 Commits

Author SHA1 Message Date
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
Alexander Bock f7e5ba8fff Closes #604
Remove identifier from VirtualPropertyManager
Add VirtualPropertyManager to the query of allProperties
2018-04-21 14:34:15 +00:00
Alexander Bock f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Emil Axelsson 4675554471 One Property Tree (#500)
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Emil Axelsson d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Alexander Bock a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -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 b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06: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
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 80222ba2d5 Make it possible to run OpenSpace without opening a scene 2017-07-03 18:02:37 +02:00
Alexander Bock 0b289a4b77 Some cleanup 2017-06-09 18:49:20 -04:00
Alexander Bock 76aed0578c Feature/virtualproperty (#286)
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -04:00
Alexander Bock 087ec76ebb Fix problem with openspace.setPropertyValue not working 2017-04-12 13:32:15 -04:00
Alexander Bock 9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04: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 d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock a244defdbc Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
 - The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
 - The setPropertyValueRegex Lua function allows a full regular expression to be used

Closing #108
2016-07-18 20:12:24 +02:00
Sebastian Piwell 342b7fa985 Renamed IswaGroup to IswaBaseGroup 2016-06-01 15:25:11 -04:00
Sebastian Piwell 39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Sebastian Piwell 7eae57b02f Removed iswacontainer 2016-05-03 13:46:02 -04:00
Sebastian Piwell c57a9b7be1 Replaced string with enum 2016-05-03 10:06:47 -04:00
Sebastian Piwell 8bde97fdfa ISWAGroup for manipulation of multiple dataplanes 2016-05-02 17:32:25 -04:00
Sebastian Piwell 434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Sebastian Piwell 7a0d880299 Works even if no iSWA module is created 2016-04-05 16:38:30 -04:00
Sebastian Piwell b25453e368 Works without iSWA module enabled 2016-04-05 15:55:55 -04:00
Sebastian Piwell 8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -04:00
Sebastian Piwell 100f1b75dd Seperated iSWAManager and iSWAContainer 2016-03-31 10:53:03 -04:00
Michael Nilsson ba57bd4cf8 solve merge conflict 2016-03-31 09:50:50 -04:00
Michael Nilsson e2e1ae9829 change function and variable names from datasurface to iswacygnet in ISWAManager 2016-03-30 15:59:08 -04:00
Sebastian Piwell add61b099e More name changes 2016-03-30 15:42:22 -04:00
Sebastian Piwell c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Sebastian Piwell 57afa8fe9f TexturePlane scales after texture ratio 2016-03-30 09:42:46 -04:00
Sebastian Piwell 0bcdb88874 Properies for dataSurface 2016-03-30 09:36:41 -04:00
Sebastian Piwell 07d6662957 ScreenSpaceRenderabled enabled propery in GUI 2016-03-10 11:19:22 -05: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 678362eee2 Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack 2015-07-06 15:55:42 +02:00
Alexander Bock fa765b9ded Introducting hack to make Interactionhandler properties be settable by scripts 2015-07-06 14:50:55 +02:00
Alexander Bock 10d00729a6 More linux fixes 2015-04-17 13:59:57 +02:00
Alexander Bock e7767bff11 More work on SceneGraph
First working and sorted version
2015-04-13 16:07:27 +02:00
Alexander Bock 79f3052887 More work on SceneGraphLoader
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00
Alexander Bock a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00