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

Potential Fix for Folders Not Working #25

Closed
wants to merge 1 commit into from
Closed

Potential Fix for Folders Not Working #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 29 additions & 7 deletions export_to_godot_tilemap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ class GodotTilemapExporter {
/**
* Creates the Tilemap nodes. One Tilemap per one layer from Tiled.
*/
setTileMapsString() {
setTileMapsString(target = this.map) {
// noinspection JSUnresolvedVariable
for (let i = 0; i < this.map.layerCount; ++i) {
for (let i = 0; i < target.layerCount; ++i) {

// noinspection JSUnresolvedFunction
let layer = this.map.layerAt(i);
let layer = target.layerAt(i);

// noinspection JSUnresolvedVariable
if (layer.isTileLayer) {
Expand All @@ -100,9 +100,18 @@ class GodotTilemapExporter {
if (!ld.isEmpty) {
const tileMapName = idx === 0 ? layer.name || "TileMap " + i : ld.tileset.name || "TileMap " + i + "_" + idx;
this.mapLayerToTileset(layer.name, ld.tilesetID);
this.tileMapsString += this.getTileMapTemplate(tileMapName, ld.tilesetID, ld.poolIntArrayString, layer, ld.parent);
this.tileMapsString += this.getTileMapTemplate(tileMapName, ld.tilesetID, ld.poolIntArrayString, layer, this.getLayerParentage(layer));
}
}
} else if (layer.isGroupLayer) {
this.tileMapsString += stringifyNode({
name: layer.name,
type: "Node2D",
parent: this.getLayerParentage(layer),
groups: splitCommaSeparated(layer.property("groups"))
});

this.setTileMapsString(layer);
} else if (layer.isObjectLayer) {
// create layer
this.tileMapsString += stringifyNode({
Expand Down Expand Up @@ -156,7 +165,7 @@ class GodotTilemapExporter {
this.tileMapsString += stringifyNode({
name: object.name,
type: "Area2D",
parent: layer.name,
parent: this.getLayerParentage(layer),
groups: groups
}, {
collision_layer: object.property("collision_layer"),
Expand All @@ -169,7 +178,7 @@ class GodotTilemapExporter {
this.tileMapsString += stringifyNode({
name: "CollisionShape2D",
type: "CollisionShape2D",
parent: `${layer.name}/${object.name}`
parent: `${this.getLayerParentage(layer)}/${object.name}`
}, {
shape: `SubResource( ${shapeId} )`,
position: `Vector2( ${objectPositionX}, ${objectPositionY} )`,
Expand All @@ -178,7 +187,7 @@ class GodotTilemapExporter {
this.tileMapsString += stringifyNode({
name: object.name,
type: "Node2D",
parent: layer.name,
parent: this.getLayerParentage(layer),
groups: groups
}, {
position: `Vector2( ${object.x}, ${object.y} )`
Expand Down Expand Up @@ -469,6 +478,19 @@ ${this.tileMapsString}
mapLayerToTileset(layerName, tilesetID) {
this.layersToTilesetIndex[layerName] = tilesetID;
}

getLayerParentage(layer, parentage) {
if (layer.parentLayer) {
parentage = !parentage ? layer.parentLayer.name : (layer.parentLayer.name + "/" + parentage);
if (layer.parentLayer.parentLayer)
return this.getLayerParentage(layer.parentLayer, parentage);
}

if (!parentage)
parentage = "."

return parentage;
}
}

const customTileMapFormat = {
Expand Down