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.

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

TileSet/TileMap: Decompose solid non-convex polygons into convexes. #26614

Merged
merged 1 commit into from Mar 5, 2019

Conversation

Projects
None yet
3 participants
@MarianoGnu
Copy link
Contributor

MarianoGnu commented Mar 4, 2019

@MarianoGnu MarianoGnu requested a review from reduz as a code owner Mar 4, 2019

@akien-mga akien-mga added this to the 3.1 milestone Mar 4, 2019

@akien-mga akien-mga referenced this pull request Mar 4, 2019

Closed

TileSet/TileMap fixes #26557

@MarianoGnu MarianoGnu force-pushed the MarianoGnu:tileset_editor branch from 03cb19e to dea0602 Mar 4, 2019

@akien-mga

This comment has been minimized.

Copy link
Member

akien-mga commented Mar 4, 2019

scene/2d/tile_map.cpp: In member function 'void TileMap::update_dirty_quadrants()':
scene/2d/tile_map.cpp:485:17: error: declaration of 'i' shadows a previous local [-Werror=shadow=local]
        for (int i = 0; i < _shapes.size(); i++) {
                 ^
scene/2d/tile_map.cpp:311:12: note: shadowed declaration is here
   for (int i = 0; i < q.cells.size(); i++) {
            ^

if (shape->has_meta("decomposed")) {
Array _shapes = shape->get_meta("decomposed");
for (int i = 0; i < _shapes.size(); i++) {

This comment has been minimized.

Copy link
@akien-mga

akien-mga Mar 5, 2019

Member

Use k here, we're already in a double for i and for j loop.

This comment has been minimized.

Copy link
@MarianoGnu

MarianoGnu Mar 5, 2019

Author Contributor

whatever makes travis happy

@MarianoGnu MarianoGnu force-pushed the MarianoGnu:tileset_editor branch from dea0602 to 078b869 Mar 5, 2019

@hpvb hpvb merged commit 8061870 into godotengine:master Mar 5, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.