LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-22 19:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

shape caching fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-02-01 14:29:28 +01:00
parent 7d4a8dc8cc
commit 0a38121ca3
4 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExportData.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2010-2015 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.exporters.shape;
import com.jpexs.decompiler.flash.types.FILLSTYLE;
import com.jpexs.decompiler.flash.types.LINESTYLE;
import java.util.List;
/**
*
* @author JPEXS
*/
public class ShapeExportData {
public List<FILLSTYLE> fillStyles;
public List<LINESTYLE> lineStyles;
public List<List<IEdge>> fillPaths;
public List<List<IEdge>> linePaths;
}

44
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/ShapeExporterBase.java
View File

@@ -58,42 +58,46 @@ public abstract class ShapeExporterBase implements IShapeExporter {
private final ColorTransform colorTransform;
private static final Cache<SHAPE, List<List<IEdge>>> fillEdgeMapCache = Cache.getInstance(true, true, "fillEdgeMap");
private static final Cache<SHAPE, List<List<IEdge>>> lineEdgeMapCache = Cache.getInstance(true, true, "lineEdgeMap");
private static final Cache<SHAPE, ShapeExportData> exportDataCache = Cache.getInstance(true, true, "shapeExportDataCache");
public ShapeExporterBase(SHAPE shape, ColorTransform colorTransform) {
this.shape = shape;
this.colorTransform = colorTransform;
_fillStyles = new ArrayList<>();
_lineStyles = new ArrayList<>();
if (shape instanceof SHAPEWITHSTYLE) {
SHAPEWITHSTYLE shapeWithStyle = (SHAPEWITHSTYLE) shape;
_fillStyles.addAll(Arrays.asList(shapeWithStyle.fillStyles.fillStyles));
_lineStyles.addAll(Arrays.asList(shapeWithStyle.lineStyles.lineStyles));
}
List<List<IEdge>> fillPaths = fillEdgeMapCache.get(shape);
List<List<IEdge>> linePaths = lineEdgeMapCache.get(shape);
if (fillPaths == null || linePaths == null) {
ShapeExportData cachedData = exportDataCache.get(shape);
if (cachedData == null) {
List<FILLSTYLE> fillStyles = new ArrayList<>();
List<LINESTYLE> lineStyles = new ArrayList<>();
if (shape instanceof SHAPEWITHSTYLE) {
SHAPEWITHSTYLE shapeWithStyle = (SHAPEWITHSTYLE) shape;
fillStyles.addAll(Arrays.asList(shapeWithStyle.fillStyles.fillStyles));
lineStyles.addAll(Arrays.asList(shapeWithStyle.lineStyles.lineStyles));
}
// Create edge maps
List<Map<Integer, List<IEdge>>> fillEdgeMaps = new ArrayList<>();
List<Map<Integer, List<IEdge>>> lineEdgeMaps = new ArrayList<>();
createEdgeMaps(shape, _fillStyles, _lineStyles, fillEdgeMaps, lineEdgeMaps);
createEdgeMaps(shape, fillStyles, lineStyles, fillEdgeMaps, lineEdgeMaps);
int count = lineEdgeMaps.size();
fillPaths = new ArrayList<>(count);
linePaths = new ArrayList<>(count);
List<List<IEdge>> fillPaths = new ArrayList<>(count);
List<List<IEdge>> linePaths = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
fillPaths.add(createPathFromEdgeMap(fillEdgeMaps.get(i)));
linePaths.add(createPathFromEdgeMap(lineEdgeMaps.get(i)));
}
fillEdgeMapCache.put(shape, fillPaths);
lineEdgeMapCache.put(shape, linePaths);
cachedData = new ShapeExportData();
cachedData.fillPaths = fillPaths;
cachedData.linePaths = linePaths;
cachedData.fillStyles = fillStyles;
cachedData.lineStyles = lineStyles;
exportDataCache.put(shape, cachedData);
}
_fillPaths = fillPaths;
_linePaths = linePaths;
_fillStyles = cachedData.fillStyles;
_lineStyles = cachedData.lineStyles;
_fillPaths = cachedData.fillPaths;
_linePaths = cachedData.linePaths;
}
public void export() {

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/Timeline.java
View File

@@ -100,6 +100,12 @@ public class Timeline {
return frames;
}
public void addFrame(Frame frame) {
ensureInitialized();
frames.add(frame);
maxDepth = getMaxDepthInternal();
}
public AS2Package getAS2RootPackage() {
ensureInitialized();
return as2RootPackage;