-
-
Notifications
You must be signed in to change notification settings - Fork 21.5k
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
Implement scenes tiles in TileMaps #48812
Conversation
de2c7e4
to
50a307b
Compare
editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
Outdated
Show resolved
Hide resolved
50a307b
to
9c57e4f
Compare
|
9c57e4f
to
c1c78f6
Compare
I don't think I can do anything about it. TileSet is a resource, so it can't be strictly associated to the scene it is in. So well... as soon as it does not crashes I believe this is fine, as the engine does not checks for cyclical dependencies in general.
It happens when trying to paint a scene with an invalid scene. It should be fixed now.
Fixed.
Fixed too, I screwed things up when rebasing... ^^ |
I have no clue why the Android build fails and how to solve it. That's annoying... :/ |
c1c78f6
to
3bf8a6a
Compare
We found that this flag causes this error on PR godotengine#48812 which does not add any fancy inline assembly: ``` /tmp/tile_set-ce236a.s: Assembler messages: /tmp/tile_set-ce236a.s:34676: Error: selected processor does not support `bfc x0,godotengine#32,godotengine#32' clang++: error: assembler command failed with exit code 1 (use -v to see invocation) ``` That flag is mentioned in various errors related to assembler failures on arm64v8 with Clang from the Android NDK. It was added in Godot in godotengine#6958 when migrating from GCC to Clang, and is indeed referenced in the NDK's Clang migration guide: https://android.googlesource.com/platform/ndk/+/master/docs/ClangMigration.md > Especially for ARM and ARM64, Clang is much stricter about assembler rules > than GCC/GAS. Use `-fno-integrated-as` if Clang reports errors in inline > assembly or assembly files that you don't wish to modernize. We don't get those errors nowadays so it seems the flag is no longer needed.
3bf8a6a
to
95c04e8
Compare
We found that this flag causes this error on PR #48812 which does not add any fancy inline assembly: ``` /tmp/tile_set-ce236a.s: Assembler messages: /tmp/tile_set-ce236a.s:34676: Error: selected processor does not support `bfc x0,#32,#32' clang++: error: assembler command failed with exit code 1 (use -v to see invocation) ``` That flag is mentioned in various errors related to assembler failures on arm64v8 with Clang from the Android NDK. It was added in Godot in #6958 when migrating from GCC to Clang, and is indeed referenced in the NDK's Clang migration guide: https://android.googlesource.com/platform/ndk/+/master/docs/ClangMigration.md > Especially for ARM and ARM64, Clang is much stricter about assembler rules > than GCC/GAS. Use `-fno-integrated-as` if Clang reports errors in inline > assembly or assembly files that you don't wish to modernize. We don't get those errors nowadays so it seems the flag is no longer needed. (cherry picked from commit 23f7c75)
We found that this flag causes this error on PR #48812 which does not add any fancy inline assembly: ``` /tmp/tile_set-ce236a.s: Assembler messages: /tmp/tile_set-ce236a.s:34676: Error: selected processor does not support `bfc x0,#32,#32' clang++: error: assembler command failed with exit code 1 (use -v to see invocation) ``` That flag is mentioned in various errors related to assembler failures on arm64v8 with Clang from the Android NDK. It was added in Godot in #6958 when migrating from GCC to Clang, and is indeed referenced in the NDK's Clang migration guide: https://android.googlesource.com/platform/ndk/+/master/docs/ClangMigration.md > Especially for ARM and ARM64, Clang is much stricter about assembler rules > than GCC/GAS. Use `-fno-integrated-as` if Clang reports errors in inline > assembly or assembly files that you don't wish to modernize. We don't get those errors nowadays so it seems the flag is no longer needed. (cherry picked from commit 23f7c75)
95c04e8
to
d8bb53c
Compare
Oh oh, that was a tricky one. My _draw_line function took one Vector2i and one Vector2 as arguments, while they should have been both Vector2. This caused very small differences between the two computed ends of a line, even if, in that case, the end and the beginning of the line should were supposed to have the same value. Anyway, that's fixed now, thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't test, but since @KoBeWi did and code seems fine, should be good to go.
Thanks! |
Implements a TileSetScenesCollectionSource for TileSets. Each tile in this TileSet source has a scene that will be instantiated as an internal child of the TileMap node.
I also implemented a "display placeholder" property that allow displaying a placeholder at the position of the tile in case a scene is not visible.
Also, I moved
TileSetAtlasSource::INVALID_*
toTileSetSource::INVALID_*