Skip to content

[ldtk] Set the def field in LdtkFieldInstance #122

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

Merged
jeremyfa merged 1 commit into from
Sep 9, 2023
Merged

[ldtk] Set the def field in LdtkFieldInstance #122

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
32 changes: 30 additions & 2 deletions plugins/ldtk/runtime/src/ceramic/LdtkData.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,11 @@ class LdtkEntityDefinition {
*/
public var tags:Array<String>;

/**
* An array of field definitions that belong to this entity definition
*/
public var fieldDefs:Array<LdtkFieldDefinition>;

public function new(?defs:LdtkDefinitions, ?json:DynamicAccess<Dynamic>) {

this.defs = defs;
Expand All @@ -961,6 +966,10 @@ class LdtkEntityDefinition {
tileset = defs.ldtkData.findTilesetDef(Std.int(json.get('tilesetId')));
uid = Std.int(json.get('uid'));
tags = LdtkDataHelpers.toStringArray(json.get('tags'));
var fieldDefsJson:Array<Dynamic> = json.get('fieldDefs');
fieldDefs = fieldDefsJson != null ? [for (i in 0...fieldDefsJson.length) {
new LdtkFieldDefinition(defs, fieldDefsJson[i]);
}] : [];
}

}
Expand Down Expand Up @@ -1014,6 +1023,21 @@ class LdtkEntityDefinition {

}

public function fieldDef(identifier:String):LdtkFieldDefinition {

if (this.fieldDefs != null) {
for (i in 0...this.fieldDefs.length) {
var fieldDef = this.fieldDefs[i];
if (fieldDef.identifier == identifier) {
return fieldDef;
}
}
}

return null;

}

}

/**
Expand Down Expand Up @@ -2792,7 +2816,9 @@ class LdtkFieldInstance {
*/
public var tile:LdtkTilesetRectangle;

public function new(?ldtkData:LdtkData, ?ldtkWorld:LdtkWorld, ?json:DynamicAccess<Dynamic>) {
public function new(?ldtkData:LdtkData, ?ldtkWorld:LdtkWorld, ?json:DynamicAccess<Dynamic>, ?def:LdtkFieldDefinition) {

this.def = def;

if (json != null) {
var defUid:Int = Std.int(json.get('defUid'));
Expand Down Expand Up @@ -3199,7 +3225,9 @@ class LdtkEntityInstance {

var fieldInstancesJson:Array<Dynamic> = json.get('fieldInstances');
fieldInstances = fieldInstancesJson != null ? [for (i in 0...fieldInstancesJson.length) {
new LdtkFieldInstance(ldtkData, ldtkWorld, fieldInstancesJson[i]);
var fieldInstanceJson:haxe.DynamicAccess<Dynamic> = fieldInstancesJson[i];
var identifier = fieldInstanceJson.get('__identifier');
new LdtkFieldInstance(ldtkData, ldtkWorld, fieldInstanceJson, def.fieldDef(identifier));
}] : [];
}

Expand Down