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
5b6ae62bab
Add Override parameter for URLSynchronization
...
Add PerformShading asset parameter for RenderablePlanet
Disable shading on default for Earth
2018-03-09 11:42:32 -05: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
16595db09f
Some cleanup of Globe browsing
2017-12-30 11:12:53 -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
a8ea93da17
Make regular settings default in RenderableGlobe and GDALWrapper
...
Fix spelling error in Asset
Wrap initializeGL in try/catch block to catch error
2017-12-23 16:31:17 +01:00
db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05: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
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
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
b886925616
Move OpenGL in globebrowsing from constructors into initialization functions
...
Place entire scene loading into separate thread
2017-11-03 16:25:06 -04: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
a925d0646a
Added lunar eclipses back.
2017-10-19 11:41:36 -04:00
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
7aceb54bec
Globe browsing: fix implicit conversion errors and remove warnings ( #393 )
...
* Fix implicit conversion errors and remove warnings.
2017-09-01 12:03:31 -04:00
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
758ee8bd6d
Pull request changes.
2017-08-15 18:15:56 -04:00
1265de0d50
Only use padding for height layers
2017-08-08 14:02:56 +02:00
fa47fd19fa
Woops, accidentally removed chunkedlodglobe.cpp. Now it is back
2017-08-07 10:26:46 +02:00
902af5b321
Solve conflict
2017-08-07 10:24:30 +02:00
8a62e6e791
Add description to PropertyOwner
2017-08-01 17:05:52 -04:00
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -04:00
5ca44d4aa1
Allow RenderableGlobe to have a single radius
...
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -04:00
a55110e286
Merged master info NewAtmosphere.
2017-07-27 17:13:42 -04:00
19f8e30813
Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
...
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
d95576077b
More work on documentation
2017-07-25 18:06:55 -04:00
7096aeb9dd
Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet.
2017-07-24 17:05:30 -04:00
1a475ef570
Started documenting properties
...
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
036b271d0d
Change capitalization of property names
2017-07-22 18:22:44 -04:00
04bac9293b
Encapsulate identifier, guiName, and description into a PropertyInfo struct
2017-07-22 17:36:03 -04:00
b584f0197e
Add description to Propertys
2017-07-21 16:31:58 -04:00
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -04:00
3aa8f2a056
Recompile shaders at initialization of globes
2017-07-19 10:01:53 +02:00
008ab4e613
Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)
2017-07-18 15:47:48 -04:00
7737b082d9
Removing more warnings
2017-07-17 18:03:37 -04:00
b0c65d416b
Merged master into NewAtmosphere.
2017-07-17 16:22:33 -04:00
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
26682669ff
More work on making use of nested namespaces
2017-07-16 01:55:35 -04:00
4dba552fd1
Started switching OpenSpace projects to nested namespaces
...
Various cleanups
2017-07-15 20:01:55 -04:00
a232a1a0a7
Fix compilation warnings.
2017-07-14 22:48:32 +02:00
Alexander Bock