Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
This commit is contained in:
Emil Axelsson
2016-09-22 19:33:05 +02:00
311 changed files with 12363 additions and 4144 deletions

219
.gitignore vendored
View File

@@ -1,21 +1,21 @@
bin/
build/
cache/
tmp/
ext/SGCT
.DS_Store
*.swp
.vscode
# Windows system files:
Thumbs.db
# Emacs backup files:
*~
*.swp
.DS_Store
.vscode
/bin/
/build/
/cache/
Thumbs.db
tmp/
/documentation
/doc
/ext/SGCT
# generated glsl files
*.gglsl
*.GhoulGenerated.glsl
*.OpenSpaceGenerated.glsl
shaders/generated/*
# CMake stuff
@@ -29,135 +29,72 @@ install_manifest.txt
.cproject
.project
# Doxygen stuff
html/
latex/
shaders/ABuffer/constants.hglsl
*.OpenSpaceGenerated.glsl
LuaScripting.txt
Properties.txt
log.html
gui/externaltimecontrol/CMakeLists.txt
gui/externaltimecontrol/main.cpp
gui/externaltimecontrol/mainwindow.cpp
gui/externaltimecontrol/mainwindow.h
data/scene/rosetta/67P/obj/67P_rotated_5_130.obj
data/spice/NewHorizonsKernels/
data/spice/RosettaKernels/
data/scene/newhorizons/pluto/pluto/textures/
data/scene/newhorizons/pluto/pluto/utcEvents.txt
data/scene/rosetta/rosetta/obj/mainbodyros.obj
data/scene/rosetta/rosetta/obj/solarpanelleft.obj
data/scene/rosetta/rosetta/obj/solarpanelright.obj
data/scene/rosetta/rosetta/textures/defaultProj.png
data/scene/rosetta/rosetta/textures/glare_blue.png
data/scene/rosetta/rosetta/textures/gray.png
data/scene/rosetta/rosetta/textures/squarefov.png
data/scene/saturn/textures/saturn.jpg
data/scene/stars/colorbv.cmap
data/scene/stars/speck/stars.speck
data/scene/stars/textures/glare.png
data/scene/stars/textures/halo.png
data/scene/sun/textures/marker.png
data/scene/sun/textures/sun-glare.png
data/scene/sun/textures/sun.jpg
data/scene/uranus/textures/uranus.jpg
data/scene/venus/textures/venus.jpg
data/scene/dawn/vestaprojection/VestaComet/VestaComet_5000.obj
data/spice/DawnKernels/
data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest/
data/scene/rosetta/67P/textures/black.jpg
data/scene/rosetta/67P/textures/defaultProj.png
data/scene/rosetta/67P/textures/gray.jpg
data/scene/rosetta/67P/textures/gray.png
data/scene/rosetta/67P/textures/texmapflipped.jpg
data/scene/rosetta/67P/textures/white.jpg
data/scene/rosetta/67P/textures/white.png
data/scene/newhorizons/jupiter/callisto/textures/callisto.jpg
data/scene/dawn/ceres/textures/gray.png
data/scene/newhorizons/pluto/charon/textures/Charon-Text.png
data/scene/newhorizons/pluto/charon/textures/charon_highres.jpg
data/scene/newhorizons/pluto/charon/textures/charon_highres_annotated.jpg
data/scene/newhorizons/pluto/charon/textures/defaultProj.png
data/scene/dawn/dawn/obj/mainbodydawn.obj
data/scene/dawn/dawn/obj/solarpanelleft.obj
data/scene/dawn/dawn/obj/solarpanelright.obj
data/scene/dawn/dawn/textures/glare_blue.png
data/scene/dawn/dawn/textures/gray.png
data/scene/earth/textures/ToastMapOfEarth.jpg
data/scene/earth/textures/earth_bluemarble.jpg
data/scene/earth/textures/earth_bluemarble_height.jpg
data/scene/earth/textures/earth_night.jpg
data/scene/earth/textures/marker.png
data/scene/earth/textures/earth_clouds.jpg
data/scene/earth/textures/earth_reflectance.png
data/scene/moon/textures/Moon16k.dds
data/scene/newhorizons/jupiter/europa/textures/europa.jpg
data/scene/newhorizons/jupiter/ganymede/textures/ganymede.jpg
data/scene/newhorizons/jupiter/io/textures/io.jpg
data/scene/jupiter/jupiter/textures/jupiter.jpg
data/scene/mars/textures/mars.jpg
data/scene/mercury/textures/mercury.jpg
data/scene/milkyway/textures/DarkUniverse_mellinger_8k.jpg
data/scene/neptune/textures/neptune.jpg
data/scene/newhorizons/newhorizons/models/Labels.obj
data/scene/newhorizons/newhorizons/models/NewHorizonsCleanModel.obj
data/scene/newhorizons/newhorizons/textures/NHTexture.jpg
data/scene/newhorizons/newhorizons/textures/goldfoilbump.tif
data/scene/newhorizons/newhorizons/textures/labels.png
data/scene/pluto/textures/
data/scene/pluto/textures/Shenk_180.jpg
data/scene/pluto/textures/pluto_highres_180.jpg
data/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt
data/scene/newhorizons/pluto/pluto/textures/3.jpg
data/scene/newhorizons/pluto/pluto/textures/Pluto-Text.png
data/scene/dawn/vestaprojection/VestaComet/VestaComet.mtl
data/scene/dawn/vestaprojection/textures/defaultProj_backup.png
data/scene/dawn/vestaprojection/textures/dummy.jpg
data/scene/dawn/vestaprojection/textures/glare.png
data/scene/dawn/vestaprojection/textures/projectMe.png
data/spice/MAR063.BSP
data/spice/de430_1850-2150.bsp
data/spice/jup260.bsp
data/BATSRUS.cdf
data/ENLIL.cdf
data/scene/newhorizons/pluto/pluto/images
data/spice/nh_kernels/
data/scene/jupiter/jupiter/textures/Jupiter-text.png
data/scene/jupiter/callisto/textures/callisto.jpg
data/scene/jupiter/europa/textures/europa.jpg
data/scene/jupiter/ganymede/textures/ganymede.jpg
data/scene/jupiter/io/textures/io.jpg
data/scene/milkyway-eso/textures/eso0932a_blend.png
data/scene/stars-denver/denver_colorbv.cmap
data/scene/stars-denver/speck/stars.speck
data/scene/stars-denver/textures/halo.png
data/scene/newhorizons/pluto/pluto/full_images/
data/scene/rosetta/67P/rosettaimages/
data/spice/RosettaKernels_New/
data/scene/newhorizons/pluto/charon/utcEvents.txt
data/scene/rosetta/67P/obj/67P_HD_2015-05-09.obj
data/scene/rosetta/67P/obj/may9_map.jpg
data/scene/rosetta/67P/textures/may9_map.jpg
data/scene/newhorizons/pluto/charon/textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg
data/scene/newhorizons/pluto/charon/textures/cpmap_cyl_HR_0e.jpg
data/scene/volumetricmilkyway/milkyway/
ScriptLog.txt
data/scene/atmosphereearth/textures/ToastMapOfEarth.jpg
data/scene/atmosphereearth/textures/earth_bluemarble.jpg
data/scene/atmosphereearth/textures/earth_bluemarble_height.jpg
data/scene/atmosphereearth/textures/earth_clouds.jpg
data/scene/atmosphereearth/textures/earth_night.jpg
data/scene/atmosphereearth/textures/earth_reflectance.png
data/scene/atmosphereearth/textures/marker.png
data/scene/juno/juno/textures
data/scene/juno/juno/spice
data/scene/atmosphereearth/textures
data/scene/dawn/ceres/textures
data/scene/dawn/dawn/obj
data/scene/dawn/dawn/textures
data/scene/dawn/vestaprojection/textures
data/scene/dawn/vestaprojection/VestaComet
data/scene/debugglobe/textures
data/scene/earth/textures
data/scene/juno/juno/Juno.mtl
data/scene/juno/juno/Juno.obj
KeyboardMapping.txt
saturn_rings.png
data/scene/debugglobe/textures/earth_clouds.jpg
data/scene/debugglobe/textures/earth_reflectance.png
data/scene/rosetta/rosetta/obj/Rosetta.obj
data/scene/rosetta/rosetta/rosetta/
data/scene/rosetta/rosetta/textures/
data/scene/juno/juno/spice
data/scene/juno/juno/textures
data/scene/jupiter/callisto/textures
data/scene/jupiter/europa/textures
data/scene/jupiter/ganymede/textures
data/scene/jupiter/io/textures
data/scene/jupiter/jupiter/textures
data/scene/mars/textures
data/scene/mercury/textures
data/scene/milkyway/textures
data/scene/milkyway-eso/textures
data/scene/moon/textures
data/scene/neptune/textures
data/scene/newhorizons/jupiter/callisto/textures
data/scene/newhorizons/jupiter/europa/textures
data/scene/newhorizons/jupiter/ganymede/textures
data/scene/newhorizons/jupiter/io/textures
data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest
data/scene/newhorizons/newhorizons/models
data/scene/newhorizons/newhorizons/textures
data/scene/newhorizons/pluto/charon/textures
data/scene/newhorizons/pluto/pluto/assets
data/scene/newhorizons/pluto/pluto/full_images
data/scene/newhorizons/pluto/pluto/images
data/scene/newhorizons/pluto/pluto/textures
data/scene/osirisrex/bennu/models
data/scene/osirisrex/bennu/textures
data/scene/osirisrex/osirisrex/models
data/scene/osirisrex/osirisrex/textures
data/scene/pluto/textures
data/scene/saturn/textures
data/scene/rosetta/67P/obj
data/scene/rosetta/67P/rosettaimages
data/scene/rosetta/67P/textures
data/scene/rosetta/rosetta/rosetta
data/scene/rosetta/rosetta/textures
data/scene/stars/colorbv.cmap
data/scene/stars/speck
data/scene/stars/textures
data/scene/stars-denver/denver_colorbv.cmap
data/scene/stars-denver/speck
data/scene/stars-denver/textures
data/scene/sun/textures
data/scene/uranus/textures
data/scene/venus/textures
data/scene/volumetricmilkyway/milkyway
data/spice/DawnKernels
data/spice/jup260.bsp
data/spice/de430_1850-2150.bsp
data/spice/MAR063.BSP
data/spice/NewHorizonsKernels
data/spice/nh_kernels
data/spice/OsirisRexKernels
data/spice/Rosetta

386
Doxyfile
View File

@@ -1,45 +1,19 @@
# Doxyfile 1.7.6.1
# Doxyfile 1.8.8
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenSpace
PROJECT_NUMBER =
PROJECT_LOGO =
OUTPUT_DIRECTORY = doc/
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = YES
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
# For example adding "sideeffect=\par Side Effects:\n" will allow you to
# put the command \sideeffect (or @sideeffect) in the documentation, which
# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
ALIASES =
BUILTIN_STL_SUPPORT = NO
SUBGROUPING = YES
# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
# unions are shown inside the group in which they are included (e.g. using
# @ingroup) instead of on a separate page (for HTML and Man pages) or
# section (for LaTeX and RTF).
INLINE_GROUPED_CLASSES = NO
INLINE_SIMPLE_STRUCTS = YES
TYPEDEF_HIDES_STRUCT = NO
LOOKUP_CACHE_SIZE = 1
LOOKUP_CACHE_SIZE = 9
#---------------------------------------------------------------------------
# Build related configuration options
@@ -48,405 +22,83 @@ LOOKUP_CACHE_SIZE = 1
EXTRACT_ALL = YES
EXTRACT_PRIVATE = YES
EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
EXTRACT_ANON_NSPACES = NO
HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = NO
HIDE_SCOPE_NAMES = YES
SHOW_INCLUDE_FILES = YES
FORCE_LOCAL_INCLUDES = NO
INLINE_INFO = NO
SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = YES
SORT_MEMBERS_CTORS_1ST = YES
SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
STRICT_PROTO_MATCHING = NO
GENERATE_TODOLIST = YES
GENERATE_TODOLIST = NO
GENERATE_TESTLIST = NO
GENERATE_BUGLIST = YES
GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= YES
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = NO
SHOW_FILES = NO
SHOW_NAMESPACES = YES
SHOW_FILES = YES
LAYOUT_FILE =
EXTENSION_MAPPING = inl=C++
BUILTIN_STL_SUPPORT = YES
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
# Configuration options related to warning and progress messages
#---------------------------------------------------------------------------
QUIET = YES
WARNINGS = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = YES
WARN_FORMAT = "$file:$line: $text"
#---------------------------------------------------------------------------
# configuration options related to the input files
# Configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = src \
include
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \
*.cpp \
FILE_PATTERNS = *.cpp \
*.h \
*.inl
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = /ext/* bin/* build/* config/* gui/* kernels/* openspace-data/* scripts/* shaders/*
EXCLUDE_SYMBOLS =
EXCLUDE_PATTERNS = ext/* bin/* build/* config/* gui/* kernels/* data/* scripts/* shaders/*
USE_MDFILE_AS_MAINPAGE = README.md
#---------------------------------------------------------------------------
# configuration options related to source browsing
# Configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = YES
INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = NO
REFERENCES_RELATION = NO
REFERENCES_LINK_SOURCE = YES
VERBATIM_HEADERS = NO
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
# Configuration options related to the HTML output
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 4
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER = support/doxygen/header.html
HTML_FOOTER = support/doxygen/footer.html
HTML_STYLESHEET = support/doxygen/stylesheet.css
#HTML_EXTRA_FILES =
HTML_COLORSTYLE_HUE = 200
HTML_COLORSTYLE_SAT = 100
HTML_COLORSTYLE_GAMMA = 80
HTML_TIMESTAMP = NO
HTML_DYNAMIC_SECTIONS = NO
# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
# for more information.
GENERATE_DOCSET = NO
DOCSET_FEEDNAME =
DOCSET_BUNDLE_ID =
DOCSET_PUBLISHER_ID =
DOCSET_PUBLISHER_NAME =
GENERATE_HTMLHELP = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
CHM_INDEX_ENCODING =
BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = YES
HTML_COLORSTYLE_HUE = 225
HTML_COLORSTYLE_SAT = 18
HTML_COLORSTYLE_GAMMA = 100
GENERATE_TREEVIEW = YES
ENUM_VALUES_PER_LINE = 6
TREEVIEW_WIDTH = 300
EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
USE_MATHJAX = NO
MATHJAX_RELPATH = http://www.mathjax.org/mathjax
MATHJAX_EXTENSIONS =
SEARCHENGINE = YES
SERVER_BASED_SEARCH = NO
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
# Other output configuration options
#---------------------------------------------------------------------------
GENERATE_LATEX = NO
LATEX_OUTPUT = latex
LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
EXTRA_PACKAGES =
LATEX_HEADER =
LATEX_FOOTER =
PDF_HYPERLINKS = YES
USE_PDFLATEX = YES
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
LATEX_SOURCE_CODE = NO
LATEX_BIB_STYLE = plain
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .3
MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = NO
XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
GENERATE_AUTOGEN_DEF = NO
#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED = YES
SKIP_FUNCTION_MACROS = NO
#---------------------------------------------------------------------------
# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
MSCGEN_PATH =
HIDE_UNDOC_RELATIONS = YES
# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
# available from the path. This tool is part of Graphviz, a graph visualization
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = NO
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
# allowed to run in parallel. When set to 0 (the default) doxygen will
# base this on the number of processors available in the system. You can set it
# explicitly to a value larger than 0 to get control over the balance
# between CPU load and processing speed.
DOT_NUM_THREADS = 0
# By default doxygen will use the Helvetica font for all dot files that
# doxygen generates. When you want a differently looking font you can specify
# the font name using DOT_FONTNAME. You need to make sure dot is able to find
# the font, which can be done by putting it in a standard location or by setting
# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
# directory containing the font.
DOT_FONTNAME = Helvetica
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
DOT_FONTSIZE = 10
# By default doxygen will tell dot to use the Helvetica font.
# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
# CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect implementation dependencies (inheritance, containment, and
# class references variables) of the class with other documented classes.
COLLABORATION_GRAPH = YES
# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
GROUP_GRAPHS = YES
# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
# collaboration diagrams in a style similar to the OMG's Unified Modeling
# Language.
UML_LOOK = NO
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
TEMPLATE_RELATIONS = NO
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
# tags are set to YES then doxygen will generate a graph for each documented
# file showing the direct and indirect include dependencies of the file with
# other documented files.
INCLUDE_GRAPH = YES
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
# documented header file showing the documented files that directly or
# indirectly include this file.
INCLUDED_BY_GRAPH = YES
# If the CALL_GRAPH and HAVE_DOT options are set to YES then
# doxygen will generate a call dependency graph for every global function
# or class method. Note that enabling this option will significantly increase
# the time of a run. So in most cases it will be better to enable call graphs
# for selected functions only using the \callgraph command.
CALL_GRAPH = NO
# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
# doxygen will generate a caller dependency graph for every global function
# or class method. Note that enabling this option will significantly increase
# the time of a run. So in most cases it will be better to enable caller
# graphs for selected functions only using the \callergraph command.
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
DIRECTORY_GRAPH = YES
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
# generated by dot. Possible values are svg, png, jpg, or gif.
# If left blank png will be used. If you choose svg you need to set
# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
# enable generation of interactive SVG images that allow zooming and panning.
# Note that this requires a modern browser other than Internet Explorer.
# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
# visible. Older versions of IE do not have SVG support.
INTERACTIVE_SVG = NO
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
DOT_PATH =
# The DOTFILE_DIRS tag can be used to specify one or more directories that
# contain dot files that are included in the documentation (see the
# \dotfile command).
DOTFILE_DIRS =
# The MSCFILE_DIRS tag can be used to specify one or more directories that
# contain msc files that are included in the documentation (see the
# \mscfile command).
MSCFILE_DIRS =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
# visualized by representing a node as a red box. Note that doxygen if the
# number of direct children of the root node in a graph is already larger than
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
DOT_GRAPH_MAX_NODES = 50
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
# from the root by following a path via at most 3 edges will be shown. Nodes
# that lay further from the root node will be omitted. Note that setting this
# option to 1 or 2 may greatly reduce the computation time needed for large
# code bases. Also note that the size of a graph can be further restricted by
# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
MAX_DOT_GRAPH_DEPTH = 0
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
# background. This is disabled by default, because dot on Windows does not
# seem to support this out of the box. Warning: Depending on the platform used,
# enabling this option may lead to badly anti-aliased labels on the edges of
# a graph (i.e. they become hard to read).
DOT_TRANSPARENT = NO
# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
# files in one run (i.e. multiple -o and -T options on the command line). This
# makes dot run faster, but since only newer versions of dot (>1.8.10)
# support this, this feature is disabled by default.
DOT_MULTI_TARGETS = NO
# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
# generate a legend page explaining the meaning of the various boxes and
# arrows in the dot generated graphs.
GENERATE_LEGEND = YES
# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
# remove the intermediate dot files that are used to generate
# the various graphs.
DOT_CLEANUP = YES

View File

@@ -214,34 +214,97 @@ void mainInitFunc() {
}
void mainPreSyncFunc() {
OsEng.setRunTime(sgct::Engine::getTime());
OsEng.preSynchronization();
struct FunctionLogKey {
char begin, end;
};
#include <sstream>
std::stringstream& operator<<(std::stringstream& o, const FunctionLogKey& l) {
o << l.begin << l.end;
return o;
}
const FunctionLogKey PRE_SYNC = { '1', '2' };
const FunctionLogKey ENCODE = { 'E', 'e' };
const FunctionLogKey DECODE = { 'D', 'd' };
const FunctionLogKey POST_SYNC = { '3', '4' };
const FunctionLogKey RENDER = { 'R', 'r' };
const FunctionLogKey POST_DRAW = { 'P', 'p' };
std::stringstream minilog;
std::stringstream masterlog;
std::stringstream slavelog;
const std::string EXPECTED_MASTER_LOG = (masterlog << PRE_SYNC << ENCODE << POST_SYNC << RENDER << POST_DRAW).str();
const std::string EXPECTED_SLAVE_LOG = (slavelog << PRE_SYNC << DECODE << POST_SYNC << RENDER << POST_DRAW).str();
#define LOG_BEGIN(x) minilog << (x).begin
#define LOG_END(x) minilog << (x).end
void mainPreSyncFunc() {
LOG_BEGIN(PRE_SYNC);
OsEng.setRunTime(sgct::Engine::getTime());
OsEng.preSynchronization();
LOG_END(PRE_SYNC);
}
volatile bool busyWaitDecode = false;
void mainPostSyncPreDrawFunc() {
if (OsEng.useBusyWaitForDecode() && !sgct::Engine::instance()->isMaster()) {
while (minilog.str().size() && minilog.str().back() != DECODE.end) {
std::this_thread::sleep_for(std::chrono::microseconds(10));
}
}
LOG_BEGIN(POST_SYNC);
OsEng.postSynchronizationPreDraw();
LOG_END(POST_SYNC);
}
void mainRenderFunc() {
LOG_BEGIN(RENDER);
using glm::mat4;
using glm::translate;
//not the most efficient, but for clarity @JK
mat4 userMatrix = translate(mat4(1.f), _sgctEngine->getDefaultUserPtr()->getPos());
mat4 sceneMatrix = _sgctEngine->getModelMatrix();
mat4 viewMatrix = _sgctEngine->getCurrentViewMatrix() * userMatrix;
//dont shift nav-direction on master, makes it very tricky to navigate @JK
if (!OsEng.ref().isMaster())
viewMatrix = viewMatrix * sceneMatrix;
mat4 projectionMatrix = _sgctEngine->getCurrentProjectionMatrix();
OsEng.render(projectionMatrix, viewMatrix);
LOG_END(RENDER);
}
void mainPostDrawFunc() {
LOG_BEGIN(POST_DRAW);
OsEng.postDraw();
LOG_END(POST_DRAW);
if (OsEng.logSGCTOutOfOrderErrors()) {
if (sgct::Engine::instance()->isMaster()) {
if (minilog.str() != EXPECTED_MASTER_LOG) {
LERRORC("Minilog", "Bad combination: " << minilog.str());
}
}
else {
if (minilog.str() != EXPECTED_SLAVE_LOG) {
LERRORC("Minilog", "Bad combination: " << minilog.str());
}
}
}
// clear
minilog.str(std::string());
}
void mainExternalControlCallback(const char* receivedChars, int size) {
@@ -255,7 +318,7 @@ void mainKeyboardCallback(int key, int, int action, int mods) {
openspace::Key(key),
openspace::KeyModifier(mods),
openspace::KeyAction(action)
);
);
}
}
@@ -264,7 +327,7 @@ void mainMouseButtonCallback(int key, int action) {
OsEng.mouseButtonCallback(
openspace::MouseButton(key),
openspace::MouseAction(action)
);
);
}
}
@@ -284,11 +347,16 @@ void mainCharCallback(unsigned int codepoint, int mods) {
}
void mainEncodeFun() {
LOG_BEGIN(ENCODE);
OsEng.encode();
LOG_END(ENCODE);
}
void mainDecodeFun() {
LOG_BEGIN(DECODE);
OsEng.decode();
LOG_END(DECODE);
}
void mainLogCallback(const char* msg) {

View File

@@ -1,82 +1,82 @@
<?xml version="1.0" ?>
<Cluster masterAddress="127.0.0.1" externalControlPort="20500">
<Node address="127.0.0.1" port="20400">
<Window fullScreen="false">
<Stereo type="none" />
<Pos x="0" y="100" />
<Size x="910" y="263" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-3.34533" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-3.34533" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="3.34533" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.2" port="20401">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="0" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-3.34533" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-3.34533" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="-0.772" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.3" port="20402">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="400" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.286667" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-1.286667" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="1.286667" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.4" port="20403">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="800" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="0.772" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="0.772" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="3.34533" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="-0.065" z="4.0" />
</User>
<Node address="127.0.0.1" port="20400">
<Window fullScreen="false">
<Stereo type="none" />
<Pos x="0" y="100" />
<Size x="910" y="263" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-3.34533" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-3.34533" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="3.34533" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.2" port="20401">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="0" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-3.34533" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-3.34533" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="-0.772" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.3" port="20402">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="400" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.286667" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="-1.286667" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="1.286667" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.4" port="20403">
<Window fullScreen="false">
<Stereo type="none" />
<Size x="400" y="300" />
<Pos x="800" y="400" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="0.772" y="-0.965" z="0.0" />
<!-- Upper left -->
<Pos x="0.772" y="0.965" z="0.0" />
<!-- Upper right -->
<Pos x="3.34533" y="0.965" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="-0.065" z="4.0" />
</User>
</Cluster>

View File

@@ -1,24 +1,24 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost" externalControlPort="20500">
<Settings>
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<Size x="1280" y="720" />
<Settings>
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<Size x="1280" y="720" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="16.875" left="30.0" right="30.0" up="16.875" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Cluster>

25
config/sgct/single_4k.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost" externalControlPort="20500">
<Settings>
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<Size x="1280" y="720" />
<Res x="3840" y="2160" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="16.875" left="30.0" right="30.0" up="16.875" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Cluster>

View File

@@ -1,37 +1,37 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost">
<!-- <Scene>
<Orientation yaw="0.0" pitch="-27.0" roll="0.0" />
<Offset x="0.0" y="0.0" z="0.0" />
<Scale value="1.0" />
</Scene> -->
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<!-- 16:9 aspect ratio -->
<Size x="1024" y="1024" />
<!-- Frame buffer resolution
<Res x="4096" y="4096" /> -->
<!--
quality options (cubemap size):
- low (256)
- medium (512)
- high/1k (1024)
- 2k (2048)
- 4k (4096)
- 8k (8192)
tilt specifies the dome tilt angle in degrees from the horizontal
-->
<Viewport name="fisheye">
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<FisheyeProjection fov="180" quality="1k" tilt="27.0">
<Background r="0.1" g="0.1" b="0.1" a="1.0" />
</FisheyeProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.06">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
<!-- <Scene>
<Orientation yaw="0.0" pitch="-27.0" roll="0.0" />
<Offset x="0.0" y="0.0" z="0.0" />
<Scale value="1.0" />
</Scene> -->
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<!-- 16:9 aspect ratio -->
<Size x="1024" y="1024" />
<!-- Frame buffer resolution
<Res x="4096" y="4096" /> -->
<!--
quality options (cubemap size):
- low (256)
- medium (512)
- high/1k (1024)
- 2k (2048)
- 4k (4096)
- 8k (8192)
tilt specifies the dome tilt angle in degrees from the horizontal
-->
<Viewport name="fisheye">
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<FisheyeProjection fov="180" quality="1k" tilt="27.0">
<Background r="0.1" g="0.1" b="0.1" a="1.0" />
</FisheyeProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.06">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Cluster>

View File

@@ -1,37 +1,37 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost" externalControlPort="20500">
<Settings>
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<Size x="1280" y="720" />
<Settings>
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="none" />
<Size x="1280" y="720" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="16.875" left="30.0" right="30.0" up="16.875" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="GUI">
<Stereo type="none" />
<Size x="1280" y="720" />
</Viewport>
</Window>
<Window fullScreen="false" fxaa="false" numberOfSamples="8" name="GUI">
<Stereo type="none" />
<Size x="1280" y="720" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="16.875" left="30.0" right="30.0" up="16.875" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Cluster>

View File

@@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost">
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="side_by_side" />
<!-- 16:9 aspect ratio -->
<Size x="3840" y="1080" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="side_by_side" />
<!-- 16:9 aspect ratio -->
<Size x="3840" y="1080" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="16.875" left="30.0" right="30.0" up="16.875" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
</Cluster>

View File

@@ -1,25 +1,25 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost">
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="test" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
<Node address="localhost" port="20401">
<Window fullScreen="false" numberOfSamples="8" name="OpenSpace">
<Stereo type="test" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
</Cluster>

View File

@@ -1,40 +1,40 @@
<?xml version="1.0" ?>
<Cluster masterAddress="127.0.0.1">
<Node address="127.0.0.1" port="20401">
<Window fullScreen="false" numberOfSamples="8" border="true">
<Pos x="10" y="100" />
<Size x="320" y="480" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="0.0" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
<Window fullScreen="false" numberOfSamples="8" border="false">
<Pos x="340" y="100" />
<Size x="320" y="480" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="0.0" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="0.0" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
<Node address="127.0.0.1" port="20401">
<Window fullScreen="false" numberOfSamples="8" border="true">
<Pos x="10" y="100" />
<Size x="320" y="480" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="0.0" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
<Window fullScreen="false" numberOfSamples="8" border="false">
<Pos x="340" y="100" />
<Size x="320" y="480" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="0.0" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="0.0" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
</Cluster>

View File

@@ -1,44 +1,44 @@
<?xml version="1.0" ?>
<Cluster masterAddress="127.0.0.1">
<Node address="127.0.0.1" port="20401">
<Window fullScreen="false">
<Pos x="0" y="300" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.2" port="20402">
<Window fullScreen="false">
<Pos x="640" y="300" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
<Node address="127.0.0.1" port="20401">
<Window fullScreen="false">
<Pos x="0" y="300" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<Node address="127.0.0.2" port="20402">
<Window fullScreen="false">
<Pos x="640" y="300" />
<!-- 16:9 aspect ratio -->
<Size x="640" y="360" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<Viewplane>
<!-- Lower left -->
<Pos x="-1.778" y="-1.0" z="0.0" />
<!-- Upper left -->
<Pos x="-1.778" y="1.0" z="0.0" />
<!-- Upper right -->
<Pos x="1.778" y="1.0" z="0.0" />
</Viewplane>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.065">
<Pos x="0.0" y="0.0" z="4.0" />
</User>
</Cluster>

View File

@@ -7,11 +7,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "EARTH BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
-- Earth module
@@ -101,9 +98,7 @@ return {
-- G = 0.65,
-- },
}
},
GuiName = "/Solar/Planets/Earth"
}
},
-- EarthTrail module
{
@@ -118,8 +113,7 @@ return {
TropicalOrbitPeriod = 365.242,
EarthOrbitRatio = 1,
DayLength = 24
},
GuiName = "/Solar/EarthTrail"
}
},
{
Name = "EarthMarker",
@@ -129,7 +123,8 @@ return {
Size = {3.0, 11.0},
Origin = "Center",
Billboard = true,
Texture = "textures/marker.png"
Texture = "textures/marker.png",
BlendMode = "Additive"
},
Ephemeris = {
Type = "Static",

View File

@@ -57,8 +57,6 @@ return {
TransferFunctionName = "BatsrusPTF",
TransferFunction = "transferfunctions/p.txt",
Sampler = "psampler.glsl",
},
GuiName = "/Volumes/Volume"
}
}
--]]
}

View File

@@ -2,10 +2,6 @@ return {
-- Solar System module
{
Name = "SolarSystem",
Parent = "Root",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0}
}
Parent = "Root"
},
}

View File

@@ -8,9 +8,6 @@ return {
File = "${OPENSPACE_DATA}/scene/constellationbounds/data/bound_20.dat",
ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat",
ReferenceFrame = "J2000"
},
Ephemeris = {
Type = "Static"
}
}
}

View File

@@ -23,7 +23,6 @@ return {
Ephemeris = {
Type = "Spice",
Body = "CERES",
Reference = "GALACTIC",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/DawnKernels/pck/dawn_ceres_v01.tpc",
@@ -35,9 +34,7 @@ return {
Type = "Spice",
Frame = "IAU_CERES",
Reference = "GALACTIC"
},
GuiName = "/Solar/Ceres"
}
},
--[[ Ceres Trail Module
{
@@ -62,8 +59,7 @@ return {
},
StartTime = "2010 JAN 01T00:00:00",
EndTime = "2018 JAN 22 12:00:00"
},
GuiName = "/Solar/CeresTrail"
}
}
--]]
}

View File

@@ -25,7 +25,6 @@ return {
Ephemeris = {
Type = "Spice",
Body = "DAWN",
Reference = "GALACTIC",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/DawnKernels/spk/dawn_ref_070926-150201_070829.bsp",
@@ -621,8 +620,7 @@ return {
"${OPENSPACE_DATA}/spice/DawnKernels/ck/dawn_sa_120903_120909.bc",
"${OPENSPACE_DATA}/spice/DawnKernels/ck/dawn_sa_120910_120916.bc",
}
},
GuiName = "/Solar/Dawn"
}
},
-- Dawn Solar Array module 1
@@ -719,7 +717,6 @@ return {
StartTime = "2007 SEP 26 13:28:00",
EndTime = "2012 SEP 12 12:00:00"
},
GuiName = "DawnTrail"
},
--
-- -- Dawn Trail Module
@@ -771,7 +768,6 @@ return {
"CERES"
}
},
GuiName = "/Solar/Dawn_FC1"
},
-- DawnFov 1
@@ -798,6 +794,5 @@ return {
"CERES"
}
},
GuiName = "/Solar/Dawn_FC"
},
}

View File

@@ -88,16 +88,12 @@ return {
Ephemeris = {
Type = "Spice",
Body = "VESTA",
Reference = "GALACTIC",
Observer = "SUN",
Kernels = {
--"${OPENSPACE_DATA}/spice/DAWN_KERNELS/pck/dawn_vesta_v06.tpc",
"${OPENSPACE_DATA}/spice/DawnKernels/spk/sb_vesta_071107.bsp",
}
},
GuiName = "/Solar/Vesta"
}
},
-- Vesta Trail Module
{
@@ -122,7 +118,6 @@ return {
},
StartTime = "2007 JUL 20 12:00:00",
EndTime = "2018 JAN 22 12:00:00"
},
GuiName = "/Solar/VestaTrail"
}
}
}

View File

@@ -7,11 +7,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "EARTH BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
-- RenderableGlobe module
@@ -170,8 +167,7 @@ return {
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
},
GuiName = "/Solar/Planets/DebugGlobe"
}
},
-- EarthTrail module
{
@@ -186,8 +182,7 @@ return {
TropicalOrbitPeriod = 365.242,
EarthOrbitRatio = 1,
DayLength = 24
},
GuiName = "/Solar/EarthTrail"
}
}
--[[,
{

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -1,25 +0,0 @@
return {
{
Name = "DebugModel",
Parent = "Root",
Renderable = {
Type = "RenderableModel",
Body = "SUN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = "models/OSIRIS-REx GSFC Animation/OSIRIS-REx GSFC Animation/OREXE1.obj",
Magnification = 4,
},
Textures = {
Type = "simple",
Color = "textures/NHTexture.jpg",
},
Shading = {
PerformShading = true,
Fadeable = false,
Ghosting = false,
},
},
GuiName = "/Solar/DebugModel"
},
}

View File

@@ -33,11 +33,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "EARTH",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -76,7 +73,12 @@ return {
Size = {3.0, 11.0},
Origin = "Center",
Billboard = true,
Texture = "textures/marker.png"
Texture = "textures/marker.png",
BlendMode = "Additive"
},
Ephemeris = {
Type = "Static",
Position = {0, 0, 0, 5}
}
}
]]

View File

@@ -4,14 +4,9 @@ return {
{
Name = "Enlil",
Parent = "Root",
Ephemeris = {
Type = "Static",
Position = { 0.0, 0.0, 0.0, 0}
},
RenderableToggle = "e",
Renderable = {
Type = "RenderableVolumeGL",
---[[
BoxScaling = { f, f, f},
VolumeName = "EnlilVolume",
Volume = "${OPENSPACE_DATA}/enlil/Hong_Xie_120312_SH_1.enlil.0016.cdf",
@@ -26,8 +21,6 @@ return {
TransferFunction = "transferfunctions/t2.txt",
-- TransferFunction = "transferfunctions/t1.txt",
Sampler = "sampler.glsl",
--]]
},
GuiName = "/Volumes/Volume"
}
}
}

View File

@@ -3,10 +3,6 @@ return {
{
Name = "Enlil New Horizons",
Parent = "Root",
Ephemeris = {
Type = "Static",
Position = { 0.0, 0.0, 0.0, 0}
},
Renderable = {
Type = "RenderableMultiresVolume",
ReferenceFrame = "HEEQ",
@@ -18,7 +14,6 @@ return {
ErrorHistogramsSource = "tsp/enlil_nh_128_128_16_50.errorHistograms",
TransferFunction = "transferfunctions/fire.txt",
BrickSelector = "tf",
},
GuiName = "/Volumes/ENLIL New Horizons"
}
}
}

View File

@@ -10,10 +10,6 @@ return {
{
Name = "Fieldlines1",
Parent = "Earth",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0},
},
Renderable = {
Type = "RenderableFieldlines",
VectorField = {
@@ -30,16 +26,11 @@ return {
Type = "File",
File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_closed_seeds_all.txt';
}
},
GuiName = "/Geometry/Fieldlines"
}
},
{
Name = "Fieldlines2",
Parent = "Earth",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0},
},
Renderable = {
Type = "RenderableFieldlines",
VectorField = {
@@ -56,16 +47,11 @@ return {
Type = "File",
File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_north_all.txt'
}
},
GuiName = "/Geometry/Fieldlines"
}
},
{
Name = "Fieldlines3",
Parent = "Earth",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0},
},
Renderable = {
Type = "RenderableFieldlines",
VectorField = {
@@ -82,16 +68,11 @@ return {
Type = "File",
File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_open_south_all.txt'
}
},
GuiName = "/Geometry/Fieldlines"
}
},
{
Name = "Fieldlines4",
Parent = "Earth",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0},
},
Renderable = {
Type = "RenderableFieldlines",
VectorField = {
@@ -108,16 +89,11 @@ return {
Type = "File",
File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_solar_wind_all.txt'
}
},
GuiName = "/Geometry/Fieldlines"
}
},
{
Name = "Fieldlines5",
Parent = "Earth",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0},
},
Renderable = {
Type = "RenderableFieldlines",
VectorField = {
@@ -134,7 +110,6 @@ return {
Type = "File",
File = '${OPENSPACE_DATA}/scene/fieldlines/bats_seeds/BATS_R_US_separatrix_seeds_all.txt'
}
},
GuiName = "/Geometry/Fieldlines"
}
}
}

View File

@@ -3,10 +3,6 @@ return {
{
Name = "Flare",
Parent = "Root",
Ephemeris = {
Type = "Static",
Position = { 0, 0, 0, 0}
},
Renderable = {
Type = "RenderableFlare",
Source = "${OPENSPACE_DATA}/enlil_64_32_8.tsp",
@@ -23,7 +19,6 @@ return {
tsp_traveral_stepsize = 0.02,
raycaster_stepsize = 0.005,
},
GuiName = "/Volumes/Flare"
}
}
}

View File

@@ -41,14 +41,16 @@ return {
ScenePath = ".",
CommonFolder = "common",
Camera = {
Focus = "LodMars",
Focus = "Mars",
Position = {138530625167.228241, 42217005217.825005, -46336405755.934372},
Rotation = {0.633883, 0.492158, -0.123913, -0.583625},
},
Modules = {
"lodearth",
"lodmoon",
"lodmars",
"lodmercury",
"sun",
"stars",
"milkyway",

View File

@@ -3,7 +3,6 @@ return {
{
Name = "SphericalGrid",
Parent = "Root",
Static = true,
Renderable = {
Type = "RenderableSphericalGrid",
GridType = "ECLIPJ2000",
@@ -13,22 +12,6 @@ return {
-0.09647644, 0.8622859, 0.4971472 , 0.0,
0.0 , 0.0 , 0.0 , 1.0 },
GridSegments = 36,
},
Ephemeris = {
Type = "Static" -- for now, might change.
},
--[[
Ephemeris = {
Type = "Spice",
Body = "EARTH",
Reference = "ECLIPJ2000",
Observer = "EARTH BARYCENTER",
Kernels = {
"kernels/earth.bsp"
}
},
--]]
GuiName = "/Grid/Ecliptic"
}
}
}

View File

@@ -3,7 +3,6 @@ return {
{
Name = "SphericalGrid",
Parent = "Root",
Static = true,
Renderable = {
Type = "RenderableSphericalGrid",
GridType = "ICRF",
@@ -13,11 +12,6 @@ return {
-0.483835 , 0.7469823, 0.4559838, 0.0,
0.0 , 0.0 , 0.0 , 1.0 },
GridSegments = 36,
},
Ephemeris = {
Type = "Static" -- for now, might change.
},
GuiName = "/Grid/Equatorial"
}
}
}

View File

@@ -3,32 +3,15 @@ return {
{
Name = "gridGalactic",
Parent = "SolarSystem",
Static = true,
Renderable = {
Type = "RenderableSphericalGrid",
GridType = "GALACTIC",
GridColor = { 0.0, 0.4, 0.4, 1},
GridMatrix = { 1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
GridMatrix = { 1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0 },
GridSegments = 36,
},
Ephemeris = {
Type = "Static" -- for now, might change.
},
--[[
Ephemeris = {
Type = "Spice",
Body = "EARTH",
Reference = "ECLIPJ2000",
Observer = "EARTH BARYCENTER",
Kernels = {
"kernels/earth.bsp"
}
},
--]]
GuiName = "/Grid/Galactic"
}
}
}

View File

@@ -1,34 +0,0 @@
return {
-- Latest image taken by LORRI
--[[
{
Name = "ImagePlane",
Parent = "PlutoProjection",
Renderable = {
Type = "RenderablePlaneProjection",
Frame = "NH_SPACECRAFT",
DefaultTarget = "PLUTO",
Spacecraft = "NEW HORIZONS",
Instrument = "NH_LORRI",
Moving = false,
Texture = "textures/squarefov.png",
},
},
-- LORRI FoV square
{
Name = "ImagePlane2",
Parent = "NewHorizons",
Renderable = {
Type = "RenderablePlaneProjection",
Frame = "IAU_JUPITER",
DefaultTarget = "JUPITER",
Spacecraft = "NEW HORIZONS",
Instrument = "NH_LORRI",
Moving = true,
Texture = "textures/squarefov.png",
},
}
]]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

View File

@@ -31,7 +31,6 @@ return {
Ephemeris = {
Type = "Spice",
Body = "JUNO",
Reference = "GALACTIC",
Observer = "JUPITER BARYCENTER",
Kernels = {
"spice/JNO_SCLKSCET.00039.tsc",
@@ -120,8 +119,7 @@ return {
"spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc",
"spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc"
}
},
GuiName = "/Solar/Juno"
}
},
--NewHorizonsTrail module
{

View File

@@ -26,11 +26,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "CALLISTO",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/jup260.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -41,8 +38,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Callisto"
}
},
-- CallistoTrail module
{
@@ -62,7 +58,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/CallistoTrail"
}
}
}

View File

@@ -26,11 +26,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "EUROPA",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/jup260.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -41,8 +38,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/EUROPA"
}
},
-- EuropaTrail module
{
@@ -62,7 +58,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/EuropaTrail"
}
}
}

View File

@@ -26,11 +26,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "GANYMEDE",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/jup260.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -41,8 +38,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Ganymede"
}
},
-- GanymedeTrail module
{
@@ -62,7 +58,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/GanymedeTrail"
}
}
}

View File

@@ -26,11 +26,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "IO",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/jup260.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -41,8 +38,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Jupiter"
}
},
-- IoTrail module
{
@@ -62,7 +58,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/IoTrail"
}
}
}

View File

@@ -7,11 +7,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "JUPITER BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
},
@@ -52,8 +49,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Jupiter"
}
},
-- JupiterTrail module
{
@@ -73,7 +69,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/JupiterTrail"
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,3 +1,4 @@
earthEllipsoid = {6378137.0, 6378137.0, 6356752.314245} -- Earth's radii
return {
-- Earth barycenter module
{
@@ -7,11 +8,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "EARTH",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
},
@@ -28,12 +26,11 @@ return {
TropicalOrbitPeriod = 365.242,
EarthOrbitRatio = 1,
DayLength = 24
},
GuiName = "/Solar/EarthTrail"
}
},
-- RenderableGlobe module
{
Name = "LodEarth",
Name = "Earth",
Parent = "EarthBarycenter",
Transform = {
Rotation = {
@@ -48,7 +45,7 @@ return {
},
Renderable = {
Type = "RenderableGlobe",
Radii = {6378137.0, 6378137.0, 6356752.314245}, -- Earth's radii
Radii = earthEllipsoid,
CameraMinHeight = 300,
InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values
SegmentsPerPatch = 64,
@@ -62,25 +59,25 @@ return {
{
Type = "Temporal",
Name = "Temporal VIIRS SNPP",
FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
},
{
Type = "SingleImage",
Name = "Debug Tiles",
FilePath = "../debugglobe/textures/test_tile.png",
FilePath = "textures/test_tile.png",
},
{
Type = "Temporal",
Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor",
FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
},
{
Name = "MODIS_Terra_CorrectedReflectance_TrueColor",
FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
},
{
Name = "ESRI Imagery World 2D",
FilePath = "map_service_configs/ESRI_Imagery_World_2D.wms",
FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms",
Enabled = true,
}
},
@@ -90,41 +87,45 @@ return {
NightTextures = {
{
Name = "Earth at Night 2012",
FilePath = "map_service_configs/VIIRS_CityLights_2012.xml",
FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml",
},
},
WaterMasks = {
{
Name = "MODIS_Water_Mask",
FilePath = "map_service_configs/MODIS_Water_Mask.xml",
FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml",
},
},
Overlays = {
{
Name = "Coastlines",
FilePath = "map_service_configs/Coastlines.xml",
FilePath = "map_service_configs/GIBS/Coastlines.xml",
},
{
Name = "Reference_Features",
FilePath = "map_service_configs/Reference_Features.xml",
FilePath = "map_service_configs/GIBS/Reference_Features.xml",
},
{
Name = "Reference_Labels",
FilePath = "map_service_configs/Reference_Labels.xml",
FilePath = "map_service_configs/GIBS/Reference_Labels.xml",
},
{
Type = "SizeReference",
Name = "Size Reference",
Radii = earthEllipsoid,
BackgroundImagePath = "../debugglobe/textures/arrows.png",
},
},
HeightMaps = {
{
Name = "Terrain tileset",
FilePath = "map_service_configs/TERRAIN.wms",
FilePath = "map_service_configs/ESRI/TERRAIN.wms",
Enabled = true,
MinimumPixelSize = 90,
DoPreProcessing = true,
},
},
HeightMapOverlays = {
},
},
},
GuiName = "/Solar/Planets/LodEarth"
}
},
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

View File

@@ -3,9 +3,6 @@ return {
{
Name = "EarthBarycenter",
Parent = "SolarSystemBarycenter",
Ephemeris = {
Type = "Static"
}
},
-- EarthTrail module
{
@@ -30,11 +27,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "EARTH",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430.bsp"
},
Rotation = {
Type = "Spice",
@@ -86,8 +80,7 @@ return {
HeightMapOverlays = {
},
},
},
GuiName = "/Solar/Planets/LodEarth"
}
},
{
Name = "LodMoon",
@@ -95,11 +88,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "MOON",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430.bsp"
},
Rotation = {
Type = "Spice",
@@ -180,11 +170,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "MARS",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/MAR063.BSP"
}
Kernels = "${OPENSPACE_DATA}/spice/MAR063.BSP"
},
Rotation = {
Type = "Spice",
@@ -243,8 +230,7 @@ return {
HeightMapOverlays = {
},
},
},
GuiName = "/Solar/Planets/LodEarth"
}
},
{
Name = "LodMercury",
@@ -252,11 +238,8 @@ return {
Ephemeris = {
Type = "Spice",
Body = "MERCURY",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430.bsp"
},
Rotation = {
Type = "Spice",
@@ -303,7 +286,6 @@ return {
},
},
},
GuiName = "/Solar/Planets/LodEarth"
}
},
}

View File

@@ -1,27 +1,27 @@
local marsEllipsoid = {3396190.0, 3396190.0, 3376200.0}
return {
-- Mars barycenter module
{
Name = "MarsBarycenter",
Parent = "SolarSystemBarycenter",
},
-- RenderableGlobe module
{
Name = "LodMars",
Parent = "MarsBarycenter",
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "MARS BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
},
-- RenderableGlobe module
{
Name = "Mars",
Parent = "MarsBarycenter",
Transform = {
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_MARS",
DestinationFrame = "ECLIPJ2000",
DestinationFrame = "GALACTIC",
},
Scale = {
Type = "StaticScale",
@@ -30,9 +30,7 @@ return {
},
Renderable = {
Type = "RenderableGlobe",
Frame = "IAU_MARS",
Body = "MARS BARYCENTER",
Radii = {3396190.0, 3396190.0, 3376200.0}, -- Mars' radii
Radii = marsEllipsoid,
CameraMinHeight = 1000,
InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values
SegmentsPerPatch = 90,
@@ -51,11 +49,10 @@ return {
{
Name = "MARS_Viking_MDIM21",
FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
Enabled = true,
},
{
Name = "Mars Viking Clr",
FilePath = "map_datasets/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt",
FilePath = "map_datasets/Viking/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt",
Enabled = true,
},
},
@@ -66,13 +63,21 @@ return {
Enabled = true,
},
{
Name = "West_Candor_Chasma_longlat_global",
FilePath = "map_datasets/West_Candor_Chasma_longlat_global.vrt",
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_longlat_global.vrt",
--Enabled = true,
},
{
Name = "Layered Rock Outcrops in Southwest Candor Chasma",
FilePath = "map_datasets/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_A.vrt",
FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Texture.vrt",
},
{
Name = "MER_Meridianni_Endeavor_Basemap_25cm",
FilePath = "map_datasets/Basemap/MER_Meridianni_Endeavor_Basemap_25cm.vrt",
},
{
Name = "Part of Area Traversed by the Mars Exploration Rover",
FilePath = "map_datasets/HiRISE/Part_of_Area_Traversed_by_the_Mars_Exploration_Rover_Texture.vrt",
},
},
NightTextures = {
@@ -86,34 +91,46 @@ return {
Type = "ChunkIndex",
Name = "Indices",
},
{
Type = "SizeReference",
Name = "Size Reference",
Radii = marsEllipsoid,
BackgroundImagePath = "../debugglobe/textures/arrows.png",
},
},
HeightMaps = {
{
Name = "Mola Elevation",
FilePath = "map_service_configs/Mola_Elevation.xml",
Enabled = true,
MinimumPixelSize = 90,
DoPreProcessing = true,
},
{
Name = "West_Candor_Chasma_DEM_longlat_global",
FilePath = "map_datasets/West_Candor_Chasma_DEM_longlat_global.vrt",
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_DEM_longlat_global.vrt",
--Enabled = true,
MinimumPixelSize = 90,
DoPreProcessing = true,
},
{
Name = "Layered Rock Outcrops in Southwest Candor Chasma",
FilePath = "map_datasets/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_DEM.vrt",
FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Heightmap.vrt",
MinimumPixelSize = 90,
DoPreProcessing = true,
},
{
Name = "Part of Area Traversed by the Mars Exploration Rover",
FilePath = "map_datasets/HiRISE/Part_of_Area_Traversed_by_the_Mars_Exploration_Rover_Heightmap.vrt",
},
},
HeightMapOverlays = {
},
},
},
GuiName = "/Solar/Planets/LodMars"
}
},
-- MarsTrail module
{
Name = "MarsTrail",
Parent = "MarsBarycenter",
Parent = "Sun",
Renderable = {
Type = "RenderableTrail",
Body = "MARS BARYCENTER",
@@ -123,12 +140,6 @@ return {
TropicalOrbitPeriod = 686.973,
EarthOrbitRatio = 1.881,
DayLength = 24.6597,
Textures = {
Type = "simple",
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/MarsTrail"
}
}
}

View File

@@ -12,9 +12,4 @@
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
</DataWindow>
<Cache>
<Path>./ctx_wms_cache</Path>
<Depth>2</Depth>
<Extension>.jpg</Extension>
</Cache>
</GDAL_WMS>

View File

@@ -0,0 +1,87 @@
return {
-- Mercury barycenter module
{
Name = "MercuryBarycenter",
Parent = "SolarSystemBarycenter",
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "MERCURY",
Observer = "SUN",
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
},
-- RenderableGlobe module
{
Name = "Mercury",
Parent = "MercuryBarycenter",
Transform = {
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_MERCURY",
DestinationFrame = "GALACTIC",
},
Scale = {
Type = "StaticScale",
Scale = 1,
},
},
Renderable = {
Type = "RenderableGlobe",
Radii = {2439700, 2439700.0, 2439700.0},
Frame = "IAU_MERCURY",
Body = "MERCURY",
CameraMinHeight = 300,
InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values
SegmentsPerPatch = 64,
TextureInitData = {
ColorTextureMinimumSize = 512,
OverlayMinimumSize = 512,
HeightMapMinimumSize = 64,
},
Textures = {
ColorTextures = {
{
Name = "On Mercury Color",
FilePath = "map_service_configs/OnMercuryColor.xml",
Enabled = true,
},
{
Name = "On Mercury Image",
FilePath = "map_service_configs/OnMercuryImage.xml",
},
},
GrayScaleOverlays = { },
NightTextures = { },
WaterMasks = { },
Overlays = { },
HeightMaps = {
{
Name = "On Mercury Height",
FilePath = "map_service_configs/OnMercuryElevationGaskell.xml",
Enabled = true,
},
},
},
},
},
-- MercuryTrail module
{
Name = "MercuryTrail",
Parent = "SolarSystemBarycenter",
Renderable = {
Type = "RenderableTrail",
Body = "MERCURY",
Frame = "GALACTIC",
Observer = "SUN",
RGB = {0.6, 0.5, 0.5 },
TropicalOrbitPeriod = 87.968 ,
EarthOrbitRatio = 0.241,
DayLength = 4222.6,
},
}
}

View File

@@ -0,0 +1,30 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://192.168.1.167/OnMercury/wms.cgi?</ServerUrl>
<TiledGroupName>Color 665m</TiledGroupName>
<!--
These are the available layers that can be used as TiledGroupName:
Color Ratio
Colorized Elevation
Color 665m
Color 665m, x6g2
Color 332m
Color 332m, stretched
MASC Color Ratio Map
MASC Color Ratio Map sat75, white
MASC Color Ratio Map sat85, black
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>20</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

View File

@@ -0,0 +1,24 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://192.168.1.167/OnMercury/wms.cgi?</ServerUrl>
<!--
These are the available layers that can be used as TiledGroupName:
Elevation, Gaskell
Elevation 16bit, Gaskell
Elevation 16bit, Gaskell, 2014-12-04
-->
<TiledGroupName>Elevation 16bit, Gaskell</TiledGroupName>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>8</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

View File

@@ -0,0 +1,31 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://192.168.1.167/OnMercury/wms.cgi?</ServerUrl>
<TiledGroupName>Mercury Image</TiledGroupName>
<!--
Mercury Image
Gravity, contours
Gravity, no contours
Fast Neutron
Sigma Map
Aluminum
Calcium
Iron
Magnesium
Sulfur
Potassium
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>20</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

View File

@@ -0,0 +1,76 @@
return {
-- Moon module
{
Name = "Moon",
Parent = "EarthBarycenter",
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "MOON",
Observer = "EARTH BARYCENTER",
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_MOON",
DestinationFrame = "GALACTIC"
},
},
Renderable = {
Type = "RenderableGlobe",
Radii = {1737000, 1737000, 1737000}, -- Moons's radius
CameraMinHeight = 300,
InteractionDepthBelowEllipsoid = 5000, -- Useful when having negative height map values
SegmentsPerPatch = 64,
TextureInitData = {
ColorTextureMinimumSize = 512,--512,
OverlayMinimumSize = 512,
HeightMapMinimumSize = 64,
},
Textures = {
ColorTextures = {
},
GrayScaleOverlays = {
--[[
{
Name = "OnMoonColorGrayscale",
FilePath = "map_service_configs/OnMoonGrayscaleOverlay.vrt",
Enabled = true,
},
]]
},
NightTextures = {
},
WaterMasks = {
},
Overlays = {
},
HeightMaps = {
{
Name = "OnMoonHeight",
FilePath = "map_service_configs/OnMoonHeight.xml",
Enabled = true,
},
},
},
}
},
-- MoonTrail module
{
Name = "MoonTrail",
Parent = "EarthBarycenter",
Renderable = {
Type = "RenderableTrail",
Body = "MOON",
Frame = "GALACTIC",
Observer = "EARTH BARYCENTER",
RGB = { 0.5, 0.3, 0.3 },
TropicalOrbitPeriod = 60,
EarthOrbitRatio = 0.01,
DayLength = 1.0,
}
}
}

View File

@@ -0,0 +1,65 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://onmoon.lmmp.nasa.gov/wms.cgi?</ServerUrl>
<TiledGroupName>LRO WAC Mosaic, LMMP</TiledGroupName>
<!--
Clementine LO Hybrid, LMMP
Clementine Mosaic, LMMP
LRO WAC Mosaic, LMMP
LOLA v2, LMMP
LOLA Shade v2, LMMP
LOLA ClrShade v2, LMMP
LOLA v4, LMMP
LOLA v4 Coverage, LMMP
LOLA v4 NoData Mask, LMMP
LOLA Shade v4, LMMP
LOLA ClrShade v4, LMMP
Apollo 15, LMMP
Apollo 15 DEM Grayscale, LMMP
Apollo 15 HillShade, LMMP
Apollo 15 Colorized HillShade, LMMP
Apollo 15 Colorized Confidence, LMMP
Apollo 16 image, LMMP
Apollo 16 DEM Grayscale, LMMP
Apollo 16 HillShade, LMMP
Apollo 16 Colorized HillShade, LMMP
Apollo 16 Colorized Confidence, LMMP
Apollo 17 image Old, LMMP
Apollo 17 image, LMMP
Apollo 17 DEM Grayscale, LMMP
Apollo 17 HillShade, LMMP
Apollo 17 Colorized HillShade, LMMP
Apollo 17 Colorized Confidence, LMMP
Apollo Zone image, LMMP
Apollo Zone image 3033, LMMP
Apollo Zone DEM Grayscale, LMMP
Apollo Zone HillShade, LMMP
Apollo Zone Colorized HillShade, LMMP
Apollo Zone Colorized Confidence, LMMP
LRO Diviner CF Filled, LMMP
LRO Diviner CF, LMMP
Clementine Color Ratio, LMMP
Clementine Optical Maturity, LMMP
Clementine FeO abundance, LMMP
Clementine TiO2 abundance, LMMP
LP Fe Abundance, colorized, LMMP
LP K Abundance, colorized, LMMP
LP Th Abundance, colorized, LMMP
LP H Abundance, colorized, LMMP
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>20</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

View File

@@ -0,0 +1,28 @@
<VRTDataset rasterXSize="163840" rasterYSize="81920">
<SRS>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</SRS>
<GeoTransform> -1.8000000000000000e+02, 2.1972656250000000e-03, 0.0000000000000000e+00, 9.0000000000000000e+01, 0.0000000000000000e+00, -2.1972656250000000e-03</GeoTransform>
<VRTRasterBand dataType="Byte" band="1">
<NoDataValue>0</NoDataValue>
<HideNoDataValue>1</HideNoDataValue>
<ColorInterp>Gray</ColorInterp>
<ComplexSource>
<SourceFilename relativeToVRT="1">OnMoonColor.xml</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="163840" RasterYSize="81920" DataType="Byte" BlockXSize="512" BlockYSize="512" />
<SrcRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<DstRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<NODATA>0</NODATA>
</ComplexSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="2">
<ColorInterp>Alpha</ColorInterp>
<ComplexSource>
<SourceFilename relativeToVRT="1">white_geo.tif</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="163840" RasterYSize="81920" DataType="Byte" BlockXSize="512" BlockYSize="512"/>
<SrcRect xOff="0" yOff="0" xSize="32" ySize="32" />
<DstRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
</ComplexSource>
</VRTRasterBand>
</VRTDataset>

View File

@@ -0,0 +1,21 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://onmoon.lmmp.nasa.gov/raw/wms.cgi?</ServerUrl>
<TiledGroupName>Lunar Elevation v2, half meters</TiledGroupName>
<!--
Lunar Elevation v2
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>24</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

View File

@@ -0,0 +1,49 @@
<VRTDataset rasterXSize="163840" rasterYSize="81920">
<SRS>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</SRS>
<GeoTransform> -1.8000000000000000e+02, 2.1972656250000000e-03, 0.0000000000000000e+00, 9.0000000000000000e+01, 0.0000000000000000e+00, -2.1972656250000000e-03</GeoTransform>
<VRTRasterBand dataType="Byte" band="1">
<NoDataValue>0</NoDataValue>
<HideNoDataValue>1</HideNoDataValue>
<ColorInterp>Red</ColorInterp>
<ComplexSource>
<SourceFilename relativeToVRT="1">OnMoonColor.xml</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="163840" RasterYSize="81920" DataType="Byte" BlockXSize="512" BlockYSize="512" />
<SrcRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<DstRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<NODATA>0</NODATA>
<ScaleOffset>16</ScaleOffset>
<ScaleRatio>0</ScaleRatio>
</ComplexSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="2">
<NoDataValue>0</NoDataValue>
<HideNoDataValue>1</HideNoDataValue>
<ColorInterp>Green</ColorInterp>
<ComplexSource>
<SourceFilename relativeToVRT="1">OnMoonColor.xml</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="163840" RasterYSize="81920" DataType="Byte" BlockXSize="512" BlockYSize="512" />
<SrcRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<DstRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<NODATA>0</NODATA>
<ScaleOffset>16</ScaleOffset>
<ScaleRatio>0</ScaleRatio>
</ComplexSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="3">
<NoDataValue>0</NoDataValue>
<HideNoDataValue>1</HideNoDataValue>
<ColorInterp>Blue</ColorInterp>
<ComplexSource>
<SourceFilename relativeToVRT="1">OnMoonColor.xml</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="163840" RasterYSize="81920" DataType="Byte" BlockXSize="512" BlockYSize="512" />
<SrcRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<DstRect xOff="0" yOff="0" xSize="163840" ySize="81920" />
<NODATA>0</NODATA>
<ScaleOffset>16</ScaleOffset>
<ScaleRatio>0</ScaleRatio>
</ComplexSource>
</VRTRasterBand>
</VRTDataset>

View File

@@ -31,11 +31,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "MARS BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -46,8 +43,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Mars"
}
},
-- MarsTrail module
{
@@ -67,7 +63,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/MarsTrail"
}
}
}

View File

@@ -31,11 +31,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "MERCURY",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -46,8 +43,7 @@ return {
Type = "StaticScale",
Scale = 1,
},
},
GuiName = "/Solar/Planets/Mercury"
}
},
-- MercuryTrail module
{
@@ -67,7 +63,6 @@ return {
Color = "${COMMON_MODULE}/textures/glare_blue.png",
-- need to add different texture
},
},
GuiName = "/Solar/MercuryTrail"
}
}
}

View File

@@ -2,12 +2,9 @@ return {
{
Name = "MilkyWay",
Parent = "SolarSystem",
Ephemeris = {
Type = "Static"
},
Renderable = {
Type = "RenderableSphere",
Size = {10, 20},
Size = { 10, 20 },
Segments = 40,
Texture = "textures/eso0932a_blend.png",
Orientation = "Inside/Outside"

View File

@@ -2,12 +2,9 @@ return {
{
Name = "MilkyWay",
Parent = "SolarSystem",
Ephemeris = {
Type = "Static"
},
Renderable = {
Type = "RenderableSphere",
Size = {10, 22},
Size = { 10, 22 },
Segments = 40,
Texture = "textures/DarkUniverse_mellinger_8k.jpg",
Orientation = "Inside/Outside"

View File

@@ -5,8 +5,8 @@ return {
Parent = "EarthBarycenter",
Renderable = {
Type = "RenderablePlanet",
Frame = "IAU_MOON",
Body = "MOON",
Frame = "IAU_MOON",
Body = "MOON",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.737, 6},
@@ -28,21 +28,19 @@ return {
--Color = "textures/moonmap4k.jpg",
},
},
Ephemeris = {
Type = "Spice",
Body = "MOON",
Reference = "ECLIPJ2000",
Observer = "EARTH BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "MOON",
Observer = "EARTH BARYCENTER",
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_MOON",
DestinationFrame = "ECLIPJ2000"
},
},
Rotation = {
Type = "Spice",
Frame = "IAU_MOON",
Reference = "ECLIPJ2000"
},
GuiName = "/Solar/Planets/MOON"
},
-- MoonTrail module
{
@@ -63,6 +61,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/MoonTrail"
}
}

View File

@@ -3,9 +3,6 @@ return {
{
Name = "NeptuneBarycenter",
Parent = "SolarSystemBarycenter",
Ephemeris = {
Type = "Static"
}
},
-- Neptune module
@@ -29,18 +26,14 @@ return {
Ephemeris = {
Type = "Spice",
Body = "NEPTUNE BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "Spice",
Frame = "IAU_NEPTUNE",
Reference = "ECLIPJ2000"
},
GuiName = "/Solar/Planets/Neptune"
},
-- NeptuneTrail module
{
@@ -61,6 +54,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/NeptuneTrail"
}
}

View File

@@ -70,7 +70,6 @@ return {
-- "stars-denver",
"milkyway",
-- "milkyway-eso",
"imageplane",
"newhorizons/newhorizons",
"newhorizons/newhorizonsfov",
}

View File

@@ -6,7 +6,7 @@ return {
Renderable = {
Type = "RenderablePlanetProjection",
Frame = "IAU_CALLISTO",
Body = "CALLISTO",
Body = "CALLISTO",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
@@ -22,6 +22,7 @@ return {
Observer = "NEW HORIZONS",
Target = "CALLISTO",
Aberration = "NONE",
AspectRatio = 2
},
Instrument = {
Name = "NH_LORRI",
@@ -36,31 +37,12 @@ return {
"JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
}
},
--[[
Ephemeris = {
Type = "Spice",
Body = "CALLISTO",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
},
Rotation = {
Type = "Spice",
Frame = "IAU_CALLISTO",
Reference = "ECLIPJ2000"
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "CALLISTO",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -68,7 +50,6 @@ return {
DestinationFrame = "ECLIPJ2000",
},
},
GuiName = "/Solar/Planets/Jupiter"
},
{
Name = "CallistoText",
@@ -78,7 +59,8 @@ return {
Size = {1.0, 7.4},
Origin = "Center",
Billboard = true,
Texture = "textures/Callisto-Text.png"
Texture = "textures/Callisto-Text.png",
BlendMode = "Additive"
},
--[[
Ephemeris = {
@@ -113,6 +95,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/CallistoTrail"
}
}

View File

@@ -22,6 +22,7 @@ return {
Observer = "NEW HORIZONS",
Target = "EUROPA",
Aberration = "NONE",
AspectRatio = 2
},
Instrument = {
Name = "NH_LORRI",
@@ -36,31 +37,12 @@ return {
"JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO"
}
},
--[[
Ephemeris = {
Type = "Spice",
Body = "EUROPA",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
},
Rotation = {
Type = "Spice",
Frame = "IAU_EUROPA",
Reference = "ECLIPJ2000"
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "EUROPA",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -68,7 +50,6 @@ return {
DestinationFrame = "ECLIPJ2000",
},
},
GuiName = "/Solar/Planets/Jupiter"
},
{
Name = "EuropaText",
@@ -78,7 +59,8 @@ return {
Size = {1.0, 7.4},
Origin = "Center",
Billboard = true,
Texture = "textures/Europa-Text.png"
Texture = "textures/Europa-Text.png",
BlendMode = "Additive"
},
--[[
Ephemeris = {
@@ -113,6 +95,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/EuropaTrail"
}
}

View File

@@ -22,6 +22,7 @@ return {
Observer = "NEW HORIZONS",
Target = "GANYMEDE",
Aberration = "NONE",
AspectRatio = 2
},
Instrument = {
Name = "NH_LORRI",
@@ -40,11 +41,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "GANYMEDE",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -52,23 +50,6 @@ return {
DestinationFrame = "ECLIPJ2000",
},
},
--[[
Ephemeris = {
Type = "Spice",
Body = "GANYMEDE",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
},
Rotation = {
Type = "Spice",
Frame = "IAU_GANYMEDE",
Reference = "ECLIPJ2000"
},
]]
GuiName = "/Solar/Planets/Jupiter"
},
{
Name = "GanymedeText",
@@ -78,7 +59,8 @@ return {
Size = {1.0, 7.4},
Origin = "Center",
Billboard = true,
Texture = "textures/Ganymede-Text.png"
Texture = "textures/Ganymede-Text.png",
BlendMode = "Additive"
},
Transform = {
Translation = {
@@ -107,6 +89,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/GanymedeTrail"
}
}

View File

@@ -22,6 +22,7 @@ return {
Observer = "NEW HORIZONS",
Target = "IO",
Aberration = "NONE",
AspectRatio = 2
},
Instrument = {
Name = "NH_LORRI",
@@ -40,11 +41,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "IO",
Reference = "ECLIPJ2000",
Observer = "JUPITER BARYCENTER",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
Rotation = {
Type = "SpiceRotation",
@@ -68,7 +66,6 @@ return {
Reference = "ECLIPJ2000"
},
]]
GuiName = "/Solar/Planets/Jupiter"
},
{
Name = "IoText",
@@ -78,7 +75,8 @@ return {
Size = {1.0, 7.4},
Origin = "Center",
Billboard = true,
Texture = "textures/Io-Text.png"
Texture = "textures/Io-Text.png",
BlendMode = "Additive"
},
Transform = {
Translation = {
@@ -107,6 +105,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/IoTrail"
}
}

View File

@@ -7,11 +7,8 @@ return {
Translation = {
Type = "SpiceEphemeris",
Body = "JUPITER BARYCENTER",
Reference = "ECLIPJ2000",
Observer = "SUN",
Kernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
},
},
},
@@ -41,6 +38,7 @@ return {
Observer = "NEW HORIZONS",
Target = "JUPITER",
Aberration = "NONE",
AspectRatio = 2
},
DataInputTranslation = {
Instrument = {
@@ -96,7 +94,6 @@ return {
DestinationFrame = "GALACTIC",
},
},
GuiName = "/Solar/Planets/Jupiter"
},
{
Name = "JupiterText",
@@ -106,7 +103,8 @@ return {
Size = {1.0, 7.5},
Origin = "Center",
Billboard = true,
Texture = "textures/Jupiter-text.png"
Texture = "textures/Jupiter-text.png",
BlendMode = "Additive"
},
Transform = {
Translation = {
@@ -134,7 +132,6 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/JupiterTrail"
}
}

View File

@@ -102,23 +102,10 @@ return {
Ghosting = false,
},
},
--[[
Ephemeris = {
Type = "Spice",
Body = "NEW HORIZONS",
-- Reference = "ECLIPJ2000",
Reference = "GALACTIC",
-- Observer = "PLUTO BARYCENTER",
Observer = "SUN",
-- Observer = "JUPITER BARYCENTER",
Kernels = NewHorizonsKernels
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "NEW HORIZONS",
Reference = "GALACTIC",
Observer = "SUN",
Kernels = NewHorizonsKernels
},
@@ -128,7 +115,6 @@ return {
DestinationFrame = "GALACTIC",
},
},
GuiName = "/Solar/NewHorizons"
},
--NewHorizonsTrail module
--[[{
@@ -181,7 +167,6 @@ return {
Ghosting = false,
},
},
GuiName = "/Solar/NewHorizons"
},
{
@@ -209,7 +194,6 @@ return {
SampleDeltaTime = 3600, -- Seconds between each point
SubSamples = 3,
},
GuiName = "/Solar/NewHorizonsTrailPluto"
},
--[[
-- NewHorizonsPath module

View File

@@ -24,7 +24,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_LORRI"
},
-- NewHorizonsFov module NH_RALPH_LEISA
{
@@ -51,7 +50,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_LEISA"
},
-- NewHorizonsFov module NH_RALPH_MVIC_PAN1
@@ -79,7 +77,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_MVIC_PAN1"
},
-- NewHorizonsFov module NH_RALPH_MVIC_PAN2
{
@@ -107,7 +104,6 @@ return {
}
},
GuiName = "/Solar/NH_RALPH_MVIC_PAN2"
},
-- NewHorizonsFov module NH_RALPH_MVIC_RED
{
@@ -135,7 +131,6 @@ return {
}
},
GuiName = "/Solar/NH_RALPH_MVIC_RED"
},
-- NewHorizonsFov module NH_RALPH_MVIC_BLUE
{
@@ -162,7 +157,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_MVIC_BLUE"
},
-- NewHorizonsFov module NH_RALPH_MVIC_FT
{
@@ -189,7 +183,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_MVIC_FT"
},
-- NewHorizonsFov module NH_RALPH_MVIC_METHANE
{
@@ -216,7 +209,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_MVIC_METHANE"
},
-- NewHorizonsFov module NH_RALPH_MVIC_NIR
{
@@ -243,7 +235,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_RALPH_MVIC_METHANE"
},
-- NewHorizonsFov module NH_ALICE_AIRGLOW
{
@@ -270,7 +261,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_ALICE_AIRGLOW"
},
-- NewHorizonsFov module NH_ALICE_SOC
{
@@ -297,7 +287,6 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
GuiName = "/Solar/NH_ALICE_SOC"
},
{
Name = "NH_REX",

View File

@@ -15,6 +15,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/NewHorizonsPath"
}
}

View File

@@ -18,6 +18,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/NewHorizonsTrail"
}
}

View File

@@ -40,6 +40,7 @@ return {
Observer = "NEW HORIZONS",
Target = "CHARON",
Aberration = "NONE",
AspectRatio = 2
},
Instrument = {
Name = "NH_LORRI",
@@ -55,25 +56,10 @@ return {
"CHARON"
}
},
--[[
Ephemeris = {
Type = "Spice",
Body = "CHARON",
Reference = "ECLIPJ2000",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
Rotation = {
Type = "Spice",
Frame = "IAU_CHARON",
Reference = "ECLIPJ2000"
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "CHARON",
Reference = "GALACTIC",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
@@ -83,7 +69,6 @@ return {
DestinationFrame = "GALACTIC"
},
},
GuiName = "/Solar/Planets/Charon"
},
{
Name = "CharonText",
@@ -93,7 +78,8 @@ return {
Size = {1.0, 6.3},
Origin = "Center",
Billboard = true,
Texture = "textures/Charon-Text.png"
Texture = "textures/Charon-Text.png",
BlendMode = "Additive"
},
Transform = {
Translation = {
@@ -101,12 +87,6 @@ return {
Position = {0, -1000000, 0}
},
},
--[[
Ephemeris = {
Type = "Static",
Position = {0, -10, 0, 5}
}
]]
},
{
Name = "CharonShadow",
@@ -141,6 +121,5 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/CharonTrail"
}
}

View File

@@ -27,25 +27,10 @@ return {
Color = "textures/gray.jpg",
}
},
--[[
Ephemeris = {
Type = "Spice",
Body = "Hydra",
Reference = "ECLIPJ2000",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
Rotation = {
Type = "Spice",
Frame = "IAU_PLUTO",
Reference = "ECLIPJ2000"
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "HYDRA",
Reference = "ECLIPJ2000",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
@@ -55,7 +40,6 @@ return {
DestinationFrame = "ECLIPJ2000"
},
},
GuiName = "/Solar/Planets/Hydra"
},
{
Name = "HydraText",
@@ -73,12 +57,6 @@ return {
Position = {1000000, 0, 1000000},
},
},
--[[
Ephemeris = {
Type = "Static",
Position = {1, 0, 1, 6}
}
]]
},
-- HydraTrail module
{
@@ -100,7 +78,6 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/HydraTrail"
}
}

View File

@@ -27,25 +27,10 @@ return {
Color = "textures/gray.jpg",
}
},
--[[
Ephemeris = {
Type = "Spice",
Body = "KERBEROS",
Reference = "ECLIPJ2000",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
Rotation = {
Type = "Spice",
Frame = "IAU_PLUTO",
Reference = "ECLIPJ2000"
},
]]
Transform = {
Translation = {
Type = "SpiceEphemeris",
Body = "KERBEROS",
Reference = "ECLIPJ2000",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
@@ -55,7 +40,6 @@ return {
DestinationFrame = "ECLIPJ2000"
},
},
GuiName = "/Solar/Planets/Kerberos"
},
{
Name = "KerberosText",
@@ -67,12 +51,6 @@ return {
Billboard = true,
Texture = "textures/Kerberos-Text.png"
},
--[[
Ephemeris = {
Type = "Static",
Position = {1, 0, 1, 6}
}
]]
Transform = {
Translation = {
Type = "StaticEphemeris",
@@ -100,7 +78,6 @@ return {
-- need to add different texture
},
},
GuiName = "/Solar/KerberosTrail"
}
}

Some files were not shown because too many files have changed in this diff Show More