Commit Graph

230 Commits

Author SHA1 Message Date
Alexander Bock d7e976f67f Add some more fixes 2020-06-15 16:07:50 +02:00
Alexander Bock b64784b122 First small cleanup 2020-06-15 10:23:53 +02:00
Alexander Bock f9d1b030ef Small cleanup 2020-06-14 18:34:52 +02:00
Alexander Bock 1e9df1cb4b Merge branch 'master' into feature/profiles
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
Alexander Bock 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
GPayne 0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z)
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
2020-05-12 15:27:24 +02:00
Alexander Bock f605ea9422 Some more cleanup 2020-05-10 14:03:42 +02:00
Alexander Bock d1e5670ce5 More cleanup of asset ownership 2020-05-09 18:33:01 +02:00
GPayne fe24b0c446 Finished unit tests for profile save current feature 2020-05-07 15:39:50 -06:00
Alexander Bock d3cce906c1 Memory hygiene cleanup 2020-05-07 13:08:34 +02:00
Alexander Bock befef58e80 More cleanup 2020-05-06 21:54:02 +02:00
Alexander Bock 340444ce0d Cleanup AssetManager class 2020-05-06 21:40:23 +02:00
Alexander Bock 01f0a864dc Yet more cleanup of Asset-related files 2020-05-06 20:33:27 +02:00
Alexander Bock fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
GPayne 02fb61d95d Continued unit testing work 2020-05-05 20:57:54 -06:00
Alexander Bock 5a41084027 Add loading of meta information from assets 2020-05-05 00:29:46 +02:00
Alexander Bock 875404246f Add meta information to Asset class 2020-05-05 00:00:48 +02:00
Alexander Bock b4eb168c76 Turning shared_ptr into pointers (part 1) 2020-05-04 23:21:18 +02:00
Alexander Bock c8dff5c217 First pass of asset cleanup 2020-05-04 22:56:12 +02:00
GPayne 1fbb9e8acf Completed code for detecting and storing changes made since startup 2020-04-23 12:06:34 -06:00
GPayne 83ef5ed245 Switched profile-to-scene conversion from lua script to Profile class 2020-04-15 16:31:05 -06:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
GPayne 3d96836ee1 Added unit tests for conversion from profile to scene 2020-04-07 20:39:31 -06:00
GPayne 924a0085a7 Additional work on converting from profile to scene/asset format 2020-04-05 21:47:51 -06:00
GPayne 5a6ff37759 Created unit tests for profileFile 2020-04-03 21:43:24 -06:00
GPayne 207c7d5657 Profile file handler in progress 2020-03-27 15:10:46 -06:00
GPayne 6253a5cf2e First pass on tracking changed properties/assets since initialization 2020-03-22 20:59:15 -06:00
Alexander Bock 126f2ac4cf Check for selfinclusion of assets (closes #1032)
Make sure that OpenSpace doesn't crash when bailing out early
2020-02-11 14:09:14 +01:00
Alexander Bock c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
liuloppan 78eb673611 Feature/gui for touch (#967)
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
2019-09-18 23:49:51 +02:00
Micah Acinapura 1149a61dce resurrecting consolidated documentation (#897)
* Resurrecting consolidated documentation, lots to improve still but better then before
2019-06-03 06:19:45 -06:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Alexander Bock 21fd957f28 Add an option for hardcoding a fixed bounding sphere that is used if there is no renderable attached to a scenegraph node 2019-02-20 16:55:48 +01:00
Emil Axelsson 2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Alexander Bock c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock 267879878b Beta-3 Release Candidate branch (#753)
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
2018-11-05 20:51:48 -05:00
Emil Axelsson 7181de4673 Feature/webgui ops (#723)
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
2018-11-05 20:45:38 -05:00
Alexander Bock 9047dc7a3e Feature/globebrowsing speedup (#735)
* Removal of ChunkRenderer, ChunkedLodGlobe, ChunkCuller, chunklevel evaluator, culling classes, layershadermanager, GpuLayer, GPUData, ChunkNode, Grid, BasicGrid, Chunk files, Angle, AABB classes, PointGlobe, Ellipsoid, TileSelector, tiledatatype, iodescription, simplerawtilerreader, rawtilereader
 * Less dynamic allocation for SkirtedGrid, LayerManager, RenderableGlobe, TextureUnit
 * Clean up memory management in RawTiles
 * Code simplification
 * Optimize shader uniform setting
 * Introduce UniformCache
 * Callback simplification
 * Turn ChunkNode into a struct
 * Use a MemoryPool to organize all ChunkNodes rather than use unique_ptr and the necessary memory allocation
 * Collect draw calls
 * Consolidate fragment shaders between local and global renderer
 * Shader cleanup and optimization
 * Update CMake to not include included shaders
 * Integrate traversal function into the looping
 * Replace std::queue with std::vector
 * Merge TextureContainer into MemoryAwareTileCache
 * Lazy computation of chunk bounding boxes
 * Memory management of LayerGroup
 * Remove class hierarchy from tileproviders (temporaltileprovider not working yet)
 * Remove PBO classes
* Chunk status stored in Chunk
* Don't create a copy of the ChunkTilePile
* Enable culling by projected area on default
* Have raw tile reader return a Tile instead of a shared_ptr to a tile
* Start making GDAL mandatory
* Increase the default lod scale factor to 15
2018-10-30 17:20:06 -04:00
Alexander Bock 8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Alexander Bock 54d1a506c3 Add rotation class that provides a constant rotation based on in-game time (closes #662)
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
2018-07-18 15:28:24 -04:00
Alexander Bock 1e97bae229 OpenGL logging
Print warning if OpenGL logging is disabled but loglevel is too low
Fix format of printed functions

Closes 656
2018-07-13 16:22:24 -04:00
Emil Axelsson 902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Emil Axelsson 6007f1d70d Feature/model lighting (#670)
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
2018-07-13 09:01:43 +02:00
Alexander Bock 12c87969a7 Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661)
Add debugging indices to SceneGraphNodes
Rename ImGui indices debugging definition
2018-07-12 17:48:34 -04:00
Emil Axelsson 1b3df16c28 Feature/time frame (#642)
* First implementation of time frames
* Add TimeFrameUnion. Only show solar system 1850-2150.
* Consider dependencies when determining whether time frame is active
* Code review fixes.
2018-07-11 10:42:06 +02:00