mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-01 08:19:51 -05:00
c165098cdc
* Start refactoring billboardscloud renderable * Remove extra unit computation in geometry shader * More refactor and fix size parameter not working without colormap (it never did) * Remove redundant bool in shader * Divide settings into property owners * Refactor colormap * More refactoring (utilize properties for visiblity) * Remove redundant extra data structures for options * Move data logic to the colormap settings structure * Remove confusing correction size properties * Separate polygon cloud into its own renderable * Clean up some unused code * Update some property descriptions * Split some more code out into functions * Remove odd and unused "linear filtering" Should be reimplemented ina better way in a general color map overhaul * Start refactoring some more properties * Make color optional and remove redundant color assignments in assets * Refactor color-parameter input and make range mapping work correctly * Code cleanup (unused code and fix data types) * Rename ScaleFactor to ScaleExponent * Add a scale factor as well, as they're easier to use, and clarify documentation * Fix faultily renamed scale factors * Remove confusing multiplication for scale exponent * Fix problem with points not appearing when _drawElements was set to true * Move all colormapsettings into its own table in the asset files * Move scaling/sizing into its own table as well * Group sizing properties and remove min pixel size limit (was always zero) * Add some docs and rename a parameter to avoid repetition * Remove IsExact colormap and add an option to hide outliers OBS! Still need to update the actual cmap files * Add property to disable size mapping * Increase pixel size of polyon texture - reduces jagged edges * Remove unused points class * Rename files and billboard class, to make it clearer that it is a point cloud * Move size mapping into size settings * Move color map properties out into its own component * Move color map related computations into the new component * Add outlier colors, to cover some specific color mapping issues * Automatically fill parameter options if no colormap parameters were defined * Move all color-related parameters to under one property owner * Inlcude changes from matrix maintenance * Add a checkbox to disable additive blending * Remove a unused variable in shader * DO color maping on the graphics card instead of CPU, using a texture * WIP remove old "Outliers" and start introducing concept of no data colors instead * Move speck loader to core and divide into a general data loader and a speck specific loader (In preparation for adding CSV support) * More labelscomponent to core * Fix a faulty header * Handle NaN values * Rename color map component property owner It's not just the color map, but the settings for the entire mapping * Hide point with nan value is show missing data is not selected * Fix labels component documentation after move * Add option to not provide any texture, and use a sphere generated form the shader * Don't crash when loading unsupported data formats :) * Add some TODO comments that should be addressed before merge * Move renderables from DU module to base, and do some header cleanup * Move colormapping component to core ad rename it to make it clear that it is not the color map itself * Add above, below and nan color values to cmap loading * Remove missing Data value specs in asset (and use belowRange in cmap instead) * Make warning about wrong color number more verbose * Add TODO comment about colormap, and actually used color in prev version, to localdwarfs * WIP: Load CSV files * Update some property visbility * Check if chosen parameter options actually exist * Fix fault column check * Update example asset to cover more different cases * Use new asset.resource loading * Update asset versions (major update) * Add parent documentation for RenderablePolygonCloud * Add point cloud example with size scaling and add TODO comment * Add example with textured points * Don't blend textured points * Fix problem with shaders being confused about texture units * Bring back deepsky points color * Start implementing more sophisticated datamapping for point data files * Allow reading datamapping from input dictionary * Load dataset in constructor instead Solves problem with color map columns not loading for big datasets when loaded the first time * Fix crash from reading column value that is interpreted as inf * Inlcude information about data mapping when caching dataset Updating the parameters now leads to an updated caching of the data file * Adapt to tolower update * Add option to specify columns to exclude in load (for CSV files) * Start updating some docs * Add a readonly property that shows the number of data points * Rename example asset to shorter name * Add option for not using cache when loading dataset * Fix some errors in example asset * Set scaleExponent from max position if not specified That way the points are always visible, even when no exponent is given * Restructure and add explanations in example asset * Add option to not cache labels component data file * Add example file with labels and units * Compute fade distances in model coordinates instead of world space (issue #1746) * Add possiblity to invert fading and add exmaple asset * Make a separate propertyowner for fading settings * Update docs * Add example asset with custom data mapping * Address some of my own review comments * Read provided Parameter from asset * Read ValueRange from asset * Add example asset for more advanced color mapping settings * Allow using the same column for two position coordinate axes * Update src/rendering/colormappingcomponent.cpp Co-authored-by: Alexander Bock <alexander.bock@liu.se> * Update src/data/datamapping.cpp * Use helper function for tolowercase * Simplify some std::optional handling, and fix broken assignment from code review fix * Update data file versions to get updated cmap files * Include a progress bar to show progress of CSV data loading * Update csv data-to-float parsing for clang * Add a description about why `openspace.absPath` is used in the file instead of `asset.resource` * Apply suggestions from code review * Apply suggestions from code review * Add some missing info in documentation * Place size-related property descriptions next to each other * Remove the explicitly set renderbin * Fix overly complicated description * Fix polygon texture not being used * Add polygon cloud example * only bind texture and activate texture unit when required * Rename alpha to opacity in shader * Fix value range not loading, and make first parameter in list the default * Rename Pixel Size property * Use base 10 for scale exponent instead of base e * Update src/data/datamapping.cpp * Update modules/base/shaders/billboardpoint_gs.glsl * Remove some redundant asset settings (Home label) * Review comments * Add TODO comment for localdwarfs asset (Speck file reading problems) * Oops, forgot part of the comment * Apply suggestions from code review Co-authored-by: Alexander Bock <alexander.bock@liu.se> * More code review fixes * Fix faulty isReady check when labels are included * Apply suggestions from code review Co-authored-by: Alexander Bock <alexander.bock@liu.se> * Apply suggestions from code review Co-authored-by: Alexander Bock <alexander.bock@liu.se> * More code review updates --------- Co-authored-by: Alexander Bock <alexander.bock@liu.se>
106 lines
4.4 KiB
CMake
106 lines
4.4 KiB
CMake
##########################################################################################
|
|
# #
|
|
# OpenSpace #
|
|
# #
|
|
# Copyright (c) 2014-2023 #
|
|
# #
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy of this #
|
|
# software and associated documentation files (the "Software"), to deal in the Software #
|
|
# without restriction, including without limitation the rights to use, copy, modify, #
|
|
# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to #
|
|
# permit persons to whom the Software is furnished to do so, subject to the following #
|
|
# conditions: #
|
|
# #
|
|
# The above copyright notice and this permission notice shall be included in all copies #
|
|
# or substantial portions of the Software. #
|
|
# #
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, #
|
|
# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A #
|
|
# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT #
|
|
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF #
|
|
# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE #
|
|
# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #
|
|
##########################################################################################
|
|
|
|
include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
|
|
|
|
set(HEADER_FILES
|
|
horizonsfile.h
|
|
kepler.h
|
|
rendering/renderableconstellationsbase.h
|
|
rendering/renderableconstellationbounds.h
|
|
rendering/renderableconstellationlines.h
|
|
rendering/renderableeclipsecone.h
|
|
rendering/renderablefluxnodes.h
|
|
rendering/renderablehabitablezone.h
|
|
rendering/renderablerings.h
|
|
rendering/renderableorbitalkepler.h
|
|
rendering/renderablestars.h
|
|
rendering/renderabletravelspeed.h
|
|
translation/gptranslation.h
|
|
translation/keplertranslation.h
|
|
translation/spicetranslation.h
|
|
translation/horizonstranslation.h
|
|
rotation/spicerotation.h
|
|
)
|
|
source_group("Header Files" FILES ${HEADER_FILES})
|
|
|
|
set(SOURCE_FILES
|
|
horizonsfile.cpp
|
|
kepler.cpp
|
|
spacemodule_lua.inl
|
|
rendering/renderableconstellationsbase.cpp
|
|
rendering/renderableconstellationbounds.cpp
|
|
rendering/renderableconstellationlines.cpp
|
|
rendering/renderableeclipsecone.cpp
|
|
rendering/renderablefluxnodes.cpp
|
|
rendering/renderablehabitablezone.cpp
|
|
rendering/renderablerings.cpp
|
|
rendering/renderableorbitalkepler.cpp
|
|
rendering/renderablestars.cpp
|
|
rendering/renderabletravelspeed.cpp
|
|
translation/gptranslation.cpp
|
|
translation/keplertranslation.cpp
|
|
translation/spicetranslation.cpp
|
|
translation/horizonstranslation.cpp
|
|
rotation/spicerotation.cpp
|
|
)
|
|
source_group("Source Files" FILES ${SOURCE_FILES})
|
|
|
|
set(SHADER_FILES
|
|
shaders/constellationbounds_fs.glsl
|
|
shaders/constellationbounds_vs.glsl
|
|
shaders/constellationlines_fs.glsl
|
|
shaders/constellationlines_vs.glsl
|
|
shaders/debrisViz_fs.glsl
|
|
shaders/debrisViz_vs.glsl
|
|
shaders/fluxnodes_fs.glsl
|
|
shaders/fluxnodes_vs.glsl
|
|
shaders/habitablezone_vs.glsl
|
|
shaders/habitablezone_fs.glsl
|
|
shaders/rings_vs.glsl
|
|
shaders/rings_fs.glsl
|
|
shaders/star_fs.glsl
|
|
shaders/star_ge.glsl
|
|
shaders/star_vs.glsl
|
|
shaders/travelspeed_fs.glsl
|
|
shaders/travelspeed_vs.glsl
|
|
)
|
|
source_group("Shader Files" FILES ${SHADER_FILES})
|
|
|
|
create_new_module(
|
|
"Space"
|
|
space_module
|
|
STATIC
|
|
${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
|
|
)
|
|
target_precompile_headers(${space_module} PRIVATE
|
|
<openspace/documentation/documentation.h>
|
|
<openspace/documentation/verifier.h>
|
|
<openspace/properties/numericalproperty.h>
|
|
<openspace/rendering/renderable.h>
|
|
<ghoul/opengl/programobject.h>
|
|
<ghoul/opengl/shaderobject.h>
|
|
<ghoul/opengl/uniformcache.h>
|
|
)
|