Skip to content

Commit d182c8c

Browse files
bladecoderbladecoder
committed
Refactor: FrameAnimation -> AnimationDesc, SpriteRenderer ->
ActorRenderer
1 parent 970ae01 commit d182c8c

26 files changed

+469
-470
lines changed

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/model/ChapterDocument.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.badlogic.gdx.math.Polygon;
2828
import com.badlogic.gdx.math.Vector2;
2929
import com.bladecoder.engine.actions.Param;
30-
import com.bladecoder.engine.anim.AtlasFrameAnimation;
31-
import com.bladecoder.engine.anim.FrameAnimation;
30+
import com.bladecoder.engine.anim.AtlasAnimationDesc;
31+
import com.bladecoder.engine.anim.AnimationDesc;
3232
import com.bladecoder.engine.anim.Tween;
3333
import com.bladecoder.engine.model.BaseActor;
3434
import com.bladecoder.engine.model.AtlasRenderer;
@@ -37,7 +37,7 @@
3737
import com.bladecoder.engine.spine.SpineRenderer;
3838
import com.bladecoder.engine.model.Sprite3DRenderer;
3939
import com.bladecoder.engine.model.SpriteActor;
40-
import com.bladecoder.engine.model.SpriteRenderer;
40+
import com.bladecoder.engine.model.ActorRenderer;
4141
import com.bladecoder.engine.model.BaseActor.ActorLayer;
4242
import com.bladecoder.engine.model.SpriteActor.DepthType;
4343
import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
@@ -324,8 +324,8 @@ public String getDesc(Element e) {
324324
return getTranslation(e.getAttribute("desc"));
325325
}
326326

