Skip to content

Commit 3c490d8

Browse files
committed
fix bob plugin for Defold 1.9.3
1 parent 21895cd commit 3c490d8

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed
Binary file not shown.

texturepacker/pluginsrc/com/defold/bob/pipeline/tp/AtlasBuilder.java

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// License MIT
2-
// Copyright 2023 Defold Foundation (www.defold.com
2+
// Copyright 2023 Defold Foundation (www.defold.com)
33

44
package com.dynamo.bob.pipeline.tp;
55

@@ -14,7 +14,7 @@
1414
import com.dynamo.bob.pipeline.BuilderUtil;
1515
import com.dynamo.bob.pipeline.ProtoUtil;
1616

17-
import com.dynamo.bob.Builder;
17+
import com.dynamo.bob.ProtoBuilder;
1818
import com.dynamo.bob.BuilderParams;
1919
import com.dynamo.bob.CompileExceptionError;
2020
import com.dynamo.bob.ProtoParams;
@@ -30,6 +30,7 @@
3030
// Formats
3131

3232
// BOB
33+
import com.dynamo.gamesys.proto.AtlasProto;
3334
import com.dynamo.graphics.proto.Graphics.TextureImage;
3435
import com.dynamo.graphics.proto.Graphics.TextureProfile;
3536
import com.dynamo.gamesys.proto.TextureSetProto.TextureSet; // Final engine format
@@ -45,28 +46,19 @@
4546

4647
@ProtoParams(srcClass = AtlasDesc.class, messageClass = AtlasDesc.class)
4748
@BuilderParams(name="TexturePackerAtlas", inExts=".tpatlas", outExt = ".a.texturesetc")
48-
public class AtlasBuilder extends Builder<Void> {
49+
public class AtlasBuilder extends ProtoBuilder<AtlasDesc.Builder> {
4950

5051
static final String TEMPLATE_PATH = "texturepacker/editor/resources/templates/template.tpatlas";
5152

5253
@Override
53-
public Task<Void> create(IResource input) throws IOException, CompileExceptionError {
54-
55-
// Since these template files currently get compiled by bob
56-
if (input.getPath().equals(TEMPLATE_PATH))
57-
{
58-
Task.TaskBuilder<Void> taskBuilder = Task.<Void>newBuilder(this);
59-
return taskBuilder.build();
60-
}
61-
62-
Task.TaskBuilder<Void> taskBuilder = Task.<Void>newBuilder(this)
54+
public Task create(IResource input) throws IOException, CompileExceptionError {
55+
Task.TaskBuilder taskBuilder = Task.newBuilder(this)
6356
.setName(params.name())
6457
.addInput(input)
6558
.addOutput(input.changeExt(params.outExt()))
6659
.addOutput(input.changeExt(".texturec"));
6760

68-
AtlasDesc.Builder builder = AtlasDesc.newBuilder();
69-
ProtoUtil.merge(input, builder);
61+
AtlasDesc.Builder builder = getSrcBuilder(input);
7062

7163
BuilderUtil.checkResource(this.project, input, "file", builder.getFile());
7264

@@ -338,13 +330,9 @@ static public void renameAnimations(AtlasDesc.Builder builder, String renamePatt
338330
}
339331

340332
@Override
341-
public void build(Task<Void> task) throws CompileExceptionError, IOException {
333+
public void build(Task task) throws CompileExceptionError, IOException {
342334

343-
AtlasDesc.Builder builder = AtlasDesc.newBuilder();
344-
ProtoUtil.merge(task.input(0), builder);
345-
if (task.input(0).getPath().equals(TEMPLATE_PATH)) {
346-
return;
347-
}
335+
AtlasDesc.Builder builder = getSrcBuilder(task.firstInput());
348336

349337
Info.Atlas infoAtlas = Loader.load(task.input(1).getContent());
350338

0 commit comments

Comments
 (0)