mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 12:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,736 Commits 86 Branches 46 Tags
8a6dd143301107e7b7f94ce582636766ac15c5dc
Commit Graph

136 Commits

Author SHA1 Message Date
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
Alexander Bock
7b611abfe0 Enable closing of filepath window using the ImGUI controls (closes #485) 2018-02-06 10:25:29 -05:00
Emil Axelsson
521cb0f5ae Use framebuffer size to determine gui size 2018-01-11 14:40:16 +01:00
Alexander Bock
3dae071d35 Fix sorting in GuiPropertyComponent 2018-01-01 16:42:47 -05:00
Alexander Bock
47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues 
Update Ghoul repository
 2017-12-29 19:18:06 +01:00
Alexander Bock
1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management 
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp
 2017-12-27 19:39:40 +01:00
Alexander Bock
91a32c7b93 Change renderproperties from value checking to changed flag 
Make matrix fromLuaConversion functions actually work
 2017-12-25 10:32:27 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Jonathas Costa
f78c10168f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-12-14 11:23:30 -05:00