327-
public NodeList getFrameAnimations(Element e) {
328-
return e.getElementsByTagName("frame_animation");
327+
public NodeList getAnimations(Element e) {
328+
return e.getElementsByTagName("animation");
329329
}
330330

331331
public Polygon getBBox(Element e) {
@@ -393,21 +393,21 @@ public BaseActor getEngineActor(Element e) {
393393
a.setDesc(e.getAttribute("desc"));
394394

395395
if (a instanceof SpriteActor) {
396-
SpriteRenderer r = ((SpriteActor) a).getRenderer();
396+
ActorRenderer r = ((SpriteActor) a).getRenderer();
397397

398-
NodeList faList = getFrameAnimations(e);
398+
NodeList faList = getAnimations(e);
399399

400400
for (int i = 0; i < faList.getLength(); i++) {
401401
Element faElement = (Element) faList.item(i);
402402

403-
FrameAnimation fa = getEngineFA(type, faElement);
403+
AnimationDesc fa = getEngineFA(type, faElement);
404404

405-
r.addFrameAnimation(fa);
405+
r.addAnimation(fa);
406406
}
407407

408-
if (!e.getAttribute("init_frame_animation").isEmpty()) {
409-
((SpriteActor) a).getRenderer().setInitFrameAnimation(
410-
e.getAttribute("init_frame_animation"));
408+
if (!e.getAttribute("init_animation").isEmpty()) {
409+
((SpriteActor) a).getRenderer().setInitAnimation(
410+
e.getAttribute("init_animation"));
411411

412412
}
413413

@@ -427,13 +427,13 @@ public BaseActor getEngineActor(Element e) {
427427
return a;
428428
}
429429

430-
public FrameAnimation getEngineFA(String type, Element faElement) {
431-
FrameAnimation fa;
430+
public AnimationDesc getEngineFA(String type, Element faElement) {
431+
AnimationDesc fa;
432432

433433
if(type.equals(ATLAS_ACTOR_TYPE)) {
434-
fa = new AtlasFrameAnimation();
434+
fa = new AtlasAnimationDesc();
435435
} else {
436-
fa = new FrameAnimation();
436+
fa = new AnimationDesc();
437437
}
438438

439439
fa.id = faElement.getAttribute("id");

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public ScnEditor(Skin skin) {
3737

3838
scnWidget = new ScnWidget(skin);
3939

40-
inSceneCb = new CheckBox("In Scene Sprites", skin);
40+
inSceneCb = new CheckBox("In Scene Anims", skin);
4141
inSceneCb.setChecked(false);
4242
animCb = new CheckBox("Animation", skin);
4343
animCb.setChecked(true);

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
import com.badlogic.gdx.scenes.scene2d.ui.Widget;
3737
import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
3838
import com.badlogic.gdx.scenes.scene2d.utils.TiledDrawable;
39-
import com.bladecoder.engine.anim.FrameAnimation;
39+
import com.bladecoder.engine.anim.AnimationDesc;
4040
import com.bladecoder.engine.anim.Tween;
4141
import com.bladecoder.engine.assets.EngineAssetManager;
4242
import com.bladecoder.engine.model.BaseActor;
4343
import com.bladecoder.engine.model.Scene;
4444
import com.bladecoder.engine.model.SpriteActor;
45-
import com.bladecoder.engine.model.SpriteRenderer;
45+
import com.bladecoder.engine.model.ActorRenderer;
4646
import com.bladecoder.engine.util.RectangleRenderer;
4747
import com.bladecoder.engineeditor.Ctx;
4848
import com.bladecoder.engineeditor.model.BaseDocument;
@@ -169,14 +169,14 @@ public void propertyChange(PropertyChangeEvent e) {
169169
scn.removeActor(scn.getActor(id, false));
170170
setSelectedActor(null);
171171
} else if (e.getPropertyName()
172-
.equals("frame_animation")) {
172+
.equals("animation")) {
173173
createAndSelectActor(Ctx.project.getSelectedActor());
174174
setSelectedFA(null);
175175
} else if (e.getPropertyName().equals(
176-
"init_frame_animation")) {
176+
"init_animation")) {
177177
String initFA = (String) e.getNewValue();
178178
((SpriteActor) selectedActor).getRenderer()
179-
.setInitFrameAnimation(initFA);
179+
.setInitAnimation(initFA);
180180
setSelectedFA(null);
181181
} else if (e.getPropertyName().equals("actor")) {
182182
createAndSelectActor((Element) e.getNewValue());
@@ -186,7 +186,7 @@ public void propertyChange(PropertyChangeEvent e) {
186186
.equals("actor"))
187187
removeActor(doc, (Element) e.getNewValue());
188188
else if (((Element) e.getNewValue()).getTagName()
189-
.equals("frame_animation"))
189+
.equals("animation"))
190190
setSelectedFA(null);
191191
}
192192
}
@@ -349,15 +349,15 @@ public void setAnimation(boolean v) {
349349
animation = v;
350350
}
351351

352-
public void setFrameAnimation(FrameAnimation fa) {
352+
public void setAnimation(AnimationDesc fa) {
353353
try {
354-
faRenderer.setFrameAnimation(fa);
354+
faRenderer.setAnimation(fa);
355355
} catch (Exception e) {
356356
Ctx.msg.show(getStage(), "Could not retrieve assets for sprite: "
357357
+ fa.id, 4);
358358
e.printStackTrace();
359359

360-
faRenderer.setFrameAnimation(null);
360+
faRenderer.setAnimation(null);
361361
}
362362
}
363363

@@ -538,42 +538,42 @@ public void setSelectedActor(Element actor) {
538538

539539
selectedActor = a;
540540
faRenderer.setActor(a);
541-
setFrameAnimation(null);
541+
setAnimation(null);
542542
walkZoneWindow.setActor(a);
543543
}
544544

545545
public void setSelectedFA(String selFA) {
546546
if (selectedActor instanceof SpriteActor) {
547-
SpriteRenderer s = ((SpriteActor) selectedActor).getRenderer();
547+
ActorRenderer s = ((SpriteActor) selectedActor).getRenderer();
548548

549-
if (selFA == null || s.getFrameAnimations().get(selFA) == null) {
549+
if (selFA == null || s.getAnimations().get(selFA) == null) {
550550
selFA = ((SpriteActor) selectedActor).getRenderer()
551-
.getInitFrameAnimation();
551+
.getInitAnimation();
552552
}
553553

554-
if (selFA != null && s.getFrameAnimations().get(selFA) != null) {
554+
if (selFA != null && s.getAnimations().get(selFA) != null) {
555555

556-
setFrameAnimation(s.getFrameAnimations().get(selFA));
556+
setAnimation(s.getAnimations().get(selFA));
557557

558558
if (inScene
559-
|| s.getCurrentFrameAnimation() == null
559+
|| s.getCurrentAnimation() == null
560560
|| ((SpriteActor) selectedActor).getRenderer()
561-
.getInitFrameAnimation().equals(selFA)) {
561+
.getInitAnimation().equals(selFA)) {
562562
try {
563563

564-
((SpriteActor) selectedActor).startFrameAnimation(
564+
((SpriteActor) selectedActor).startAnimation(
565565
selFA, Tween.REPEAT, Tween.INFINITY, null);
566566
} catch (Exception e) {
567-
setFrameAnimation(null);
567+
setAnimation(null);
568568
((SpriteActor) selectedActor).getRenderer()
569-
.getFrameAnimations().remove(selFA);
569+
.getAnimations().remove(selFA);
570570
}
571571
}
572572
} else {
573-
setFrameAnimation(null);
573+
setAnimation(null);
574574
}
575575
} else {
576-
setFrameAnimation(null);
576+
setAnimation(null);
577577
}
578578
}
579579

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteDrawer.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import com.badlogic.gdx.graphics.Color;
1919
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
2020
import com.badlogic.gdx.math.Vector2;
21-
import com.bladecoder.engine.anim.FrameAnimation;
21+
import com.bladecoder.engine.anim.AnimationDesc;
2222
import com.bladecoder.engine.anim.Tween;
2323
import com.bladecoder.engine.model.BaseActor;
2424
import com.bladecoder.engine.model.AtlasRenderer;
2525
import com.bladecoder.engine.model.ImageRenderer;
2626
import com.bladecoder.engine.spine.SpineRenderer;
2727
import com.bladecoder.engine.model.Sprite3DRenderer;
2828
import com.bladecoder.engine.model.SpriteActor;
29-
import com.bladecoder.engine.model.SpriteRenderer;
29+
import com.bladecoder.engine.model.ActorRenderer;
3030
import com.bladecoder.engine.util.RectangleRenderer;
3131

3232
/**
@@ -39,8 +39,8 @@ public class SpriteDrawer {
3939
public static final Color BG_COLOR = Color.MAGENTA;
4040
private static final float HEIGHT = 200;
4141

42-
FrameAnimation currentFrameAnimation;
43-
private SpriteRenderer renderer;
42+
AnimationDesc currentAnimation;
43+
private ActorRenderer renderer;
4444
private float viewportW, viewportH;
4545

4646
public void setViewport(float w, float h) {
@@ -55,7 +55,7 @@ public void setActor(BaseActor a) {
5555
}
5656

5757
if (a instanceof SpriteActor) {
58-
SpriteRenderer r = ((SpriteActor) a).getRenderer();
58+
ActorRenderer r = ((SpriteActor) a).getRenderer();
5959

6060
if (r instanceof Sprite3DRenderer) {
6161
renderer = new Sprite3DRenderer();
@@ -71,26 +71,26 @@ public void setActor(BaseActor a) {
7171
}
7272
}
7373

74-
public void setFrameAnimation(FrameAnimation fa) {
75-
currentFrameAnimation = fa;
74+
public void setAnimation(AnimationDesc fa) {
75+
currentAnimation = fa;
7676

7777
if (renderer != null) {
7878

79-
renderer.getFrameAnimations().clear();
79+
renderer.getAnimations().clear();
8080

8181
if (fa != null) {
8282

83-
renderer.addFrameAnimation(fa);
83+
renderer.addAnimation(fa);
8484

8585
renderer.retrieveAssets();
8686

87-
renderer.startFrameAnimation(fa.id, Tween.REPEAT, Tween.INFINITY, null);
87+
renderer.startAnimation(fa.id, Tween.REPEAT, Tween.INFINITY, null);
8888
}
8989
}
9090
}
9191

9292
public void draw(SpriteBatch batch) {
93-
if (renderer != null && currentFrameAnimation != null) {
93+
if (renderer != null && currentAnimation != null) {
9494

9595
float width = HEIGHT / renderer.getHeight() * renderer.getWidth();
9696

@@ -107,7 +107,7 @@ public void draw(SpriteBatch batch) {
107107
}
108108

109109
public void update(float delta) {
110-
if (renderer != null && currentFrameAnimation != null) {
110+
if (renderer != null && currentAnimation != null) {
111111
renderer.update(delta);
112112
}
113113
}

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteWidget.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
2222
import com.badlogic.gdx.math.Vector2;
2323
import com.badlogic.gdx.scenes.scene2d.ui.Widget;
24-
import com.bladecoder.engine.anim.AtlasFrameAnimation;
25-
import com.bladecoder.engine.anim.FrameAnimation;
24+
import com.bladecoder.engine.anim.AtlasAnimationDesc;
25+
import com.bladecoder.engine.anim.AnimationDesc;
2626
import com.bladecoder.engine.anim.Tween;
2727
import com.bladecoder.engine.assets.EngineAssetManager;
2828
import com.bladecoder.engine.model.AtlasRenderer;
2929
import com.bladecoder.engine.model.ImageRenderer;
3030
import com.bladecoder.engine.spine.SpineRenderer;
3131
import com.bladecoder.engine.model.Sprite3DRenderer;
32-
import com.bladecoder.engine.model.SpriteRenderer;
32+
import com.bladecoder.engine.model.ActorRenderer;
3333
import com.bladecoder.engine.util.RectangleRenderer;
3434
import com.bladecoder.engineeditor.model.ChapterDocument;
3535
import com.bladecoder.engineeditor.ui.EditSpriteDialog;
3636

3737
public class SpriteWidget extends Widget {
3838
private String source;
39-
private FrameAnimation fa;
40-
private SpriteRenderer renderer;
39+
private AnimationDesc fa;
40+
private ActorRenderer renderer;
4141
EditSpriteDialog editFADialog;
4242

4343

@@ -75,7 +75,7 @@ public String[] getAnimations() {
7575
return renderer.getInternalAnimations(source);
7676
}
7777

78-
public void setFrameAnimation(String id, String speedStr, String typeStr) {
78+
public void setAnimation(String id, String speedStr, String typeStr) {
7979
if (source!=null && id != null && !source.isEmpty() && !id.isEmpty()) {
8080

8181
int type = Tween.REPEAT;
@@ -88,23 +88,23 @@ public void setFrameAnimation(String id, String speedStr, String typeStr) {
8888
type = Tween.PINGPONG;
8989

9090
if(renderer instanceof AtlasRenderer)
91-
fa = new AtlasFrameAnimation();
91+
fa = new AtlasAnimationDesc();
9292
else
93-
fa = new FrameAnimation();
93+
fa = new AnimationDesc();
9494

9595
fa.set(id, source, speed, 0.0f, Tween.INFINITY, type,
9696
null, null, null, false, true);
9797

98-
renderer.addFrameAnimation(fa);
98+
renderer.addAnimation(fa);
9999

100-
renderer.startFrameAnimation(fa.id, Tween.FROM_FA, 1, null);
100+
renderer.startAnimation(fa.id, Tween.FROM_FA, 1, null);
101101
}
102102
}
103103

104104
public void draw (Batch batch, float parentAlpha) {
105105
super.draw(batch, parentAlpha);
106106

107-
if(renderer == null || renderer.getCurrentFrameAnimation() == null)
107+
if(renderer == null || renderer.getCurrentAnimation() == null)
108108
return;
109109

110110
Color tmp = batch.getColor();

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void propertyChange(PropertyChangeEvent e) {
6262
String type = doc.getType(a);
6363

6464
if (!type.equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE))
65-
tabPanel.addTab("Sprites", faList);
65+
tabPanel.addTab("Animations", faList);
6666

6767
if (!type.equals("foreground")) {
6868
tabPanel.addTab("Verbs", verbList);
@@ -86,7 +86,7 @@ public void propertyChange(PropertyChangeEvent e) {
8686
setTile("ACTOR");
8787
}
8888

89-
faList.addElements(doc, a, "frame_animation");
89+
faList.addElements(doc, a, "animation");
9090
verbList.addElements(doc, a, "verb");
9191
dialogList.addElements(doc, a, "dialog");
9292
soundList.addElements(doc, a, "sound");

‎adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSpriteDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void changed(ChangeEvent event, Actor actor) {
138138
});
139139

140140
setInfoWidget(spriteWidget);
141-
init(inputs, attrs, doc, p, "frame_animation", e);
141+
init(inputs, attrs, doc, p, "animation", e);
142142

143143
setVisible(inputs[4],false);
144144
setVisible(inputs[5],false);
@@ -169,7 +169,7 @@ private void setSprite() {
169169
SelectBox<String> cb = (SelectBox<String>) inputs[1].getField();
170170

171171
if (e != null || cb.getSelectedIndex() != 0)
172-
spriteWidget.setFrameAnimation(id, speed, type);
172+
spriteWidget.setAnimation(id, speed, type);
173173
}
174174

175175
private void fillAnimations() {

0 commit comments

Comments
 (0)