LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 15:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Honfika
2014-03-15 15:16:01 +01:00
parent d8fdd06477 86e6b9df38
commit a07da1fd8c
4 changed files with 121 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+98 -69
View File
@@ -95,15 +95,18 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
private List<DepthState> dss;
private List<Shape> outlines;
public void setImg(SerializableImage img, List<DepthState> dss, List<Shape> outlines) {
this.img = img;
this.dss = dss;
public synchronized void setOutlines(List<DepthState> dss, List<Shape> outlines) {
this.outlines = outlines;
this.dss = dss;
}
public void setImg(SerializableImage img) {
this.img = img;
calcRect();
repaint();
}
public List<DepthState> getObjectsUnderPoint(Point p) {
public synchronized List<DepthState> getObjectsUnderPoint(Point p) {
List<DepthState> ret = new ArrayList<>();
for (int i = 0; i < outlines.size(); i++) {
if (outlines.get(i).contains(p)) {
@@ -194,65 +197,70 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
iconPanel.removeMouseMotionListener(l);
}
private void updatePos(MouseEvent e) {
private void updatePos(MouseEvent e, boolean draw) {
if (e == null) {
return;
}
lastMouseEvent = e;
boolean handCursor = false;
DepthState newStateUnderCursor = null;
if (timelined != null) {
Timeline tim = ((Timelined) timelined).getTimeline();
BoundedTag bounded = (BoundedTag) timelined;
RECT rect = bounded.getRect();
int width = rect.getWidth();
double scale = 1.0;
/*if (width > swf.displayRect.getWidth()) {
scale = (double) swf.displayRect.getWidth() / (double) width;
}*/
Matrix m = new Matrix();
m.translate(-rect.Xmin, -rect.Ymin);
m.scale(scale);
Point p = e.getPoint();
p = iconPanel.toImagePoint(p);
int x = p.x;
int y = p.y;
List<DepthState> objs = new ArrayList<>();
objs = iconPanel.getObjectsUnderPoint(p);
String ret = "";
synchronized (iconPanel) {
lastMouseEvent = e;
boolean handCursor = false;
DepthState newStateUnderCursor = null;
if (timelined != null) {
ret += " [" + x + "," + y + "] : ";
Timeline tim = ((Timelined) timelined).getTimeline();
BoundedTag bounded = (BoundedTag) timelined;
RECT rect = bounded.getRect();
int width = rect.getWidth();
double scale = 1.0;
/*if (width > swf.displayRect.getWidth()) {
scale = (double) swf.displayRect.getWidth() / (double) width;
}*/
Matrix m = new Matrix();
m.translate(-rect.Xmin, -rect.Ymin);
m.scale(scale);
Point p = e.getPoint();
p = iconPanel.toImagePoint(p);
int x = p.x;
int y = p.y;
List<DepthState> objs = new ArrayList<>();
objs = iconPanel.getObjectsUnderPoint(p);
String ret = "";
boolean first = true;
for (int i = 0; i < objs.size(); i++) {
DepthState ds = objs.get(i);
if (!first) {
ret += ", ";
}
first = false;
CharacterTag c = tim.swf.characters.get(ds.characterId);
if (c instanceof ButtonTag) {
newStateUnderCursor = ds;
handCursor = true;
}
ret += c.toString();
if (timelined instanceof ButtonTag) {
handCursor = true;
}
}
if (first) {
ret += " - ";
}
debugLabel.setText(ret);
ret += " [" + x + "," + y + "] : ";
if (handCursor) {
iconPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else {
iconPanel.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
if (newStateUnderCursor != stateUnderCursor) {
stateUnderCursor = newStateUnderCursor;
drawFrame();
boolean first = true;
for (int i = 0; i < objs.size(); i++) {
DepthState ds = objs.get(i);
if (!first) {
ret += ", ";
}
first = false;
CharacterTag c = tim.swf.characters.get(ds.characterId);
if (c instanceof ButtonTag) {
newStateUnderCursor = ds;
handCursor = true;
}
ret += c.toString();
if (timelined instanceof ButtonTag) {
handCursor = true;
}
}
if (first) {
ret += " - ";
}
debugLabel.setText(ret);
if (handCursor) {
iconPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else {
iconPanel.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
if (newStateUnderCursor != stateUnderCursor) {
stateUnderCursor = newStateUnderCursor;
if (draw) {
drawFrame();
}
}
}
}
}
@@ -294,14 +302,14 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
@Override
public void mousePressed(MouseEvent e) {
mouseButton = e.getButton();
updatePos(e);
updatePos(e, true);
drawFrame();
}
@Override
public void mouseReleased(MouseEvent e) {
mouseButton = 0;
updatePos(e);
updatePos(e, true);
drawFrame();
}
@@ -310,12 +318,12 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
@Override
public void mouseMoved(MouseEvent e) {
updatePos(e);
updatePos(e, true);
}
@Override
public void mouseDragged(MouseEvent e) {
updatePos(e);
updatePos(e, true);
}
});
@@ -347,7 +355,8 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
timelined = null;
loaded = true;
try {
iconPanel.setImg(new SerializableImage(ImageIO.read(new ByteArrayInputStream(data))), new ArrayList<DepthState>(), new ArrayList<Shape>());
iconPanel.setImg(new SerializableImage(ImageIO.read(new ByteArrayInputStream(data))));
iconPanel.setOutlines(new ArrayList<DepthState>(), new ArrayList<Shape>());
} catch (IOException ex) {
Logger.getLogger(ImagePanel.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -370,7 +379,8 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
loaded = true;
if (drawable.getTimeline().frames.isEmpty()) {
iconPanel.setImg(null, new ArrayList<DepthState>(), new ArrayList<Shape>());
iconPanel.setImg(null);
iconPanel.setOutlines(new ArrayList<DepthState>(), new ArrayList<Shape>());
return;
}
frame = 0;
@@ -386,7 +396,8 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
timelined = null;
loaded = true;
stillFrame = true;
iconPanel.setImg(image, new ArrayList<DepthState>(), new ArrayList<Shape>());
iconPanel.setImg(image);
iconPanel.setOutlines(new ArrayList<DepthState>(), new ArrayList<Shape>());
}
@Override
@@ -432,7 +443,6 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
stopAllSounds();
}
frame = newframe;
updatePos(lastMouseEvent);
time = 0;
} else {
time++;
@@ -488,11 +498,24 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
if (timelined == null) {
return;
}
getOutlines();
Matrix mat = new Matrix();
mat.translateX = swf.displayRect.Xmin;
mat.translateY = swf.displayRect.Ymin;
updatePos(lastMouseEvent, false);
BufferedImage img = getFrame(swf, frame, time, timelined, stateUnderCursor, mouseButton).getBufferedImage();
List<Integer> sounds = timelined.getTimeline().getSounds(frame, time, stateUnderCursor, mouseButton);
List<Integer> sounds = new ArrayList<>();
List<String> soundClasses = new ArrayList<>();
timelined.getTimeline().getSounds(frame, time, stateUnderCursor, mouseButton, sounds, soundClasses);
for (int cid : swf.characters.keySet()) {
CharacterTag c = swf.characters.get(cid);
for (String cls : soundClasses) {
if (cls.equals(c.getClassName())) {
sounds.add(cid);
}
}
}
for (int sndId : sounds) {
CharacterTag c = swf.characters.get(sndId);
if (c instanceof SoundTag) {
@@ -520,17 +543,23 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
}
}
iconPanel.setImg(new SerializableImage(img));
}
private void getOutlines() {
List<DepthState> objs = new ArrayList<>();
List<Shape> outlines = new ArrayList<>();
Matrix m = new Matrix();
RECT rect = timelined.getTimeline().displayRect;
m.translate(-rect.Xmin, -rect.Ymin);
m.scale(1);
List<DepthState> objs = new ArrayList<>();
List<Shape> outlines = new ArrayList<>();
timelined.getTimeline().getObjectsOutlines(frame, time, frame, stateUnderCursor, mouseButton, m, objs, outlines);
for (int i = 0; i < outlines.size(); i++) {
outlines.set(i, SHAPERECORD.twipToPixelShape(outlines.get(i)));
}
iconPanel.setImg(new SerializableImage(img), objs, outlines);
iconPanel.setOutlines(objs, outlines);
}
public void stop() {
trunk/src/com/jpexs/decompiler/flash/timeline/Frame.java
+1
View File
@@ -35,6 +35,7 @@ public class Frame {
public RGB backgroundColor = new RGBA(0, 0, 0, 0);
public Timeline timeline;
public List<Integer> sounds = new ArrayList<>();
public List<String> soundClasses = new ArrayList<>();
public Frame(Timeline timeline) {
this.timeline = timeline;
trunk/src/com/jpexs/decompiler/flash/timeline/Timeline.java
+17 -13
View File
@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.exporters.Matrix;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.flash.tags.SetBackgroundColorTag;
import com.jpexs.decompiler.flash.tags.ShowFrameTag;
import com.jpexs.decompiler.flash.tags.StartSound2Tag;
import com.jpexs.decompiler.flash.tags.StartSoundTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.BoundedTag;
@@ -84,6 +85,9 @@ public class Timeline {
if (t instanceof StartSoundTag) {
frame.sounds.add(((StartSoundTag) t).soundId);
}
if (t instanceof StartSound2Tag) {
frame.soundClasses.add(((StartSound2Tag) t).soundClassName);
}
if (t instanceof SetBackgroundColorTag) {
frame.backgroundColor = ((SetBackgroundColorTag) t).backgroundColor;
}
@@ -179,10 +183,10 @@ public class Timeline {
}
public List<Integer> getSounds(int frame, int time, DepthState stateUnderCursor, int mouseButton) {
List<Integer> ret = new ArrayList<>();
public void getSounds(int frame, int time, DepthState stateUnderCursor, int mouseButton, List<Integer> sounds, List<String> soundClasses) {
Frame fr = this.frames.get(frame);
ret.addAll(fr.sounds);
sounds.addAll(fr.sounds);
soundClasses.addAll(fr.soundClasses);
for (int d = this.getMaxDepth(); d >= 0; d--) {
DepthState ds = fr.layers.get(d);
if (ds != null) {
@@ -200,11 +204,10 @@ public class Timeline {
}
}
}
ret.addAll(((Timelined) c).getTimeline().getSounds(dframe, time + ds.time, stateUnderCursor, mouseButton));
((Timelined) c).getTimeline().getSounds(dframe, time + ds.time, stateUnderCursor, mouseButton, sounds, soundClasses);
}
}
}
return ret;
}
public void getObjectsOutlines(int frame, int time, int ratio, DepthState stateUnderCursor, int mouseButton, Matrix transformation, List<DepthState> objs, List<Shape> outlines) {
@@ -238,14 +241,15 @@ public class Timeline {
dframe = ds.time % ((Timelined) c).getTimeline().frames.size();
if (c instanceof ButtonTag) {
ButtonTag bt = (ButtonTag) c;
dframe = ButtonTag.FRAME_UP;
if (stateUnderCursor == ds) {
if (mouseButton > 0) {
dframe = ButtonTag.FRAME_DOWN;
} else {
dframe = ButtonTag.FRAME_OVER;
}
}
dframe = ButtonTag.FRAME_HITTEST;
/*dframe = ButtonTag.FRAME_UP;
if (stateUnderCursor == ds) {
if (mouseButton > 0) {
dframe = ButtonTag.FRAME_DOWN;
} else {
dframe = ButtonTag.FRAME_OVER;
}
}*/
}
}
Shape cshape = ((DrawableTag) c).getOutline(dframe, ds.time + time, ds.ratio, stateUnderCursor, mouseButton, m);
trunk/src/com/jpexs/helpers/SerializableImage.java
+5 -3
View File
@@ -143,12 +143,14 @@ public class SerializableImage implements Serializable {
}
private void writeObject(ObjectOutputStream out) throws IOException {
// out.writeObject(bounds);
ImageIO.write(image, "png", out);
try{
ImageIO.write(image, "png", out);
}catch(Exception ex){
//ignore
}
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
// bounds = (Rectangle2D) in.readObject();
image = ImageIO.read(in);
}
}