Skip to content

Commit

Permalink
Adding items below in TKPartPicker - WIP: Need to add to scrollpane n…
Browse files Browse the repository at this point in the history 
…ext and give a border/scrollbar
  • Loading branch information
@DizzyThermal
DizzyThermal committed Oct 25, 2019
1 parent 28a40de commit 9017b51
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 64 deletions.
1 change: 0 additions & 1 deletion src/main/java/com/gamemode/tkviewer/file_handlers/DscFileHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public void init() {

this.parts = new ArrayList<Part>();
for (int i = 0; i < this.partCount; i++) {
System.out.println(String.format("FilePosition = %d",this.filePosition));
long id = this.readInt(true, true);
long paletteIndex = this.readInt(true, true);

Expand Down
206 changes: 147 additions & 59 deletions src/main/java/com/gamemode/tkviewer/gui/TKPartPickerGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@
import com.gamemode.tkviewer.render.PartRenderer;
import com.gamemode.tkviewer.render.TileRenderer;
import com.gamemode.tkviewer.resources.EffectImage;
import com.gamemode.tkviewer.resources.Part;
import com.gamemode.tkviewer.resources.Resources;
import com.gamemode.tkviewer.utilities.FileUtils;
import com.gamemode.tkviewer.utilities.RenderUtils;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
import java.nio.Buffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -27,44 +33,16 @@ public class TKPartPickerGUI extends JFrame implements ActionListener {
JMenu fileMenu = new JMenu("File");
JMenuItem exitMenuItem = new JMenuItem("Exit");

JComboBox partPicker;
JPanel contentPanel;

JPanel viewerPanel;
JComboBox partPicker;
ImageIcon viewerIcon;

JPanel partPanel;

Integer tickValue = 0;

// Renderers
PartRenderer bodyRenderer;
PartRenderer bowRenderer;
PartRenderer coatRenderer;
PartRenderer faceRenderer;
PartRenderer faceDecRenderer;
PartRenderer fanRenderer;
PartRenderer hairRenderer;
PartRenderer helmetRenderer;
PartRenderer mantleRenderer;
PartRenderer spearRenderer;
PartRenderer shoeRenderer;
PartRenderer shieldRenderer;
PartRenderer swordRenderer;

private static final String[] partPickerItems = {
"Bodies",
"Bows",
"Coats",
"Faces",
"Face Decorations",
"Fans",
"Hair",
"Helmets",
"Mantles",
"Spears",
"Shoes",
"Shields",
"Swords"
};
LinkedHashMap<String, PartInfo> characterPartInfo;

int partValue = 0;
Expand All @@ -76,20 +54,21 @@ public TKPartPickerGUI(String title) {
this.setIconImage(this.clientIcon);

characterPartInfo = new LinkedHashMap<String, PartInfo>();
characterPartInfo.put("Bodies", new PartInfo(46, 2, true, RenderUtils.createBodyRenderer()));
characterPartInfo.put("Coats", new PartInfo(0, 0,false, RenderUtils.createCoatRenderer()));
characterPartInfo.put("Shoes", new PartInfo(0, 0,false, RenderUtils.createShoeRenderer()));
characterPartInfo.put("Mantles", new PartInfo(0, 0,false, RenderUtils.createMantleRenderer()));
characterPartInfo.put("Helmets", new PartInfo(0, 0,false, RenderUtils.createHelmetRenderer()));

characterPartInfo.put("Faces", new PartInfo(0, 2,true, RenderUtils.createFaceRenderer()));
characterPartInfo.put("Face Decorations", new PartInfo(3, 0,false, RenderUtils.createFaceDecRenderer()));
characterPartInfo.put("Hair", new PartInfo(0, 2,true, RenderUtils.createHairRenderer()));

characterPartInfo.put("Spears", new PartInfo(0, 0,false, RenderUtils.createSpearRenderer()));
characterPartInfo.put("Shields", new PartInfo(0, 0,false, RenderUtils.createShieldRenderer()));
characterPartInfo.put("Swords", new PartInfo(0, 0,false, RenderUtils.createSwordRenderer()));
characterPartInfo.put("Fans", new PartInfo(0, 0,false, RenderUtils.createFanRenderer()));
characterPartInfo.put("Bodies", new PartInfo(3, 2, 6, true, RenderUtils.createBodyRenderer()));
characterPartInfo.put("Coats", new PartInfo(0, 0, 6,false, RenderUtils.createCoatRenderer()));
characterPartInfo.put("Shoes", new PartInfo(0, 0, 6,false, RenderUtils.createShoeRenderer()));
characterPartInfo.put("Mantles", new PartInfo(0, 0,6,false, RenderUtils.createMantleRenderer()));

characterPartInfo.put("Faces", new PartInfo(0, 2,6,true, RenderUtils.createFaceRenderer()));
characterPartInfo.put("Face Decorations", new PartInfo(3,6, 0,false, RenderUtils.createFaceDecRenderer()));
characterPartInfo.put("Hair", new PartInfo(0, 2,6,true, RenderUtils.createHairRenderer()));
characterPartInfo.put("Helmets", new PartInfo(0, 2,6,false, RenderUtils.createHelmetRenderer()));

characterPartInfo.put("Spears", new PartInfo(0, 1,6,false, RenderUtils.createSpearRenderer()));
characterPartInfo.put("Shields", new PartInfo(0, 2,6,false, RenderUtils.createShieldRenderer()));
characterPartInfo.put("Swords", new PartInfo(0, 2,6,false, RenderUtils.createSwordRenderer()));
characterPartInfo.put("Bows", new PartInfo(0, 2,3,false, RenderUtils.createBowRenderer()));
characterPartInfo.put("Fans", new PartInfo(0, 2,3,false, RenderUtils.createFanRenderer()));

initMenu();
initPanel();
Expand All @@ -101,9 +80,8 @@ protected Boolean doInBackground() throws Exception {
Thread.sleep(250);
tickValue++;

viewerPanel.removeAll();

viewerPanel.add(new JLabel(new ImageIcon(renderCharacter())));
viewerPanel.remove(0);
viewerPanel.add(new JLabel(new ImageIcon(renderCharacter())), 0);

viewerPanel.revalidate();
viewerPanel.repaint();
Expand Down Expand Up @@ -133,26 +111,139 @@ public void initMenu() {

public void initPanel() {
// Create content panel
contentPanel = new JPanel(new FlowLayout());
contentPanel = new JPanel();
contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));

// Add Viewer Panel
viewerPanel = new JPanel(new FlowLayout());

// Add Part List to ComboBox
String[] partPickerItems = new String[characterPartInfo.size()];
int partPickerIndex = 0;
for (Map.Entry<String, PartInfo> characterPartInfo : this.characterPartInfo.entrySet()) {
partPickerItems[partPickerIndex++] = characterPartInfo.getKey();
}
List<String> partPickerItemsList = new ArrayList<String>(Arrays.asList(partPickerItems));
Collections.sort(partPickerItemsList);
partPicker = new JComboBox(partPickerItemsList.toArray());
partPicker.addActionListener(this);
// Add Character
viewerIcon = new ImageIcon(renderCharacter());

viewerPanel.add(new JLabel(viewerIcon));
viewerPanel.add(partPicker);

// Add Part List to ComboBox
partPicker = new JComboBox(partPickerItems);
partPicker.addActionListener(this);
// Add Part Panel
partPanel = new JPanel(new FlowLayout());
updatePartPanel("Bodies", 0);

// Add content to the panel
contentPanel.add(viewerPanel);
contentPanel.add(partPicker);
contentPanel.add(partPanel);

// Add the content panel to the parent JFrame (this)
this.add(contentPanel);
}

public void updatePartPanel(String partKey, Integer partNumber) {
partPanel.removeAll();

PartInfo partInfo = characterPartInfo.get(partKey);
PartRenderer partRenderer = this.characterPartInfo.get(partKey).getPartRenderer();
for (int i = 0; i < partRenderer.partDsc.partCount; i++) {
Part part = partRenderer.partDsc.parts.get(i);
BufferedImage partImage = partRenderer.renderPart(i, (int)part.getFrameIndex(), partInfo.getIconFrameIndex(), (int) part.getPaletteId());

JLabel jLabel = new JLabel(new ImageIcon(partImage));
final int partIndex = i;
jLabel.addMouseListener(new MouseListener() {
@Override
public void mouseClicked(MouseEvent e) {
int currentPartIndex = partInfo.getPartIndex();
boolean shouldRender = partInfo.getShouldRender();

if (currentPartIndex == partIndex) {
partInfo.setShouldRender(!shouldRender);
} else {
partInfo.setShouldRender(true);
partInfo.setPartIndex(partIndex);
}

syncParts(partKey);
}

@Override
public void mousePressed(MouseEvent e) {}
@Override
public void mouseReleased(MouseEvent e) {}
@Override
public void mouseEntered(MouseEvent e) {}
@Override
public void mouseExited(MouseEvent e) {}
});

partPanel.add(jLabel);
}

partPanel.revalidate();
partPanel.repaint();
}

public void syncParts(String partKey) {
if (partKey.equals("Helmets")) {
this.characterPartInfo.get("Hair").setShouldRender(false);
} else if (partKey.equals("Hair")) {
this.characterPartInfo.get("Helmets").setShouldRender(false);
} else if (partKey.equals("Bodies")) {
this.characterPartInfo.get("Coats").setShouldRender(false);
} else if (partKey.equals("Coats")) {
this.characterPartInfo.get("Bodies").setShouldRender(false);
} else if (partKey.equals("Bows")) {
this.characterPartInfo.get("Fans").setShouldRender(false);
this.characterPartInfo.get("Shields").setShouldRender(false);
this.characterPartInfo.get("Spears").setShouldRender(false);
this.characterPartInfo.get("Swords").setShouldRender(false);
} else if (partKey.equals("Fans")) {
if (this.characterPartInfo.get("Bodies").getShouldRender()) {
this.characterPartInfo.get("Bodies").setAnimationIndex(6);
this.characterPartInfo.get("Coats").setAnimationIndex(6);
} else {
this.characterPartInfo.get("Bodies").setAnimationIndex(2);
this.characterPartInfo.get("Coats").setAnimationIndex(2);
}
this.characterPartInfo.get("Bows").setShouldRender(false);
this.characterPartInfo.get("Spears").setShouldRender(false);
this.characterPartInfo.get("Swords").setShouldRender(false);
} else if (partKey.equals("Shields")) {
this.characterPartInfo.get("Bows").setShouldRender(false);
this.characterPartInfo.get("Spears").setShouldRender(false);
} else if (partKey.equals("Spears")) {
if (this.characterPartInfo.get("Bodies").getShouldRender()) {
this.characterPartInfo.get("Bodies").setAnimationIndex(6);
this.characterPartInfo.get("Coats").setAnimationIndex(6);
} else {
this.characterPartInfo.get("Bodies").setAnimationIndex(2);
this.characterPartInfo.get("Coats").setAnimationIndex(2);
}
this.characterPartInfo.get("Bows").setShouldRender(false);
this.characterPartInfo.get("Fans").setShouldRender(false);
this.characterPartInfo.get("Shields").setShouldRender(false);
this.characterPartInfo.get("Spears").setShouldRender(false);
this.characterPartInfo.get("Swords").setShouldRender(false);
} else if (partKey.equals("Swords")) {
if (this.characterPartInfo.get("Bodies").getShouldRender()) {
this.characterPartInfo.get("Bodies").setAnimationIndex(6);
this.characterPartInfo.get("Coats").setAnimationIndex(6);
} else {
this.characterPartInfo.get("Bodies").setAnimationIndex(2);
this.characterPartInfo.get("Coats").setAnimationIndex(2);
}
this.characterPartInfo.get("Bows").setShouldRender(false);
this.characterPartInfo.get("Fans").setShouldRender(false);
this.characterPartInfo.get("Spears").setShouldRender(false);
}
}

public BufferedImage createGrassBackground() {
int grassWidth = 4;

Expand Down Expand Up @@ -201,18 +292,15 @@ public BufferedImage renderCharacter() {
int height = drawing.getHeight();
graphicsObject.drawImage(drawing, null, (backgroundWidth / 2) - (width / 2), (backgroundHeight / 2) - (height / 2));

characterPartInfo.get("Bodies").setPartIndex(partValue++);
characterPartInfo.get("Hair").setPartIndex(partValue++);
//characterPartInfo.get("Face").setPartIndex(partValue++);

return characterImage;
}

@Override
public void actionPerformed(ActionEvent ae) {
if (ae.getSource() == this.partPicker) {
tickValue = 0;
renderCharacter();
String partKey = this.partPicker.getSelectedItem().toString();
PartInfo partInfo = this.characterPartInfo.get(partKey);
this.updatePartPanel(partKey, partInfo.getIconFrameIndex());
} else if (ae.getSource() == this.exitMenuItem) {
this.dispose();
System.out.println();
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/gamemode/tkviewer/render/PartRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ public List<EffectImage> renderAnimation(int partIndex, int chunkIndex, int manu
int frameLeft = pivotData.getPivotX() + frame.getLeft();
int frameTop = pivotData.getPivotY() + frame.getTop();
graphicsObject.drawImage(partImage,null, frameLeft, frameTop);
// graphicsObject.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, (float)block.getTransparency()/(float)255));

int defaultDuration = 64 * 16; // (ms)
images.add(new EffectImage(canvasImage, defaultDuration, pivotData, frame));
Expand Down Expand Up @@ -366,8 +365,6 @@ public int getCount() {
@Override
public Image[] getFrames(int index) {
Image[] frames = new Image[(int)this.partDsc.parts.get(index).getFrameCount()];
System.out.println("Frame #: " + index);
System.out.print(" - ");
for (int i = 0; i < this.partDsc.parts.get(index).getFrameCount(); i++) {
System.out.print(((int)this.partDsc.parts.get(index).getFrameIndex() + i) + " ");
frames[i] = this.renderPart(index,
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/gamemode/tkpartpicker/resources/PartInfo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package com.gamemode.tkpartpicker.resources

import com.gamemode.tkviewer.render.PartRenderer

class PartInfo(var partIndex: Int, var animationIndex: Int, val shouldRender: Boolean, val partRenderer: PartRenderer)
class PartInfo(var partIndex: Int, var animationIndex: Int, var iconFrameIndex: Int, var shouldRender: Boolean, val partRenderer: PartRenderer)

0 comments on commit 9017b51

Please sign in to comment.