Commit Graph

149 Commits

Author SHA1 Message Date
Gene Payne
568143638d Fixed touch interface bug github issue #682, and fixed upper-left corner menu tap toggle. (#739) 2018-10-29 10:01:49 -04:00
Alexander Bock
635df258d4 Add option to press Shift while clicking the time shifting to immediately jump, instead of interpolate 2018-10-08 18:12:50 -06:00
Alexander Bock
428ab56d99 Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string 2018-10-08 17:54:32 -06: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
Emil Axelsson
43e115d651 Add shortcut to change focus interpolation time (#707)
Closes #707
2018-09-03 01:50:47 -04:00
Alexander Bock
f429959bba Register path tokens before the sgct configuration is loaded 2018-09-02 12:08:50 -04:00
Alexander Bock
9f57d80541 Check_style fixes 2018-09-01 21:57:36 -04:00
Emil Axelsson
518b43db02 Fix compiler warnings 2018-08-31 14:30:35 +02:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock
f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock
e2e425657f Add button to invert delta time (closes #666 , the number of the beast) 2018-07-18 13:55:22 -04:00
Alexander Bock
d0f3e5507a Code cleanup
Remove warnings from multiresvolume module
2018-07-13 16:02:42 -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
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
Alexander Bock
8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04:00
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04:00
Alexander Bock
27ef41d342 Fix crash with creating Scene Property list 2018-06-22 15:17:59 -04:00
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
Jonathas Costa
f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
Alexander Bock
818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Jonathas Costa
4197bb8200 Merged master. 2018-04-20 21:37:40 -04:00
Alexander Bock
3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Alexander Bock
cae4ed9ce0 Sort nodes in GlobeBrowsing UI by whether they have URLs associated with them or not (closes #580) 2018-04-09 10:20:36 -04:00
Alexander Bock
ae7e22dfe0 Adapt to typesafe ghoul::Boolean parameters 2018-03-30 13:03:17 -04:00
Emil Axelsson
e8b260915e Render GUI on whole screen when rendering side-by-side and top-bottom stereo 2018-03-22 18:15:56 +01:00
Emil Axelsson
2eae7ac26d Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/PerformanceATM_and_Stereo 2018-03-20 13:45:15 +01:00
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Jonathas Costa
d7bb984cae Merged master. 2018-03-19 19:16:05 -04:00
Alexander Bock
df68ab557d * Rudimentary fix to make side_by_side stereo work in master
* Fix Triton asset file
 * Display an error if no Property matches a regex in setPropertyValue
 * Correct user-facing name for some Moon assets
 * Add fade in and fade out helping functions
 * Reenable label fading in New Horizons
 * Added GUI hint to hide uninteresting nodes
 * Set Hidden Hint on barycenter nodes
2018-03-17 16:54:42 -04:00
Jonathas Costa
721bdfa752 Merged. 2018-03-16 15:17:13 -04:00
Alexander Bock
32632f2df0 Fix visibility settings for GuiPropertyComponent in Debug builds
Fix Lua state leaking when setting delta time
2018-03-16 10:41:45 -04:00
Alexander Bock
db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Jonathas Costa
7b99519ec4 Merge branch 'master' into feature/PerformanceATM_and_Stereo 2018-03-15 10:58:51 -04:00
Jonathas Costa
cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -04:00
Alexander Bock
2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04:00
Alexander Bock
7ccb42545c Remove Clang warnings 2018-03-08 20:18:18 +01:00
Alexander Bock
5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05:00
Alexander Bock
a3c849843f Feature/new formatting (#547)
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05: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
9a00f38e09 Feature/jenkins warnings (#538)
* Remove warnings from Jenkins
 * Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
Alexander Bock
58f79a8851 Issue/518 (#529)
* Adding ScreenSpaceSpout object to display spout textures in screen space
 * Enable the clearing of option properties
 * Fix crash in ScreenSpaceImageLocal specification
 * Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
 * Add RenderablePlane Spout
 * Rename Texture parameter in ScreenSpaceImageOnline into URL

Closes #518
2018-02-23 13:24:35 -05:00
Emil Axelsson
708d62d2a7 Merge branch 'feature/resolution-independent' into feature/stereo 2018-02-16 14:24:33 +01:00
Alexander Bock
9848eea5ac Update Ghoul repository
Adjust OnExit to use defer instead
2018-02-14 17:16:54 -05:00
Alexander Bock
4f9085b9c6 Small fixes to GuiSpaceTimeComponent 2018-02-08 17:53:11 -05:00
Alexander Bock
cd33ec06c9 Cleanup of distance and time conversion classes, Modifies GuiSpaceTimeComponent
Changed previous slider into text field + dropbox
Added acceleration slider
Added shuffle slider (closes #479)
2018-02-08 17:42:22 -05:00
Alexander Bock
d5f158ad0b Add the ability to DashboardItemSimulationIncrement and DashboardItemDistance to specify fixed unit 2018-02-08 12:18:38 -05:00
Alexander Bock
03789cd307 Add button to refocus camera on object
closes #465
2018-02-07 16:47:31 -05:00