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

Allow float values for dash parameter #1249

Merged
merged 3 commits into from
Jan 27, 2017
Merged

Allow float values for dash parameter #1249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94e707a
Allow float values for dash parameter
tallytalwar Jan 25, 2017
d827f78
Add missing CR to shader defines
karimnaaji Jan 27, 2017
0164008
Set define value to float
karimnaaji Jan 27, 2017
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
2 changes: 1 addition & 1 deletion core/shaders/polyline.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void main(void) {
#endif

#ifdef TANGRAM_LINE_TEXTURE
vec2 line_st = vec2(v_texcoord.x, fract(v_texcoord.y / u_texture_ratio));
vec2 line_st = vec2(v_texcoord.x, fract(v_texcoord.y * TANGRAM_DASHLINE_TEX_SCALE / u_texture_ratio));
vec4 line_color = texture2D(u_texture, line_st);

if (line_color.a < TANGRAM_ALPHA_TEST) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/scene/sceneLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,9 @@ void SceneLoader::loadStyleProps(Style& style, Node styleNode, const std::shared
if (Node dashNode = styleNode["dash"]) {
if (auto polylineStyle = dynamic_cast<PolylineStyle*>(&style)) {
if (dashNode.IsSequence()) {
std::vector<int> dashValues;
std::vector<float> dashValues;
for (auto dashValue : dashNode) {
dashValues.push_back(dashValue.as<int>());
dashValues.push_back(dashValue.as<float>());
}
polylineStyle->setDashArray(dashValues);
polylineStyle->setTexCoordsGeneration(true);
Expand Down
11 changes: 10 additions & 1 deletion core/src/style/polylineStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ constexpr float extrusion_scale = 4096.0f;
constexpr float position_scale = 8192.0f;
constexpr float texture_scale = 8192.0f;
constexpr float order_scale = 2.0f;
constexpr float dash_scale = 20.f;

namespace Tangram {

Expand Down Expand Up @@ -112,7 +113,8 @@ void PolylineStyle::constructShaderProgram() {

if (m_dashArray.size() > 0) {
TextureOptions options {GL_RGBA, GL_RGBA, {GL_NEAREST, GL_NEAREST}, {GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE}};
auto pixels = DashArray::render(m_dashArray);
// provides precision for dash patterns that are a fraction of line width
auto pixels = DashArray::render(m_dashArray, dash_scale);

m_texture = std::make_shared<Texture>(1, pixels.size(), options);
m_texture->setData(pixels.data(), pixels.size());
Expand All @@ -128,6 +130,13 @@ void PolylineStyle::constructShaderProgram() {
if (m_dashArray.size() > 0 || m_texture) {
m_shaderProgram->addSourceBlock("defines", "#define TANGRAM_LINE_TEXTURE\n", false);
m_shaderProgram->addSourceBlock("defines", "#define TANGRAM_ALPHA_TEST 0.25\n", false);
if (m_dashArray.size() > 0) {
m_shaderProgram->addSourceBlock("defines", "#define TANGRAM_DASHLINE_TEX_SCALE " +
std::to_string(dash_scale) + "\n", false);
} else {
m_shaderProgram->addSourceBlock("defines", "#define TANGRAM_DASHLINE_TEX_SCALE 1",
Copy link
Member

Choose a reason for hiding this comment

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

Have you tested this case? The way this is used in the shader I think this could cause a float-int mismatch error.

Copy link
Member

Choose a reason for hiding this comment

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

^ Not outdated, despite what github says

Copy link
Member

Choose a reason for hiding this comment

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

Fixed!

Copy link
Member Author

Choose a reason for hiding this comment

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

I had not!. Good one. Thanks @karimnaaji .

false);
}
}

m_shaderProgram->setSourceStrings(SHADER_SOURCE(polyline_fs),
Expand Down
4 changes: 2 additions & 2 deletions core/src/style/polylineStyle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ class PolylineStyle : public Style {
virtual void onBeginDrawFrame(RenderState& rs, const View& _view, Scene& _scene) override;
virtual ~PolylineStyle() {}

void setDashArray(std::vector<int> _dashArray) { m_dashArray = _dashArray; }
void setDashArray(std::vector<float> _dashArray) { m_dashArray = _dashArray; }
void setTexture(std::shared_ptr<Texture>& _texture) { m_texture = _texture; }

void setDashBackgroundColor(const glm::vec4 _dashBackgroundColor);

private:

std::vector<int> m_dashArray;
std::vector<float> m_dashArray;
std::shared_ptr<Texture> m_texture;
bool m_dashBackground = false;
glm::vec4 m_dashBackgroundColor;
Expand Down
6 changes: 4 additions & 2 deletions core/src/util/dashArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include <cmath>
#include "dashArray.h"

namespace Tangram {

std::vector<unsigned int> DashArray::render(std::vector<int> _pattern,
std::vector<unsigned int> DashArray::render(std::vector<float> _pattern, float _dashScale,
unsigned int _dashColor, unsigned int _backgroundColor)
{
std::vector<unsigned int> dashArray;
Expand All @@ -11,7 +12,8 @@ std::vector<unsigned int> DashArray::render(std::vector<int> _pattern,
}

bool dash = true;
for (int segment : _pattern) {
for (auto& pat : _pattern) {
int segment = std::floor(pat * _dashScale);
for (int i = 0; i < segment; ++i) {
dashArray.push_back(dash ? _dashColor : _backgroundColor);
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/util/dashArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Tangram {

struct DashArray {
static std::vector<unsigned int> render(std::vector<int> _pattern,
static std::vector<unsigned int> render(std::vector<float> _pattern, float _dashScale,
unsigned int _dashColor = 0xffffffff,
unsigned int _backgroundColor = 0x00000000);
};
Expand Down