mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-01 09:10:18 -06:00
f36868d1c4
* 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>
85 lines
3.9 KiB
C++
85 lines
3.9 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. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_CORE___DATAMAPPING___H__
|
|
#define __OPENSPACE_CORE___DATAMAPPING___H__
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace openspace::documentation { struct Documentation; }
|
|
namespace ghoul { class Dictionary; }
|
|
|
|
namespace openspace::dataloader {
|
|
|
|
struct DataMapping {
|
|
static DataMapping createFromDictionary(const ghoul::Dictionary& dictionary);
|
|
static documentation::Documentation Documentation();
|
|
|
|
bool hasExcludeColumns() const;
|
|
bool isExcludeColumn(std::string_view column) const;
|
|
|
|
bool checkIfAllProvidedColumnsExist(const std::vector<std::string>& columns) const;
|
|
|
|
std::optional<std::string> xColumnName;
|
|
std::optional<std::string> yColumnName;
|
|
std::optional<std::string> zColumnName;
|
|
std::optional<std::string> nameColumn;
|
|
std::optional<std::string> textureColumn;
|
|
|
|
std::optional<std::filesystem::path> textureMap;
|
|
|
|
std::optional<float> missingDataValue;
|
|
|
|
bool isCaseSensitive = false;
|
|
|
|
std::vector<std::string> excludeColumns;
|
|
|
|
// OBS! When new parameters are added they should be included in the generateHash
|
|
// function
|
|
};
|
|
|
|
/**
|
|
* Generate a string based on the data mapping, that can be used to uniquely
|
|
* identify the dataset.
|
|
*/
|
|
std::string generateHashString(const DataMapping& dm);
|
|
|
|
bool isPositionColumn(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
bool isColumnX(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
bool isColumnY(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
bool isColumnZ(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
bool isNameColumn(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
bool isTextureColumn(const std::string& c, const std::optional<DataMapping>& mapping);
|
|
|
|
} // namespace openspace::dataloader
|
|
|
|
#endif // __OPENSPACE_CORE___DATAMAPPING___H__
|