Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scale-in option for vector layer polygons #585

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Add scale-in option for vector layer polygons #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0725022
Add fade-in option for vector layer polygons
maurhofer-ubique Jan 25, 2024
52b50c3
Add click invocation for vector layers, add coord to screen position …
maurhofer-ubique Jan 29, 2024
dad152a
adds iOS fade in pattern
zimmermannubique Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions android/src/main/cpp/graphics/objects/PolygonPatternGroup2dOpenGl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ void PolygonPatternGroup2dOpenGl::render(const std::shared_ptr<::RenderingContex
auto scalingFactorHandle = glGetUniformLocation(program, "uScalingFactor");
glUniform2f(scalingFactorHandle, scalingFactor.x, scalingFactor.y);

auto screenPixelAsRealMeterFactorHandle = glGetUniformLocation(program, "uScreenPixelAsRealMeterFactor");
if (screenPixelAsRealMeterFactorHandle >= 0) {
glUniform1f(screenPixelAsRealMeterFactorHandle, screenPixelAsRealMeterFactor);
}

int textureCoordinatesHandle = glGetUniformLocation(program, "textureCoordinates");
glUniform1fv(textureCoordinatesHandle, sizeTextureCoordinatesValuesArray, &textureCoordinates[0]);
int opacitiesHandle = glGetUniformLocation(program, "opacities");
Expand Down
110 changes: 96 additions & 14 deletions android/src/main/cpp/graphics/shader/PolygonPatternGroup2dShaderOpenGl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
#include "OpenGlContext.h"
#include "OpenGlHelper.h"

const std::string PolygonPatternGroup2dShaderOpenGl::programName = "UBMAP_PolygonPatternGroup2dShaderOpenGl";
#include <algorithm>
#include <string>
#include <iostream>

PolygonPatternGroup2dShaderOpenGl::PolygonPatternGroup2dShaderOpenGl(bool fadeInPattern)
: fadeInPattern(fadeInPattern),
programName(std::string("UBMAP_PolygonPatternGroup2dShaderOpenGl_") + (fadeInPattern ? "std" : "fade")) {}

std::string PolygonPatternGroup2dShaderOpenGl::getProgramName() { return programName; }

Expand Down Expand Up @@ -45,14 +51,22 @@ std::string PolygonPatternGroup2dShaderOpenGl::getVertexShader() {

uniform mat4 uMVPMatrix;
uniform vec2 uScalingFactor;
) + (fadeInPattern ? OMMShaderCode(uniform float uScreenPixelAsRealMeterFactor;) : "")
+ OMMShaderCode(

out vec2 pixelPosition;
out flat uint styleIndex;

void main() {
pixelPosition = vPosition.xy * vec2(1.0 / uScalingFactor.x, 1.0 / uScalingFactor.y);
styleIndex = uint(floor(vStyleIndex + 0.5));
gl_Position = uMVPMatrix * vec4(vPosition, 0.0, 1.0);
) + (fadeInPattern ? OMMShaderCode(
// fadeInPattern
pixelPosition = vPosition.xy / vec2(uScreenPixelAsRealMeterFactor);
) : OMMShaderCode(
// DefaultBehavior
pixelPosition = vPosition.xy / uScalingFactor;
)) + OMMShaderCode(
styleIndex = uint(floor(vStyleIndex + 0.5));
gl_Position = uMVPMatrix * vec4(vPosition, 0.0, 1.0);
}
);
}
Expand All @@ -65,6 +79,10 @@ std::string PolygonPatternGroup2dShaderOpenGl::getFragmentShader() {
uniform vec2 uTextureFactor;
uniform float textureCoordinates[5 * 16];
uniform float opacities[16];
) + (fadeInPattern ? OMMShaderCode(
uniform float uScreenPixelAsRealMeterFactor;
uniform vec2 uScalingFactor;) : "")
+ OMMShaderCode(

in vec2 pixelPosition;
in flat uint styleIndex;
Expand All @@ -78,21 +96,85 @@ std::string PolygonPatternGroup2dShaderOpenGl::getFragmentShader() {
}

int styleOffset = min(int(styleIndex) * 5, 16 * 5);
vec2 uvSize = vec2(textureCoordinates[styleOffset + 2], textureCoordinates[styleOffset + 3]) * uTextureFactor;
vec2 uvSize =
vec2(textureCoordinates[styleOffset + 2], textureCoordinates[styleOffset + 3]) *
uTextureFactor;
if (uvSize.x == 0.0 && uvSize.y == 0.0) {
discard;
}
vec2 uvOrig = vec2(textureCoordinates[styleOffset], textureCoordinates[styleOffset + 1]) * uTextureFactor;
vec2 uvOrig = vec2(textureCoordinates[styleOffset], textureCoordinates[styleOffset + 1]) *
uTextureFactor;
float combined = textureCoordinates[styleOffset + 4];
vec2 pixelSize = vec2(mod(combined, 65536.0), combined / 65536.0);
) + (fadeInPattern ? OMMShaderCode(
// fadeInPattern
vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
float scalingFactorFactor = (uScalingFactor.x / uScreenPixelAsRealMeterFactor) - 1.0;
vec2 spacing = pixelSize * scalingFactorFactor;
vec2 totalSize = pixelSize + spacing;
vec2 adjustedPixelPosition = pixelPosition + pixelSize * 0.5;
vec2 uvTot = mod(adjustedPixelPosition, totalSize);

int yIndex = int(mod(adjustedPixelPosition.y / totalSize.y, 2.0));

if (yIndex != 0 && uvTot.y <= pixelSize.y) {
uvTot.x = mod(adjustedPixelPosition.x + totalSize.x * 0.5, totalSize.x);
}

vec2 uv = mod(vec2(mod(pixelPosition.x, pixelSize.x), mod(pixelPosition.y, pixelSize.y)) / pixelSize + vec2(1.0, 1.0), vec2(1.0, 1.0));
vec2 texUv = uvOrig + uvSize * uv;
vec4 color = texture(uTextureSampler, texUv);

float a = color.a * opacity;
fragmentColor = vec4(color.rgb * a, a);
if (uvTot.x > pixelSize.x || uvTot.y > pixelSize.y) {
if (uvTot.x > pixelSize.x && uvTot.y < pixelSize.y) {
// top right
vec2 spacingTexSize = vec2(spacing.x, spacing.x);
float relative = uvTot.y - (pixelSize.y - spacing.x) / 2.0;
if (relative > 0.0 && relative < spacing.x) {
float xPos = uvTot.x - pixelSize.x;
vec2 uv = mod(vec2(xPos, relative) / spacingTexSize + vec2(1.0, 1.0),
vec2(1.0, 1.0));

vec2 texUv = uvOrig + uvSize * vec2(uv.x, uv.y);
vec4 texColor = texture(uTextureSampler, texUv);
resultColor = texColor;
}
} else {
uvTot.x = mod(adjustedPixelPosition.x + spacing.x * 0.5, totalSize.x);
if (uvTot.x > pixelSize.x && uvTot.y > pixelSize.y) {
// bottom right
vec2 uv = mod((uvTot - pixelSize) / spacing + vec2(1.0, 1.0), vec2(1.0, 1.0));

vec2 texUv = uvOrig + uvSize * vec2(uv.x, uv.y);
vec4 texColor = texture(uTextureSampler, texUv);
resultColor = texColor;
} else {
// bottom left
vec2 spacingTexSize = vec2(spacing.y, spacing.y);
float relativeX = uvTot.x - (pixelSize.x - spacing.x) / 2.0;

if (relativeX > 0.0 && relativeX < spacing.y) {
vec2 uv = mod(vec2(relativeX, uvTot.y - pixelSize.y) / spacingTexSize +
vec2(1.0, 1.0), vec2(1.0, 1.0));
vec2 texUv = uvOrig + uvSize * vec2(uv.x, uv.y);
vec4 texColor = texture(uTextureSampler, texUv);
resultColor = texColor;
}
}
}
} else {
vec2 uv = mod(uvTot / pixelSize + vec2(1.0, 1.0), vec2(1.0, 1.0));
vec2 texUv = uvOrig + uvSize * vec2(uv.x, uv.y);
vec4 texColor = texture(uTextureSampler, texUv);
resultColor = texColor;
}
fragmentColor = resultColor;
}
) : OMMShaderCode(
// Default pattern behavior
vec2 uv = mod(vec2(mod(pixelPosition.x, pixelSize.x), mod(pixelPosition.y, pixelSize.y)) / pixelSize + vec2(1.0, 1.0), vec2(1.0, 1.0));
vec2 texUv = uvOrig + uvSize * uv;
vec4 color = texture(uTextureSampler, texUv);

float a = color.a * opacity;
fragmentColor = vec4(color.rgb * a, a);
}
);
));
}
std::shared_ptr<ShaderProgramInterface> PolygonPatternGroup2dShaderOpenGl::asShaderProgramInterface() { return shared_from_this(); }
std::shared_ptr<ShaderProgramInterface> PolygonPatternGroup2dShaderOpenGl::asShaderProgramInterface() { return shared_from_this(); }
5 changes: 4 additions & 1 deletion android/src/main/cpp/graphics/shader/PolygonPatternGroup2dShaderOpenGl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class PolygonPatternGroup2dShaderOpenGl : public BaseShaderProgramOpenGl,
public std::enable_shared_from_this<ShaderProgramInterface> {

public:
PolygonPatternGroup2dShaderOpenGl(bool fadeInPattern);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Constructor PolygonPatternGroup2dShaderOpenGl(bool fadeInPattern) introduces a boolean parameter to control fading in patterns. Ensure all shader instances are correctly initialized with this new parameter.


virtual std::string getProgramName() override;

virtual void setupProgram(const std::shared_ptr<::RenderingContextInterface> &context) override;
Expand All @@ -30,7 +32,8 @@ class PolygonPatternGroup2dShaderOpenGl : public BaseShaderProgramOpenGl,
virtual std::shared_ptr<ShaderProgramInterface> asShaderProgramInterface() override;

protected:
const static std::string programName;
const bool fadeInPattern;
const std::string programName;
Comment on lines +35 to +36
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Member variable const bool fadeInPattern correctly stores the fading pattern state. However, const std::string programName should be initialized in the constructor or have a default value to ensure it's always in a valid state.


virtual std::string getFragmentShader() override;

Expand Down
4 changes: 2 additions & 2 deletions android/src/main/cpp/graphics/shader/ShaderFactoryOpenGl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ std::shared_ptr<PolygonGroupShaderInterface> ShaderFactoryOpenGl::createPolygonG
return std::make_shared<ColorPolygonGroup2dShaderOpenGl>();
}

