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

Changed Textures to be assigned by waypoint texture ID #319

Merged
merged 11 commits into from
Aug 22, 2024

Conversation

klingbolt
Copy link
Contributor

Also move textures into the user data directory and assign new ID. XML converter will handle only saving the images that are used by the icons and trails so single deletion is not necessary at this time.

Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Copy link
Owner

@AsherGlick AsherGlick left a comment

Choose a reason for hiding this comment

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

Overall your PRs seem to be improving the last couple weeks. Though this one should have been 2 PRs. One of those PRs, reading the texture path from the waypoint data, only needed some very minor changes. The other one, needs some more design work and user workflow consideration before merging.

Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
FileHandler.gd Outdated Show resolved Hide resolved
FileHandler.gd Outdated Show resolved Hide resolved
FileHandler.gd Outdated Show resolved Hide resolved
FileHandler.gd Outdated Show resolved Hide resolved
…arching for existing files. Addressed code review
@klingbolt klingbolt requested a review from AsherGlick July 3, 2024 04:09
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
Spatial.gd Outdated Show resolved Hide resolved
FileHandler.gd Outdated
dir.list_dir_end()
return current_relative_path
file_name = dir.get_next()
return ""
Copy link
Owner

Choose a reason for hiding this comment

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

return null from this function when a file is not found instead of an empty string.

FileHandler.gd Outdated
Comment on lines 45 to 46
# These are all supported file types in Godot that are not supported
# by other marker programs. "jpg", "jpeg", "bmp", "tga"
Copy link
Owner

Choose a reason for hiding this comment

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

We don't need this comment explaining what formats godot supports.

FileHandler.gd Outdated

static func find_file_duplicate(directory_path: String, target_name: String, target_content: PoolByteArray, relative_path: String):
var dir = Directory.new()
if dir.open(directory_path) == OK:
Copy link
Owner

Choose a reason for hiding this comment

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

As discussed offline, switch this logic so you can unindent the code below.

@AsherGlick AsherGlick merged commit cf51fdb into AsherGlick:xml_converter Aug 22, 2024
6 checks passed
@klingbolt klingbolt deleted the texture_id_search branch August 22, 2024 03:46
@klingbolt klingbolt restored the texture_id_search branch September 11, 2024 04:40
@klingbolt klingbolt deleted the texture_id_search branch September 11, 2024 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants