tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add clang-format (#1086)

Browse Source 
Co-authored-by: mwilsnd <mwilsnd@gmail.com>
This commit is contained in:
Bart Louwers
2023-05-01 16:57:37 +02:00
committed by GitHub
parent 403a12bd1b
commit 71f6da2722
1018 changed files with 27876 additions and 25862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/mbgl/programs/line_program.cpp
View File

@@ -12,64 +12,48 @@ using namespace style;
static_assert(sizeof(LineLayoutVertex) == 8, "expected LineLayoutVertex size");
template <class Values, class...Args>
template <class Values, class... Args>
Values makeValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
const RenderTile& tile,
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const float pixelRatio,
Args&&... args) {
return Values {
uniforms::matrix::Value(
tile.translatedMatrix(properties.get<LineTranslate>(),
properties.get<LineTranslateAnchor>(),
state)
),
uniforms::ratio::Value( 1.0f / tile.id.pixelsToTileUnits(1.0f, static_cast<float>(state.getZoom())) ),
uniforms::units_to_pixels::Value({ {1.0f / pixelsToGLUnits[0], 1.0f / pixelsToGLUnits[1]} }),
uniforms::device_pixel_ratio::Value( pixelRatio ),
std::forward<Args>(args)...
};
return Values{uniforms::matrix::Value(tile.translatedMatrix(
properties.get<LineTranslate>(), properties.get<LineTranslateAnchor>(), state)),
uniforms::ratio::Value(1.0f / tile.id.pixelsToTileUnits(1.0f, static_cast<float>(state.getZoom()))),
uniforms::units_to_pixels::Value({{1.0f / pixelsToGLUnits[0], 1.0f / pixelsToGLUnits[1]}}),
uniforms::device_pixel_ratio::Value(pixelRatio),
std::forward<Args>(args)...};
}
LineProgram::LayoutUniformValues
LineProgram::layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
const RenderTile& tile,
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const float pixelRatio) {
return makeValues<LineProgram::LayoutUniformValues>(
properties,
tile,
state,
pixelsToGLUnits,
pixelRatio
);
LineProgram::LayoutUniformValues LineProgram::layoutUniformValues(
const style::LinePaintProperties::PossiblyEvaluated& properties,
const RenderTile& tile,
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const float pixelRatio) {
return makeValues<LineProgram::LayoutUniformValues>(properties, tile, state, pixelsToGLUnits, pixelRatio);
}
LineSDFProgram::LayoutUniformValues
LineSDFProgram::layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
float pixelRatio,
const RenderTile& tile,
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const LinePatternPos& posA,
const LinePatternPos& posB,
const CrossfadeParameters& crossfade,
float atlasWidth) {
LineSDFProgram::LayoutUniformValues LineSDFProgram::layoutUniformValues(
const style::LinePaintProperties::PossiblyEvaluated& properties,
float pixelRatio,
const RenderTile& tile,
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const LinePatternPos& posA,
const LinePatternPos& posB,
const CrossfadeParameters& crossfade,
float atlasWidth) {
const float widthA = posA.width * crossfade.fromScale;
const float widthB = posB.width * crossfade.toScale;
std::array<float, 2> scaleA {{
1.0f / tile.id.pixelsToTileUnits(widthA, state.getIntegerZoom()),
-posA.height / 2.0f
}};
std::array<float, 2> scaleA{
{1.0f / tile.id.pixelsToTileUnits(widthA, state.getIntegerZoom()), -posA.height / 2.0f}};
std::array<float, 2> scaleB {{
1.0f / tile.id.pixelsToTileUnits(widthB, state.getIntegerZoom()),
-posB.height / 2.0f
}};
std::array<float, 2> scaleB{
{1.0f / tile.id.pixelsToTileUnits(widthB, state.getIntegerZoom()), -posB.height / 2.0f}};
return makeValues<LineSDFProgram::LayoutUniformValues>(
properties,
@@ -77,13 +61,12 @@ LineSDFProgram::layoutUniformValues(const style::LinePaintProperties::PossiblyEv
state,
pixelsToGLUnits,
pixelRatio,
uniforms::patternscale_a::Value( scaleA ),
uniforms::patternscale_b::Value( scaleB ),
uniforms::tex_y_a::Value( posA.y ),
uniforms::tex_y_b::Value( posB.y ),
uniforms::mix::Value( crossfade.t ),
uniforms::sdfgamma::Value( atlasWidth / (std::min(widthA, widthB) * 256.0f * pixelRatio) / 2.0f )
);
uniforms::patternscale_a::Value(scaleA),
uniforms::patternscale_b::Value(scaleB),
uniforms::tex_y_a::Value(posA.y),
uniforms::tex_y_b::Value(posB.y),
uniforms::mix::Value(crossfade.t),
uniforms::sdfgamma::Value(atlasWidth / (std::min(widthA, widthB) * 256.0f * pixelRatio) / 2.0f));
}
LinePatternProgram::LayoutUniformValues LinePatternProgram::layoutUniformValues(
@@ -94,7 +77,6 @@ LinePatternProgram::LayoutUniformValues LinePatternProgram::layoutUniformValues(
const float pixelRatio,
const Size atlasSize,
const CrossfadeParameters& crossfade) {
const auto tileRatio = 1 / tile.id.pixelsToTileUnits(1, state.getIntegerZoom());
return makeValues<LinePatternProgram::LayoutUniformValues>(
@@ -103,10 +85,9 @@ LinePatternProgram::LayoutUniformValues LinePatternProgram::layoutUniformValues(
state,
pixelsToGLUnits,
pixelRatio,
uniforms::scale::Value ({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} }),
uniforms::texsize::Value( atlasSize ),
uniforms::fade::Value( crossfade.t )
);
uniforms::scale::Value({{pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale}}),
uniforms::texsize::Value(atlasSize),
uniforms::fade::Value(crossfade.t));
}
LineGradientProgram::LayoutUniformValues LineGradientProgram::layoutUniformValues(
@@ -115,13 +96,7 @@ LineGradientProgram::LayoutUniformValues LineGradientProgram::layoutUniformValue
const TransformState& state,
const std::array<float, 2>& pixelsToGLUnits,
const float pixelRatio) {
return makeValues<LineGradientProgram::LayoutUniformValues>(
properties,
tile,
state,
pixelsToGLUnits,
pixelRatio
);
return makeValues<LineGradientProgram::LayoutUniformValues>(properties, tile, state, pixelsToGLUnits, pixelRatio);
}
} // namespace mbgl