std::shared_ptr<PolygonPatternGroupShaderInterface> ShaderFactoryOpenGl::createPolygonPatternGroupShader() {
return std::make_shared<PolygonPatternGroup2dShaderOpenGl>();
std::shared_ptr<PolygonPatternGroupShaderInterface> ShaderFactoryOpenGl::createPolygonPatternGroupShader(bool fadeInPattern) {
return std::make_shared<PolygonPatternGroup2dShaderOpenGl>(fadeInPattern);
}

std::shared_ptr<TextShaderInterface> ShaderFactoryOpenGl::createTextShader() {
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/cpp/graphics/shader/ShaderFactoryOpenGl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ShaderFactoryOpenGl : public ShaderFactoryInterface {

std::shared_ptr<PolygonGroupShaderInterface> createPolygonGroupShader() override;

std::shared_ptr<PolygonPatternGroupShaderInterface> createPolygonPatternGroupShader() override;
std::shared_ptr<PolygonPatternGroupShaderInterface> createPolygonPatternGroupShader(bool fadeInPattern) override;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Method signature update to include bool fadeInPattern in createPolygonPatternGroupShader is correct. Ensure downstream usage of this method correctly passes the new parameter.


std::shared_ptr<TextShaderInterface> createTextShader() override;

Expand Down
1 change: 1 addition & 0 deletions android/src/main/java/io/openmobilemaps/mapscore/graphics/GLThread.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ class GLThread constructor(
width = w
height = h
sizeChanged = true
requestRender()
}

}
8 changes: 4 additions & 4 deletions .../android/java/io/openmobilemaps/mapscore/shared/graphics/shader/ShaderFactoryInterface.kt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions bridging/android/java/io/openmobilemaps/mapscore/shared/map/MapCamera2dInterface.kt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .../openmobilemaps/mapscore/shared/map/layers/tiled/vector/Tiled2dMapVectorLayerInterface.kt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions bridging/android/jni/graphics/shader/NativeShaderFactoryInterface.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading