Commit Graph

166 Commits

Author SHA1 Message Date
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
Gene Payne
be1b211dfb Feature/satellites (#325)
* Initial commit of satellites test branch

* Modified code to work with batch TLE files from online links specified in .mod file. Does not yet auto-download the files.

* Added debug function to mod file for testing static points in orbit

* Fixed time offset bug that was corrupting satellite positions

* Minor changes for debug output and camera position.

* Changed to circle billboard for rendering satellite position

* Added satellite group name to each renderable title, and keyboard shortcuts for toggling visibility

* Added support for using ghoul luasocket lib to download latest satellite TLE files from celestrak.com

* Adding reference to updated Ghoul submodule containing luasocket changes

* Updating reference to latest Ghoul submodule in feature/satellites

* Updated reference to new ghoul version

* Updated reference to new ghoul submodule version for satellites

* Updated reference to new ghoul submodule version for satellits

* Updated versions of TLE files

* Added new Lua-accessible downloader available for scene loading

* Improved error handling for TLE files

* Updated submodule reference for ext/ghoul prior to luasocket addition

* Update SGCT reference
2017-06-06 13:42:38 -04:00
Alexander Bock
d6a4106c93 Feature/spout (#291)
* Add initial Spout implementation

* Some cleanup
2017-04-24 14:45:23 -04:00
Kalle Bladin
8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02:00
Alexander Bock
f993f45dd1 Cleaner specification of "Scene" attribute in Lua-generated SGCT Configuration 2017-04-10 13:02:21 -04:00
Alexander Bock
437db6c6f6 Rename PlutoProjection to Pluto 2017-03-05 17:27:43 -05:00
Alexander Bock
85c3de9152 Feature/modular sgct config (#239)
* Initial work to create SGCT configuration files from Lua

* More work on modularizing the SGCT configs
 - Removing almost all pregenerated config files
 - Working functions to create configurations with single and fisheye
   rendering viewports

* Some more work on modular SGCT configurations
  - Make more objects configurable
  - Add documentation
  - Make use of new `sgct.config.single` and `sgct.config.fisheye` functions

* Fix accidental commit

* Enable single configuration as default

* Do not remove single_fisheye.xml for inspiration

* Update single_fisheye.xml

* Update configuration_helper.lua

* Place multiview and multinode configuration files back
2017-02-22 15:35:55 -05:00
Alexander Bock
04c6398d6a Fix case dependent kernels in OsirisRex
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
2016-12-06 18:47:46 +01:00
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock
f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
Alexander Bock
af7e43c66a Rename bind_keys.lua script file to bind_common_keys.lua
Move SPICE kernel declaration from osirisrex.scene into the osirisrex mod file
2016-11-07 11:06:52 +01:00
Alexander Bock
4caa3d25ba Add documentation to the rosetta scene keyboard bindings 2016-11-07 10:34:19 +01:00
Alexander Bock
286eb89048 Add more documentation to the bindKey functions of NewHorizons and OsirisRex 2016-11-07 00:21:55 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
85f298a659 Add documentation to openspace.bindKeys script 2016-11-05 16:23:05 +01:00
kalbl
c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
kalbl
19842ac05d Update key bindongs for friction. 2016-09-28 23:05:50 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Alexander Bock
34b1401d99 Some configuration update to 67P and key bindings 2016-09-01 09:34:08 +02:00
Erik Broberg
af5c0c71e8 More explicit scheduled script helpers and set osiris rex trails enabled values at launch 2016-08-30 15:37:33 -04:00
Erik Broberg
69681ea36e Move helper lua functions for script scheduling to scripts/common.lua 2016-08-30 14:03:19 -04:00
Erik Broberg
06b7c0776e Press F4 to reload scheduled scripts from file during run time 2016-08-30 12:28:35 -04:00
Alexander Bock
29d50e85fe Bind keys to disable outer planets orbits 2016-08-30 11:07:13 +02:00
Erik Broberg
4c502b1258 Avoid bind common keys twice 2016-08-26 18:13:09 -04:00
Erik Broberg
8b4e6e855f Mkae DeltaTimeKeys map to values relating to minutes, hours, days, years, etc 2016-08-26 17:41:44 -04:00
Erik Broberg
ef94fe3533 Add key bindings file for OsirisRex scene 2016-08-26 17:36:43 -04:00
Matthew Territo
08c9862c32 Merge branch 'develop' into feature/globebrowsing 2016-08-11 21:59:38 -06:00
Matthew Territo
cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Matthew Territo
9a435ac74d Extended temporary fade functionality
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
2016-07-27 19:25:49 -06:00
Kalle Bladin
541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock
6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Kalle
8fcaaf2799 Merge remote-tracking branch 'origin/develop' into feature/globebrowsing 2016-07-13 12:09:02 -04:00
Kalle
718a5d69e6 Change lua common script to toggle three types of interaction friction. 2016-07-13 12:01:50 -04:00
Alexander Bock
5502c52b9a Adapt Rosetta and New Horizons keybindings to restructuring of ProjectionComponent 2016-07-01 15:22:21 +02:00
Alexander Bock
5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Michael Nilsson
6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00
Alexander Bock
fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock
d3ab18ec93 Clean keybindings of Rosetta scene 2016-05-30 13:54:33 +02:00
Alexander Bock
884324c467 Cleanup of default.scene and keybindings 2016-05-30 13:36:55 +02:00
Alexander Bock
52c5d3a406 Add common Lua functions for scene definitions
Adapt New Horizons scene to use new common.lua file
2016-05-30 13:25:31 +02:00
Alexander Bock
78c0ed902f Correct displacement factor for planetary heightmap
Correctly bind F8 key for clearing rosetta projections
2016-05-30 11:41:14 +02:00
Alexander Bock
7b525d1b29 Move keybindings for the newhorizons scene into its own file 2016-05-19 17:20:38 +02:00
Alexander Bock
dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Alexander Bock
20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00