Commit Graph

1256 Commits

Author SHA1 Message Date
Jonathas Costa a55110e286 Merged master info NewAtmosphere. 2017-07-27 17:13:42 -04:00
Alexander Bock 142f807586 Jenkins compile fix 2017-07-26 19:20:57 -04:00
Alexander Bock 14b4f5c1f0 Jenkins compile fix 2017-07-26 18:15:40 -04:00
Alexander Bock 0b30a9e244 Jenkins compile fix for Linux 2017-07-26 17:58:12 -04:00
Alexander Bock 59bccd040d Cleanup changes 2017-07-26 17:29:57 -04:00
Alexander Bock dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock 1a475ef570 Started documenting properties
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
Alexander Bock 2e6465d888 Correctly order the Property::Visibility enum 2017-07-22 23:09:38 -04:00
Alexander Bock 04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock 008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock 0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Jonathas Costa 4842b21db4 Fixed atmosphere module name header guard. 2017-07-17 16:54:13 -04:00
Alexander Bock 7cfa358f04 Convert std::bad_any_cast back to ghoul::bad_any_cast 2017-07-17 16:25:27 -04:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Alexander Bock 40926aa68f Remove <any> include 2017-07-17 16:19:26 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 90e0364c5a Revert to using ghoul::any due to lack of support on macOS 2017-07-17 13:46:35 -04:00
Alexander Bock 4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock 3b1c2b37a0 Update ghoul repository
Adapt to the change from ghoul::any to std::any
2017-07-15 18:13:52 -04:00
Alexander Bock 713b5bb97b Fix compile error in iSWA module
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
2017-07-15 17:48:03 -04:00
Alexander Bock 6f524f4a67 Add centralized escaping of JSON strings
Enable correct escaping of " character thus removing the need to outlaw "s in comments
2017-07-14 16:58:18 -04:00
Alexander Bock 6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -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
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
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
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
Matthew Territo cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06:00
Alexander Bock db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Matthew Territo f1417210fa Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 13:56:40 -06:00
Jonathas Costa 39b90863d6 Fixed HDR controls for multiple atm's. 2017-07-11 14:52:59 -04:00
Alexander Bock 6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Alexander Bock 314c6c0848 Enable Property to have multiple callbacks 2017-07-11 14:23:17 -04:00
Jonathas Costa 18d8612a8a Initial implementation of multiple ATM's (still missing frustum culling and other small details). 2017-07-10 17:21:33 -04: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
Jonathas Costa 384b99c736 Merged master into NewAtmosphere. 2017-07-05 16:44:11 -04:00
Matthew Territo 81164e0d8d Stub for Performance Manager & GUI Button 2017-07-03 13:46:17 -06: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
Jonathas Costa a37b0388bb Merged master into atmosphere's branch. 2017-06-21 14:46:10 -04:00
Alexander Bock 9e4e681d1e More cleanup 2017-06-09 19:29:20 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -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
Jonathas Costa 0965ec95ba Merged Master into ATM. 2017-06-02 19:02:29 -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