mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-02 01:30:34 -06:00
* WIP: Start usign texture arrays instead of just a single texture Now the texture array is sucessfully created, sent over and sampled on the GPU * Include information about the texture format alpha channel and do a conversion * Make one draw wcall per texture array * Add scale to size mapping and move to a separate component * WIP: Make single textures work again, with texture array Although this breaks the polygon cloud.. * Also make the polygon cloud work again * Refactor rendering code * handle array layer seprately from texture coordinates * Make sure use size mapping uniform is always set Fixes point cloud disappearing when multi-textures points are enabled * Add has value check to size mapping * Fix indentation * Make sure points are rendered even when no texture is used * Clean up texture handling a bit and add comment about storage creation * Add comment and temporary asset changes * Clean up handling of color mode (number of colro channels) * Make interpolated points work with new rendering code * Refactor * Bring back check for valid index for color and size data * Make sure to check if the provided data file exists * Fix full path ont showing in error message * Refactor rendering code a bit * Change how the multitexture setup is configured in the asset and add documentation Separating made documentation a lot easier.. * Add a todo comment for future discussion * Add settings for texture compression * Preserve aspects ratio of rendered textures * Restructure input parameters for texture details * Simplify color mode - we decided to not support grayscale * Add option to set "useAlpha" from asset * Enable texture per default and fix aspect ratio problem when no texture is used * tiny refactor * Fix polygon rendering that broke when adding texture compression * Remove color in polygon shader The color would be applied twice in rendering * Restructure textures code and prevent loading the same texture twice * Better handling of extra texture parameter in speck files That does not lead to limitations in using dashes in texture names * Add some docs and communicate texture mode to the user * Fix so that single texture can be changed during runtime * Allow changing compression and usealpha during runtime * Update texture storage allocation to something that works in older OpenGL versions * Add a check that checks if we use more texture layers than allowed * Even more robust check of texture line in speck file (allow extra whitespaces) * Update data mapping to include texture information and clean up code a bit * Error handling and prevent loading non-used textures in texture map * Update some docs * Small cleanup * Add one more error message for fault texture map file format * Remove test version of tully images dataset * Small refactor * Add example asset * Update Ghoul - for larger uniform cache * Purge texture from ram when we're done with it * Cleanup (comments, ugly png check, etc) * Apply suggestions from code review Co-authored-by: Alexander Bock <alexander.bock@liu.se> * Apply suggestions from code review * Adress some more review comments and fix broken asset * More code review fixes * Read provided sizemapping parameter from asset * Fix warnings from trying to shift 16 bit int 32 bits :) * simplify datamapping hash string * Update comment that was not 100% correct. The file names may be specified as relative paths to a folder * Small update based on previous code review comments * Fix multi textured points gui path not same as other points * Update Folder description to reduce some confusion * Apply suggestions from code review Co-authored-by: Ylva Selling <ylva.selling@gmail.com> * Prevent updates to polygon cloud texture during runtime This lead to rendering problems. * Add describing comments to data files * Clarify why speck version is disabled per default * Update and clarify confusing size mapping parameters * Apply suggestions from code review Co-authored-by: Ylva Selling <ylva.selling@gmail.com> * Apply suggestions from code review --------- Co-authored-by: Alexander Bock <alexander.bock@liu.se> Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
132 lines
5.8 KiB
C++
132 lines
5.8 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2024 *
|
|
* *
|
|
* 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 <modules/base/rendering/pointcloud/sizemappingcomponent.h>
|
|
|
|
#include <openspace/documentation/documentation.h>
|
|
#include <ghoul/logging/logmanager.h>
|
|
|
|
namespace {
|
|
constexpr std::string_view _loggerCat = "SizeMapping";
|
|
|
|
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
|
|
"Enabled",
|
|
"Size Mapping Enabled",
|
|
"If this value is set to 'true' and at least one column was loaded as an option "
|
|
"for size mapping, the chosen data column will be used to scale the size of the "
|
|
"points. The first option in the list is selected per default.",
|
|
openspace::properties::Property::Visibility::NoviceUser
|
|
};
|
|
|
|
constexpr openspace::properties::Property::PropertyInfo OptionInfo = {
|
|
"Parameter",
|
|
"Parameter Option",
|
|
"This value determines which parameter is used for scaling of the point. The "
|
|
"parameter value will be used as a multiplicative factor to scale the size of "
|
|
"the points. Note that they may however still be scaled by max size adjustment "
|
|
"effects.",
|
|
openspace::properties::Property::Visibility::AdvancedUser
|
|
};
|
|
|
|
constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
|
|
"ScaleFactor",
|
|
"Scale Factor",
|
|
"This value is a multiplicative factor that is applied to the data values that "
|
|
"are used to scale the points, when size mapping is applied.",
|
|
openspace::properties::Property::Visibility::AdvancedUser
|
|
};
|
|
|
|
struct [[codegen::Dictionary(SizeMappingComponent)]] Parameters {
|
|
// [[codegen::verbatim(EnabledInfo.description)]]
|
|
std::optional<bool> enabled;
|
|
|
|
// A list specifying all parameters that may be used for size mapping, i.e.
|
|
// scaling the points based on the provided data columns
|
|
std::optional<std::vector<std::string>> parameterOptions;
|
|
|
|
// [[codegen::verbatim(OptionInfo.description)]]
|
|
std::optional<std::string> parameter;
|
|
|
|
// [[codegen::verbatim(ScaleFactorInfo.description)]]
|
|
std::optional<float> scaleFactor;
|
|
};
|
|
#include "sizemappingcomponent_codegen.cpp"
|
|
} // namespace
|
|
|
|
namespace openspace {
|
|
|
|
documentation::Documentation SizeMappingComponent::Documentation() {
|
|
return codegen::doc<Parameters>("base_sizemappingcomponent");
|
|
}
|
|
|
|
SizeMappingComponent::SizeMappingComponent()
|
|
: properties::PropertyOwner({ "SizeMapping", "Size Mapping", "" })
|
|
, enabled(EnabledInfo, true)
|
|
, parameterOption(
|
|
OptionInfo,
|
|
properties::OptionProperty::DisplayType::Dropdown
|
|
)
|
|
, scaleFactor(ScaleFactorInfo, 1.f, 0.f, 1000.f)
|
|
{
|
|
addProperty(enabled);
|
|
addProperty(parameterOption);
|
|
addProperty(scaleFactor);
|
|
}
|
|
|
|
SizeMappingComponent::SizeMappingComponent(const ghoul::Dictionary& dictionary)
|
|
: SizeMappingComponent()
|
|
{
|
|
const Parameters p = codegen::bake<Parameters>(dictionary);
|
|
|
|
enabled = p.enabled.value_or(enabled);
|
|
|
|
int indexOfProvidedOption = -1;
|
|
|
|
if (p.parameterOptions.has_value()) {
|
|
std::vector<std::string> opts = *p.parameterOptions;
|
|
for (size_t i = 0; i < opts.size(); ++i) {
|
|
// Note that options are added in order
|
|
parameterOption.addOption(static_cast<int>(i), opts[i]);
|
|
|
|
if (p.parameter.has_value() && *p.parameter == opts[i]) {
|
|
indexOfProvidedOption = i;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (indexOfProvidedOption >= 0) {
|
|
parameterOption = indexOfProvidedOption;
|
|
}
|
|
else if (p.parameter.has_value()) {
|
|
LERROR(fmt::format(
|
|
"Error when reading Parameter. Could not find provided parameter '{}' in "
|
|
"list of parameter options. Using default.", *p.parameter
|
|
));
|
|
}
|
|
|
|
scaleFactor = p.scaleFactor.value_or(scaleFactor);
|
|
}
|
|
|
|
} // namespace openspace
|