Topic/drawable extrusion (#1288)
Co-authored-by: Alex Cristici <alex.cristici@gmail.com>
This commit is contained in:
committed by
Bart Louwers
parent
813ddb024a
commit
8d9fe37a6b
@@ -11,12 +11,12 @@ using namespace style;
|
||||
|
||||
static_assert(sizeof(FillExtrusionLayoutVertex) == 12, "expected FillExtrusionLayoutVertex size");
|
||||
|
||||
std::array<float, 3> lightColor(const EvaluatedLight& light) {
|
||||
std::array<float, 3> FillExtrusionProgram::lightColor(const EvaluatedLight& light) {
|
||||
const auto color = light.get<LightColor>();
|
||||
return {{color.r, color.g, color.b}};
|
||||
}
|
||||
|
||||
std::array<float, 3> lightPosition(const EvaluatedLight& light, const TransformState& state) {
|
||||
std::array<float, 3> FillExtrusionProgram::lightPosition(const EvaluatedLight& light, const TransformState& state) {
|
||||
auto lightPos = light.get<LightPosition>().getCartesian();
|
||||
mat3 lightMat;
|
||||
matrix::identity(lightMat);
|
||||
@@ -27,26 +27,26 @@ std::array<float, 3> lightPosition(const EvaluatedLight& light, const TransformS
|
||||
return lightPos;
|
||||
}
|
||||
|
||||
float lightIntensity(const EvaluatedLight& light) {
|
||||
float FillExtrusionProgram::lightIntensity(const EvaluatedLight& light) {
|
||||
return light.get<LightIntensity>();
|
||||
}
|
||||
|
||||
FillExtrusionProgram::LayoutUniformValues FillExtrusionProgram::layoutUniformValues(mat4 matrix,
|
||||
FillExtrusionProgram::LayoutUniformValues FillExtrusionProgram::layoutUniformValues(const mat4& matrix,
|
||||
const TransformState& state,
|
||||
const float opacity,
|
||||
const EvaluatedLight& light,
|
||||
const float verticalGradient) {
|
||||
return {uniforms::matrix::Value(matrix),
|
||||
uniforms::opacity::Value(opacity),
|
||||
uniforms::lightcolor::Value(lightColor(light)),
|
||||
uniforms::lightpos::Value(lightPosition(light, state)),
|
||||
uniforms::lightintensity::Value(lightIntensity(light)),
|
||||
uniforms::lightcolor::Value(FillExtrusionProgram::lightColor(light)),
|
||||
uniforms::lightpos::Value(FillExtrusionProgram::lightPosition(light, state)),
|
||||
uniforms::lightintensity::Value(FillExtrusionProgram::lightIntensity(light)),
|
||||
uniforms::vertical_gradient::Value(verticalGradient)};
|
||||
}
|
||||
|
||||
FillExtrusionPatternProgram::LayoutUniformValues FillExtrusionPatternProgram::layoutUniformValues(
|
||||
mat4 matrix,
|
||||
Size atlasSize,
|
||||
const mat4& matrix,
|
||||
const Size atlasSize,
|
||||
const CrossfadeParameters& crossfade,
|
||||
const UnwrappedTileID& tileID,
|
||||
const TransformState& state,
|
||||
@@ -56,11 +56,11 @@ FillExtrusionPatternProgram::LayoutUniformValues FillExtrusionPatternProgram::la
|
||||
const EvaluatedLight& light,
|
||||
const float verticalGradient) {
|
||||
const auto tileRatio = 1 / tileID.pixelsToTileUnits(1, state.getIntegerZoom());
|
||||
int32_t tileSizeAtNearestZoom = static_cast<int32_t>(util::tileSize_D *
|
||||
state.zoomScale(state.getIntegerZoom() - tileID.canonical.z));
|
||||
int32_t pixelX = static_cast<int32_t>(tileSizeAtNearestZoom *
|
||||
(tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z)));
|
||||
int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
|
||||
const int32_t tileSizeAtNearestZoom = static_cast<int32_t>(
|
||||
util::tileSize_D * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z));
|
||||
const int32_t pixelX = static_cast<int32_t>(
|
||||
tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z)));
|
||||
const int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
|
||||
|
||||
return {uniforms::matrix::Value(matrix),
|
||||
uniforms::opacity::Value(opacity),
|
||||
@@ -72,9 +72,9 @@ FillExtrusionPatternProgram::LayoutUniformValues FillExtrusionPatternProgram::la
|
||||
uniforms::pixel_coord_lower::Value(
|
||||
std::array<float, 2>{{static_cast<float>(pixelX & 0xFFFF), static_cast<float>(pixelY & 0xFFFF)}}),
|
||||
uniforms::height_factor::Value(heightFactor),
|
||||
uniforms::lightcolor::Value(lightColor(light)),
|
||||
uniforms::lightpos::Value(lightPosition(light, state)),
|
||||
uniforms::lightintensity::Value(lightIntensity(light)),
|
||||
uniforms::lightcolor::Value(FillExtrusionProgram::lightColor(light)),
|
||||
uniforms::lightpos::Value(FillExtrusionProgram::lightPosition(light, state)),
|
||||
uniforms::lightintensity::Value(FillExtrusionProgram::lightIntensity(light)),
|
||||
uniforms::vertical_gradient::Value(verticalGradient)};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user