9a00f38e09
Feature/jenkins warnings ( #538 )
...
* Remove warnings from Jenkins
* Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
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
6d76080370
Simplify script precondition argument checks
2018-02-15 17:56:12 -05:00
2758b35dec
Feature/mipmapping ( #454 )
...
* Enable mipmapping for textures where it was previously disabled
* Fix mipmapping for renderable projections
2018-01-09 17:52:34 +01:00
4c2f72226f
Performance Optimizations ( #450 )
...
* Make derived transform classes less involved in simulation state
* Add performance measurements in openspaceengine
* Avoid redundant transformation lookups
* Fix bug causing redundant calls to GPULayerManager::bind
* Move water reflectance to alpha component of normal buffer. Remove otherData buffer.
2018-01-08 09:43:41 +01:00
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
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
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
4b65e20570
Support loading of .asset and .scene files
...
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
167222c814
Feature/dashboard ( #431 )
...
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable
* Add Onscreen Dashboard
* Add Dashboard class
* Add DashboardItem classes and subclasses
* Added font and fontsize customization to dashboarditems
* Add default dashboard specifications to all scenes
* Add tests.scene to test dashboard items
* Add configuration options to DashboardItemDistance
* Fix distance conversion to correctly use singular or plural values
* Make DashboardItems unique when adding them to a dashboard
* Correctly position test with different font sizes
* Add Dashboard Item that enables spacing between other items
* Add performance measurement to dashboard rendering
* Add method to DashboardItemDistance that computes distance to surface
* Add DashboardItemAngle that computes and prints the angle between three objects
* Add DashboardItemInstruments that shows the instruments on New Horizons
* Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
* Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
a08c678bb0
Remove erraneous enabled OpenGL checking code
...
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
8e0fde947d
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
...
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
6363fc0bb2
Added missing include and merged master into NewAtmosphere.
2017-11-25 22:39:18 -05:00
026f51735b
Show distance from current focus object
...
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
719130b6b7
Jenkinswarnings ( #419 )
...
* Remove more warnings
* Removing more warnings
* More warning fixes
* More warnings
* More warnings
* Update ghoul
2017-11-16 21:19:28 -05:00
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -05:00
3a7f221793
Remove GCC warnings
2017-11-13 16:22:07 -05:00
f227767492
Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
929bd9ae05
Merged.
2017-11-09 15:46:46 -05:00
081f178eb1
Added fade-in for background radiation. Changed from sigmoid to linear fading.
2017-11-09 13:03:38 -05:00
88cf7926ae
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
8866a13ff6
More coding style fixes
2017-11-08 21:36:06 -06:00
acdfefe46d
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
78e3320cde
Separate Renderable::initialize into initialize and initializeGL functions
...
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
d628c1a667
Merge branch 'master' into feature/DU
...
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
2017-10-17 17:09:37 -04:00
d545042b9c
Updated fade-out of Milkyway.
2017-10-12 22:05:48 -04:00
5ccc200258
Fix loading of RGB screenspace images
2017-10-11 09:13:20 -04:00
07cdbb6d59
Added Milkyway transition.
2017-10-10 17:42:31 -04:00
aa969795cc
Factor ScreenSpaceImage into separate classes for local loading and online download ( closes #296 )
2017-10-10 14:16:55 -04:00
0ceab49df7
Update gitignore to include Mars texture
...
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395 )
2017-08-30 14:56:02 -04:00
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
8a62e6e791
Add description to PropertyOwner
2017-08-01 17:05:52 -04:00
Alexander Bock