sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Texture previews in the Material Editor are now processed in a separate thread

Browse Source
This commit is contained in:
Nehon 2015-03-01 23:09:04 +01:00
parent f31fee4f9a
commit 33222e33be
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java
View File

@ -18,7 +18,9 @@ import com.jme3.texture.Texture;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.SwingUtilities;
import jme3tools.converters.ImageToAwt; import jme3tools.converters.ImageToAwt;
import org.openide.util.ImageUtilities; import org.openide.util.ImageUtilities;
@ -34,6 +36,7 @@ public class TexturePanel extends MaterialPropertyWidget {
private boolean repeat = false; private boolean repeat = false;
private String textureName = null; private String textureName = null;
private DDSPreview ddsPreview; private DDSPreview ddsPreview;
private final ScheduledThreadPoolExecutor exec = new ScheduledThreadPoolExecutor(1);
/** Creates new form SelectionPanel */ /** Creates new form SelectionPanel */
public TexturePanel(ProjectAssetManager manager) { public TexturePanel(ProjectAssetManager manager) {
@ -44,17 +47,26 @@ public class TexturePanel extends MaterialPropertyWidget {
private void displayPreview() { private void displayPreview() {
if (!"".equals(textureName)) { if (!"".equals(textureName)) {
Texture tex = manager.loadTexture(textureName); exec.execute(new Runnable() {
Icon newicon = null;
if (textureName.toLowerCase().endsWith(".dds")) { public void run() {
if (ddsPreview == null) {
ddsPreview = new DDSPreview(manager); Texture tex = manager.loadTexture(textureName);
if (textureName.toLowerCase().endsWith(".dds")) {
if (ddsPreview == null) {
ddsPreview = new DDSPreview(manager);
}
ddsPreview.requestPreview(textureName, "", 80, 80, texturePreview, null);
} else {
final Icon newicon = ImageUtilities.image2Icon(resizeImage(ImageToAwt.convert(tex.getImage(), false, true, 0)));
SwingUtilities.invokeLater(new Runnable() {
public void run() {
texturePreview.setIcon(newicon);
}
});
}
} }
ddsPreview.requestPreview(textureName, "", 80, 80, texturePreview, null); });
} else {
newicon = ImageUtilities.image2Icon(resizeImage(ImageToAwt.convert(tex.getImage(), false, true, 0)));
}
texturePreview.setIcon(newicon);
} }
} }
@ -302,6 +314,7 @@ public class TexturePanel extends MaterialPropertyWidget {
if (ddsPreview != null) { if (ddsPreview != null) {
ddsPreview.cleanUp(); ddsPreview.cleanUp();
} }
exec.shutdownNow();
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1; private javax.swing.JButton jButton1;