OpenSpace

mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00

Files

Emma Broman c802655743 Merge branch 'master' into project/exoplanet-explorer

# Conflicts:
#	config/equirectangular_gui.json
#	config/fullscreen1080.json
#	config/single_fisheye.json
#	config/single_fisheye_gui.json
#	config/single_sbs_stereo.json
#	config/spherical_mirror.json
#	config/spherical_mirror_gui.json
#	config/spout_output_cubemap.json
#	config/spout_output_equirectangular.json
#	config/spout_output_fisheye.json
#	config/spout_output_flat.json
#	config/two_nodes.json
#	data/assets/examples/nodeline.asset
#	data/profiles/juice.profile
#	data/profiles/jwst.profile
#	data/profiles/osirisrex.profile
#	data/profiles/voyager.profile
#	include/openspace/rendering/renderable.h
#	modules/base/CMakeLists.txt
#	modules/base/basemodule.cpp
#	modules/base/shaders/arrow_fs.glsl
#	modules/base/shaders/arrow_vs.glsl
#	modules/exoplanets/exoplanetsmodule_lua.inl
#	src/rendering/renderable.cpp

2024-07-15 13:27:07 +02:00