Commit Graph

1991 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
Jonathan Bosson
fd7971c1ed Merge branch 'master' into feature/multitouch 2017-07-13 21:02:43 -06:00
Matthew Territo
9a9fcf0ac1 Alex's recommended changes in pull #357. Add check for log directory existence
and creation
2017-07-13 20:16:01 -06:00
Jonathan Bosson
d9fa55581f changes from PR comments 2017-07-13 20:10:35 -06:00
Matthew Territo
b4c128306f Merge branch 'master' into feature/statlogs
* master:
  Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file
  Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set
2017-07-13 18:16:23 -06:00
Jonathan Bosson
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06: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
Jonathan Bosson
78c301ec8d Merge branch 'master' into feature/multitouch 2017-07-13 11:07:39 -06:00
Matthew Territo
9f8036fa0e Line endings 2017-07-13 11:00:50 -06:00
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Matthew Territo
cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06: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
Jonathan Bosson
d8b0800488 Merge branch 'master' into feature/multitouch 2017-07-12 12:46:18 -06:00
Matthew Territo
f1417210fa Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 13:56:40 -06: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
Jonathan Bosson
0fd80209d0 Merge branch 'master' into feature/multitouch 2017-07-11 12:24:33 -06:00
Alexander Bock
314c6c0848 Enable Property to have multiple callbacks 2017-07-11 14:23:17 -04:00
Matthew Territo
85eb00c022 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 12:07:06 -06:00
Jonathan Bosson
76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Matthew Territo
2d1661679c Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine. 2017-07-10 11:53:15 -06:00
Matthew Territo
6bbb90a78a Merge branch 'master' into feature/statlogs
* master:
  Make console work with Fisheye rendering
  Correctly position Screenspace renderable if a scene tag is specified
  Move SGCT config files into main config folder and remove unused transferfunctions
  Increasing warning level
2017-07-09 23:16:32 -06:00
Alexander Bock
1cf53d5479 Make console work with Fisheye rendering 2017-07-08 17:11:50 -04:00
Alexander Bock
3520e42097 Correctly position Screenspace renderable if a scene tag is specified 2017-07-08 16:30:19 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Matthew Territo
f1d468dd3a Appending to logs now instead of overwriting :-/ 2017-07-07 12:52:55 -06:00
Matthew Territo
115bb998c9 Remove colons and cat filename together with formatLogName. 2017-07-07 10:44:16 -06:00
Matthew Territo
a165af8c59 Output to files. Function files aren't writing for some reason. 2017-07-06 18:34:38 -06:00
Matthew Territo
a91e48efe7 Add PerformanceMeasurement logging variables to ConfigurationManager. Read from logDir and file prefix from config file in PerformanceManager. 2017-07-06 17:01:21 -06:00
Matthew Territo
810c2ec493 Enable PerformanceManager logging with ImGui checkbox. 2017-07-06 12:07:50 -06:00
Matthew Territo
9015a8dad9 Example of access to invidvidual performance statistics 2017-07-05 15:31:09 -06:00
Matthew Territo
da3b8052ab Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-05 11:33:05 -06:00
Matthew Territo
1d9bb740f2 Some clarification & iteration fixes. 2017-07-03 14:43:18 -06:00
Matthew Territo
81164e0d8d Stub for Performance Manager & GUI Button 2017-07-03 13:46:17 -06:00
Alexander Bock
cfdeea31ae Compile fix in Pixelbuffer 2017-07-03 11:20:31 -04:00
Alexander Bock
467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
eriksunden
0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Alexander Bock
9e4e681d1e More cleanup 2017-06-09 19:29:20 -04:00
Alexander Bock
0b289a4b77 Some cleanup 2017-06-09 18:49:20 -04:00
Alexander Bock
4184740ce8 Code cleanup 2017-06-09 16:09:58 -04:00
Alexander Bock
03bec736ce Prevent a hard crash in case the scene file contains a syntax error 2017-06-09 15:36:49 -04:00
Alexander Bock
7775435eab Do not sort properties and propertyowners automatically (closes #269) 2017-06-09 11:26:38 -04:00
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04: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
ea8442d996 Enable networked specifications for ScreenSpaceImages 2017-06-03 13:38:02 -04:00
Alexander Bock
994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Alexander Bock
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Alexander Bock
7f28adc386 Add additional trace information
Prevent crash if console shader is missing
2017-06-01 12:13:19 -04:00
Emil Axelsson
5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02:00
Emil Axelsson
f231ca290e SceneLoader: Fix bug when loading directory with subdirectories 2017-05-31 11:38:33 +02:00