Initial commit

src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapEditor.java

@@ -0,0 +1,511 @@
+package com.gpl.rpg.atcontentstudio.ui.map;
+
+import java.awt.BorderLayout;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSlider;
+import javax.swing.JViewport;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.ui.Editor;
+import com.gpl.rpg.atcontentstudio.ui.SaveItemsWizard;
+import com.jidesoft.swing.ComboBoxSearchable;
+import com.jidesoft.swing.JideBoxLayout;
+import com.jidesoft.swing.JideTabbedPane;
+
+public class WorldMapEditor extends Editor {
+
+	private static final long serialVersionUID = -8358238912588729094L;
+	
+	public EditMode editMode = EditMode.moveViewSelect;
+	
+	public enum EditMode {
+		moveViewSelect,
+		moveMaps,
+		deleteMaps,
+		addMap
+	}
+	
+	public String mapBeingAddedID = null;
+
+	public WorldMapEditor(WorldmapSegment worldmap) {
+		target = worldmap;
+		this.name = worldmap.id;
+		this.icon = new ImageIcon(worldmap.getIcon());
+		setLayout(new BorderLayout());
+		
+		JideTabbedPane editorTabsHolder = new JideTabbedPane(JideTabbedPane.BOTTOM);
+		editorTabsHolder.setTabShape(JideTabbedPane.SHAPE_FLAT);
+		editorTabsHolder.setUseDefaultShowCloseButtonOnTab(false);
+		editorTabsHolder.setShowCloseButtonOnTab(false);
+		add(editorTabsHolder, BorderLayout.CENTER);
+
+		editorTabsHolder.add("Map", buildSegmentTab(worldmap));
+	}
+	
+	@Override
+	public void targetUpdated() {
+		// TODO Auto-generated method stub
+
+	}
+
+	
+	private JPanel buildSegmentTab(final WorldmapSegment worldmap) {
+		JPanel pane = new JPanel();
+		pane.setLayout(new JideBoxLayout(pane,  JideBoxLayout.PAGE_AXIS));
+
+		addLabelField(pane, "Worldmap File: ", ((Worldmap)worldmap.getParent()).worldmapFile.getAbsolutePath());
+		pane.add(createButtonPane(worldmap), JideBoxLayout.FIX);
+		
+		final WorldMapView mapView = new WorldMapView(worldmap);
+		JScrollPane mapScroller = new JScrollPane(mapView);
+		final JViewport vPort = mapScroller.getViewport();
+		
+		final JSlider zoomSlider = new JSlider(WorldMapView.MIN_ZOOM, WorldMapView.MAX_ZOOM, (int)(mapView.zoomLevel / WorldMapView.ZOOM_RATIO));
+		zoomSlider.setSnapToTicks(true);
+		zoomSlider.setMinorTickSpacing(WorldMapView.INC_ZOOM);
+		zoomSlider.setOrientation(JSlider.VERTICAL);
+		JPanel zoomSliderPane = new JPanel();
+		zoomSliderPane.setLayout(new JideBoxLayout(zoomSliderPane, JideBoxLayout.PAGE_AXIS));
+		zoomSliderPane.add(zoomSlider, JideBoxLayout.VARY);
+		zoomSliderPane.add(new JLabel(new ImageIcon(DefaultIcons.getZoomIcon())), JideBoxLayout.FIX);
+		
+		if (target.writable) {
+			JPanel mapToolsPane = new JPanel();
+			mapToolsPane.setLayout(new JideBoxLayout(mapToolsPane, JideBoxLayout.LINE_AXIS));
+			ButtonGroup mapToolsGroup = new ButtonGroup();
+			JRadioButton moveView = new JRadioButton("Select maps");
+			mapToolsGroup.add(moveView);
+			mapToolsPane.add(moveView, JideBoxLayout.FIX);
+			JRadioButton moveMaps = new JRadioButton("Move selected map(s)");
+			mapToolsGroup.add(moveMaps);
+			mapToolsPane.add(moveMaps, JideBoxLayout.FIX);
+			JRadioButton deleteMaps = new JRadioButton("Delete maps");
+			mapToolsGroup.add(deleteMaps);
+			mapToolsPane.add(deleteMaps, JideBoxLayout.FIX);
+			JRadioButton addMap = new JRadioButton("Add map");
+			mapToolsGroup.add(addMap);
+			mapToolsPane.add(addMap, JideBoxLayout.FIX);
+			final GDEComboModel<TMXMap> mapComboModel = new GDEComboModel<TMXMap>(worldmap.getProject(), null){
+				private static final long serialVersionUID = 2638082961277241764L;
+				@Override
+				public Object getTypedElementAt(int index) {
+					return project.getMap(index);
+				}
+				@Override
+				public int getSize() {
+					return project.getMapCount()+1;
+				}
+			};
+			final MyComboBox mapBox = new MyComboBox(TMXMap.class, mapComboModel);
+			mapBox.setRenderer(new GDERenderer(false, false));
+			new ComboBoxSearchable(mapBox){
+				@Override
+				protected String convertElementToString(Object object) {
+					if (object == null) return "none";
+					else return ((GameDataElement)object).getDesc();
+				}
+			};
+			mapBox.setEnabled(false);
+			mapToolsPane.add(mapBox, JideBoxLayout.FIX);
+			
+			mapToolsPane.add(new JPanel(), JideBoxLayout.VARY);
+			moveView.setSelected(true);
+			pane.add(mapToolsPane, JideBoxLayout.FIX);
+
+			moveView.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					editMode = EditMode.moveViewSelect;
+					mapBox.setEnabled(false);
+					if (mapBeingAddedID != null) {
+						mapView.mapLocations.remove(mapBeingAddedID);
+						mapBeingAddedID = null;
+						mapView.revalidate();
+						mapView.repaint();
+					}
+				}
+			});
+
+			moveMaps.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					editMode = EditMode.moveMaps;
+					mapBox.setEnabled(false);
+					if (mapBeingAddedID != null) {
+						mapView.mapLocations.remove(mapBeingAddedID);
+						mapBeingAddedID = null;
+						mapView.revalidate();
+						mapView.repaint();
+					}
+				}
+			});
+
+			deleteMaps.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					editMode = EditMode.deleteMaps;
+					mapBox.setEnabled(false);
+					if (mapBeingAddedID != null) {
+						mapView.mapLocations.remove(mapBeingAddedID);
+						mapBeingAddedID = null;
+						mapView.revalidate();
+						mapView.repaint();
+					}
+				}
+			});
+			
+			addMap.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					editMode = EditMode.addMap;
+					mapBox.setEnabled(true);
+					if (mapBox.getSelectedItem() != null) {
+						mapBeingAddedID = ((TMXMap)mapBox.getSelectedItem()).id;
+					}
+				}
+			});
+			
+			mapBox.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					if (mapBox.getSelectedItem() == null) {
+						mapBeingAddedID = null;
+					} else {
+						mapBeingAddedID = ((TMXMap)mapBox.getSelectedItem()).id;
+					}
+				}
+			});
+
+		}
+		
+		JPanel mapZoomPane = new JPanel();
+		mapZoomPane.setLayout(new BorderLayout());
+		mapZoomPane.add(zoomSliderPane, BorderLayout.WEST);
+		mapZoomPane.add(mapScroller, BorderLayout.CENTER);
+		pane.add(mapZoomPane, JideBoxLayout.VARY);
+		
+		zoomSlider.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				
+				Rectangle view = vPort.getViewRect();
+				
+				float oldZoomLevel = mapView.zoomLevel;
+				mapView.zoomLevel = zoomSlider.getValue() * WorldMapView.ZOOM_RATIO;
+				
+				int newCenterX = (int) (view.getCenterX() / oldZoomLevel * mapView.zoomLevel);
+				int newCenterY = (int) (view.getCenterY() / oldZoomLevel * mapView.zoomLevel);
+
+				view.x = newCenterX - (view.width / 2);
+				view.y = newCenterY - (view.height / 2);
+				
+				mapView.scrollRectToVisible(view);
+				mapView.revalidate();
+				mapView.repaint();
+			}
+		});
+		
+		MouseAdapter mouseListener = new MouseAdapter() {
+			final int skipRecomputeDefault = 5;
+			Point dragStart = null;
+			int skipRecompute = 0;
+			
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				String selectedMap = null;
+				boolean update = false;
+				int x = (int) (e.getX() / mapView.zoomLevel);
+				int y = (int) (e.getY() / mapView.zoomLevel);
+				for (String s : mapView.mapLocations.keySet()) {
+					if (mapView.mapLocations.get(s).contains(x, y)) {
+						selectedMap = s;
+						break;
+					}
+				}
+				if (editMode == EditMode.moveViewSelect) {
+					if (selectedMap == null) return;
+					if (e.getButton() == MouseEvent.BUTTON1) {
+						if (e.isControlDown() || e.isShiftDown()) {
+							if (mapView.selected.contains(selectedMap)) {
+								mapView.selected.remove(selectedMap);
+								update = true;
+							} else {
+								mapView.selected.add(selectedMap);
+								update = true;
+							}
+						} else {
+							mapView.selected.clear();
+							mapView.selected.add(selectedMap);
+							update = true;
+						}
+						if (e.getClickCount() == 2) {
+							ATContentStudio.frame.openEditor(worldmap.getProject().getMap(selectedMap));
+						}
+					}
+				} else if (editMode == EditMode.deleteMaps) {
+					worldmap.mapLocations.remove(selectedMap);
+					worldmap.labelLocations.remove(selectedMap);
+					mapView.selected.remove(selectedMap);
+					mapView.updateFromModel();
+					update = true;
+				} else if (editMode == EditMode.addMap && mapBeingAddedID != null) {
+					if (e.getButton() == MouseEvent.BUTTON1) {
+						mapView.recomputeSize();
+						mapView.pushToModel();
+					}
+					mapView.updateFromModel();
+					update = true;
+					mapBeingAddedID = null;
+				}
+				if (update) {
+					mapView.revalidate();
+					mapView.repaint();
+				}
+			}
+			
+			@Override
+			public void mousePressed(MouseEvent e) {
+				if (e.getButton() == MouseEvent.BUTTON1) {
+					dragStart = e.getLocationOnScreen();
+				}
+			}
+			
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				dragStart = null;
+				if (editMode == EditMode.moveMaps) {
+					mapView.pushToModel();
+				}
+			}
+			
+			@Override
+			public void mouseMoved(MouseEvent e) {
+				if (editMode == EditMode.addMap && mapBeingAddedID != null) {
+					int x = (int) (e.getX() / mapView.zoomLevel);
+					int y = (int) (e.getY() / mapView.zoomLevel);
+					TMXMap map = target.getProject().getMap(mapBeingAddedID);
+					int w = map.tmxMap.getWidth() * WorldMapView.TILE_SIZE;
+					int h = map.tmxMap.getHeight() * WorldMapView.TILE_SIZE;
+					x -= w / 2;
+					x -= x % WorldMapView.TILE_SIZE;
+					y -= h / 2;
+					y -= y % WorldMapView.TILE_SIZE;
+					mapView.mapLocations.put(mapBeingAddedID, new Rectangle(x, y, w, h));
+					if (--skipRecompute <= 0) {
+						if (mapView.recomputeSize()) {
+							skipRecompute = skipRecomputeDefault;
+						}
+					}
+					mapView.revalidate();
+					mapView.repaint();
+				}
+			}
+			
+			@Override
+			public void mouseDragged(MouseEvent e) {
+				if (dragStart == null) return;
+				int deltaX = e.getXOnScreen() - dragStart.x;
+				int deltaY = e.getYOnScreen() - dragStart.y;
+
+				if (editMode != EditMode.moveMaps) {
+					Rectangle view = vPort.getViewRect();
+					view.setLocation(view.x - deltaX, view.y - deltaY);
+					mapView.scrollRectToVisible(view);
+
+					dragStart = e.getLocationOnScreen();
+				} else {
+					int mapDeltaX = (int) ((deltaX / mapView.zoomLevel));
+					int mapDeltaY = (int) ((deltaY / mapView.zoomLevel));
+					
+					mapDeltaX -= mapDeltaX % WorldMapView.TILE_SIZE;
+					mapDeltaY -= mapDeltaY % WorldMapView.TILE_SIZE;
+					
+					for (String s : mapView.selected) {
+						mapView.mapLocations.get(s).x = (worldmap.mapLocations.get(s).x * WorldMapView.TILE_SIZE) + mapDeltaX;
+						mapView.mapLocations.get(s).y = (worldmap.mapLocations.get(s).y * WorldMapView.TILE_SIZE) + mapDeltaY;
+					}
+
+					if (--skipRecompute <= 0) {
+						if (mapView.recomputeSize()) {
+							skipRecompute = skipRecomputeDefault;
+						}
+					}
+
+					mapView.revalidate();
+					mapView.repaint();
+				}
+			}
+		};
+
+		mapView.addMouseListener(mouseListener);
+		mapView.addMouseMotionListener(mouseListener);
+		
+		return pane;
+	}
+	
+	public JPanel createButtonPane(final WorldmapSegment node) {
+		final JButton gdeIcon = new JButton(new ImageIcon(DefaultIcons.getUIMapImage()));
+		JPanel savePane = new JPanel();
+		savePane.add(gdeIcon, JideBoxLayout.FIX);
+		savePane.setLayout(new JideBoxLayout(savePane, JideBoxLayout.LINE_AXIS, 6));
+		if (node.writable) {
+			if (node.getDataType() == GameSource.Type.altered) {
+				savePane.add(message = new JLabel(ALTERED_MESSAGE), JideBoxLayout.FIX);
+			} else if (node.getDataType() == GameSource.Type.created) {
+				savePane.add(message = new JLabel(CREATED_MESSAGE), JideBoxLayout.FIX);
+			}
+			JButton save = new JButton(SAVE);
+			save.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					if (node.getParent() instanceof Worldmap) {
+						if (node.state != GameDataElement.State.saved) { 
+							final List<SaveEvent> events = node.attemptSave();
+							if (events == null) {
+								ATContentStudio.frame.nodeChanged(node);
+							} else {
+								new Thread() {
+									@Override
+									public void run() {
+										new SaveItemsWizard(events, node).setVisible(true);
+									}
+								}.start();
+							}
+						}
+					}
+				}
+			});
+			savePane.add(save, JideBoxLayout.FIX);
+			JButton delete = new JButton(DELETE);
+			if (node.getDataType() == GameSource.Type.altered) {
+				delete.setText(REVERT);
+			}
+			delete.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					ATContentStudio.frame.closeEditor(node);
+					node.childrenRemoved(new ArrayList<ProjectTreeNode>());
+					if (node.getParent() instanceof Worldmap) {
+						((Worldmap)node.getParent()).remove(node);
+						node.save();
+						for (GameDataElement backlink : node.getBacklinks()) {
+							backlink.elementChanged(node, node.getProject().getWorldmapSegment(node.id));
+						}
+					}
+				}
+			});
+			savePane.add(delete, JideBoxLayout.FIX);
+		} else {
+			if (node.getProject().alteredContent.getWorldmapSegment(node.id) != null) {
+				savePane.add(message = new JLabel(ALTERED_EXISTS_MESSAGE), JideBoxLayout.FIX);
+				JButton makeWritable = new JButton("Go to altered");
+				makeWritable.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						if (node.getProject().getWorldmapSegment(node.id) != node) {
+							ATContentStudio.frame.openEditor(node.getProject().getWorldmapSegment(node.id));
+							ATContentStudio.frame.closeEditor(node);
+							ATContentStudio.frame.selectInTree(node.getProject().getWorldmapSegment(node.id));
+						}
+					}
+				});
+				savePane.add(makeWritable, JideBoxLayout.FIX);
+
+			} else {
+				savePane.add(message = new JLabel(READ_ONLY_MESSAGE), JideBoxLayout.FIX);
+				JButton makeWritable = new JButton("Alter");
+				makeWritable.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						if (node.getProject().getWorldmapSegment(node.id) == node) {
+							node.getProject().makeWritable(node);
+						}
+						if (node.getProject().getWorldmapSegment(node.id) != node) {
+							ATContentStudio.frame.openEditor(node.getProject().getWorldmapSegment(node.id));
+							ATContentStudio.frame.closeEditor(node);
+							ATContentStudio.frame.selectInTree(node.getProject().getWorldmapSegment(node.id));
+						}
+						updateMessage();
+					}
+				});
+				savePane.add(makeWritable, JideBoxLayout.FIX);
+			}
+		}
+		JButton prev = new JButton(new ImageIcon(DefaultIcons.getArrowLeftIcon()));
+		JButton next = new JButton(new ImageIcon(DefaultIcons.getArrowRightIcon()));
+		savePane.add(prev, JideBoxLayout.FIX);
+		savePane.add(next, JideBoxLayout.FIX);
+		if (node.getParent().getIndex(node) == 0) {
+			prev.setEnabled(false);
+		}
+		if (node.getParent().getIndex(node) == node.getParent().getChildCount() - 1) {
+			next.setEnabled(false);
+		}
+		prev.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				ProjectTreeNode prevNode = (ProjectTreeNode) node.getParent().getChildAt(node.getParent().getIndex(node) - 1);
+				if (prevNode != null && prevNode instanceof GameDataElement) {
+					ATContentStudio.frame.openEditor((GameDataElement) prevNode);
+				}
+			}
+		});
+		next.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				ProjectTreeNode nextNode = (ProjectTreeNode) node.getParent().getChildAt(node.getParent().getIndex(node) + 1);
+				if (nextNode != null && nextNode instanceof GameDataElement) {
+					ATContentStudio.frame.openEditor((GameDataElement) nextNode);
+				}
+			}
+		});
+		//Placeholder. Fills the eventual remaining space.
+		savePane.add(new JPanel(), JideBoxLayout.VARY);
+		return savePane;
+	}
+	
+	public void updateMessage() {
+		
+		//TODO make this a full update of the button panel.
+		WorldmapSegment node = (WorldmapSegment) target;
+		if (node.writable) {
+			if (node.getDataType() == GameSource.Type.altered) {
+				message.setText(ALTERED_MESSAGE);
+			} else if (node.getDataType() == GameSource.Type.created) {
+				message.setText(CREATED_MESSAGE);
+			}
+		} else if (node.getProject().alteredContent.getWorldmapSegment(node.id) != null) {
+			message.setText(ALTERED_EXISTS_MESSAGE);
+		} else {
+			message.setText(READ_ONLY_MESSAGE);
+		}
+		message.revalidate();
+		message.repaint();
+	}
+	
+}

src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapView.java

@@ -0,0 +1,245 @@
+package com.gpl.rpg.atcontentstudio.ui.map;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.JComponent;
+import javax.swing.Scrollable;
+
+import tiled.view.MapRenderer;
+import tiled.view.OrthogonalRenderer;
+
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+
+public class WorldMapView extends JComponent implements Scrollable {
+
+	private static final long serialVersionUID = -4111374378777093799L;
+	
+	public static final int TILE_SIZE = 32;
+	public static final int MIN_ZOOM = 5;
+	public static final int MAX_ZOOM = 250;
+	public static final int INC_ZOOM = 5;
+	public static final float ZOOM_RATIO = 0.01f;
+	
+	WorldmapSegment worldmap;
+	Project proj;
+	
+	
+	public Map<String, Rectangle> mapLocations = new HashMap<String, Rectangle>();
+	
+	public Set<String> selected = new HashSet<String>();
+	
+	public float zoomLevel = 0.1f;
+	int sizeX = 0, sizeY = 0;
+	int offsetX = 0, offsetY = 0;
+	
+	public WorldMapView(WorldmapSegment worldmap) {
+		this.worldmap = worldmap;
+		this.proj = worldmap.getProject();
+		updateFromModel();
+	}
+	
+	private void paintOnGraphics(Graphics2D g2) {
+		g2.setPaint(new Color(100, 100, 100));
+        g2.fillRect(0, 0, sizeX, sizeY);
+        
+        g2.setPaint(new Color(255, 0, 0));
+        g2.setStroke(new BasicStroke(4));
+
+        for (String s : mapLocations.keySet()) {
+
+        	int x = mapLocations.get(s).x;
+        	int y = mapLocations.get(s).y;
+        	
+        	g2.translate(x, y);
+        	
+        	
+        	TMXMap map = proj.getMap(s);
+        	if (map == null) continue;
+        	MapRenderer renderer = new OrthogonalRenderer(map.tmxMap);
+        	
+        	// Draw each tile map layer
+        	for (tiled.core.MapLayer layer : ((TMXMap)map).tmxMap) {
+        		if (layer instanceof tiled.core.TileLayer && layer.isVisible()) {
+        			if (layer.getName().equalsIgnoreCase("walkable")) continue;
+        			renderer.paintTileLayer(g2, (tiled.core.TileLayer) layer);
+        		} else if (layer instanceof tiled.core.ObjectGroup && layer.isVisible()) {
+//        			paintObjectGroup(g2, map, (tiled.core.ObjectGroup) layer);
+        		}
+        	}
+        	if (selected.contains(s)) {
+        		g2.drawRect(0, 0, map.tmxMap.getWidth() * TILE_SIZE, map.tmxMap.getHeight() * TILE_SIZE);
+        	}
+        	
+        	g2.translate(-x, -y);
+        	
+        }
+	}
+	
+	@Override
+	protected void paintComponent(Graphics g) {
+		Graphics2D g2 = (Graphics2D)g.create();
+		try {
+			g2.scale(zoomLevel, zoomLevel);
+//			g2.drawImage(img, 0, 0, null);
+			paintOnGraphics(g2);
+
+		} finally {
+			g2.dispose();
+		}
+		
+	}
+	
+//	private boolean paintObjectGroup(Graphics2D g2d, TMXMap map, tiled.core.ObjectGroup layer) {
+//    	boolean paintSelected = false;
+//    	for (MapObjectGroup group : map.groups) {
+//			if (group.tmxGroup == layer) {
+//				for (MapObject object : group.mapObjects) {
+//					drawObject(object, g2d, new Color(20, 20, 190));
+//				}
+//				break;
+//			}
+//		}
+//    	return paintSelected;
+//	}
+//
+//	private void drawObject(MapObject object, Graphics2D g2d, Color color) {
+//		g2d.setPaint(color);
+//		g2d.drawRect(object.x+1, object.y+1, object.w-3, object.h-3);
+//		g2d.drawRect(object.x+2, object.y+2, object.w-5, object.h-5);
+//		g2d.setPaint(color.darker().darker());
+//		g2d.drawLine(object.x, object.y + object.h - 1, object.x + object.w - 1, object.y + object.h - 1);
+//		g2d.drawLine(object.x + object.w - 1, object.y, object.x + object.w - 1, object.y + object.h - 1);
+//		g2d.drawLine(object.x + 3, object.y + 3, object.x + object.w - 4, object.y + 3);
+//		g2d.drawLine(object.x + 3, object.y + 3, object.x + 3, object.y + object.h - 4);
+//		g2d.setPaint(color.brighter().brighter().brighter());
+//		g2d.drawLine(object.x, object.y, object.x + object.w - 1, object.y);
+//		g2d.drawLine(object.x, object.y, object.x, object.y + object.h - 1);
+//		g2d.drawLine(object.x + 3, object.y + object.h - 4, object.x + object.w - 4, object.y + object.h - 4);
+//		g2d.drawLine(object.x + object.w - 4, object.y + 3, object.x + object.w - 4, object.y + object.h - 4);
+//		Image img = object.getIcon();
+//		g2d.setColor(new Color(255, 255, 255, 120));
+//		g2d.fillRect(object.x + 2, object.y + 2, img.getWidth(null), img.getHeight(null));
+//		g2d.drawImage(object.getIcon(), object.x + 2, object.y + 2, null);
+//	}
+
+	 @Override
+	public Dimension getPreferredSize() {
+		return new Dimension((int)(zoomLevel * sizeX), (int)(zoomLevel * sizeY));
+	}
+	 
+	@Override
+	public Dimension getPreferredScrollableViewportSize() {
+		return getPreferredSize();
+	}
+
+	@Override
+	public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
+		return TILE_SIZE;
+	}
+
+	@Override
+	public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
+		return 4 * TILE_SIZE;
+	}
+
+	@Override
+	public boolean getScrollableTracksViewportWidth() {
+		return false;
+	}
+
+	@Override
+	public boolean getScrollableTracksViewportHeight() {
+		return false;
+	}
+
+	public boolean recomputeSize() {
+		sizeX = sizeY = 0;
+		boolean originMoved = false;
+		int minX = Integer.MAX_VALUE, minY= Integer.MAX_VALUE;
+		for (String s : mapLocations.keySet()) {
+			int x = mapLocations.get(s).x;
+			int w = proj.getMap(s).tmxMap.getWidth() * TILE_SIZE;
+			int y = mapLocations.get(s).y;
+			int h = proj.getMap(s).tmxMap.getHeight() * TILE_SIZE;
+			
+			sizeX = Math.max(sizeX, x + w);
+			sizeY = Math.max(sizeY, y + h);
+			minX = Math.min(minX, x);
+			minY = Math.min(minY, y);
+		}
+		
+		if (minX != 0) {
+			for (String s : mapLocations.keySet()) {
+				mapLocations.get(s).x -= minX;
+			}
+			sizeX -= minX;
+			offsetX += minX;
+			originMoved = true;
+		}
+		
+		if (minY != 0) {
+			for (String s : mapLocations.keySet()) {
+				mapLocations.get(s).y -= minY;
+			}
+			sizeY -= minY;
+			offsetY += minY;
+			originMoved = true;
+		}
+		return originMoved;
+	}
+	
+	public void updateFromModel() {
+		mapLocations.clear();
+		sizeX = sizeY = 0;
+		offsetX = worldmap.segmentX * TILE_SIZE;
+		offsetY = worldmap.segmentY * TILE_SIZE;
+		for (String s : worldmap.mapLocations.keySet()) {
+			int x = worldmap.mapLocations.get(s).x * TILE_SIZE;
+			int w = proj.getMap(s).tmxMap.getWidth() * TILE_SIZE;
+			int y = worldmap.mapLocations.get(s).y * TILE_SIZE;
+			int h = proj.getMap(s).tmxMap.getHeight() * TILE_SIZE;
+			
+			sizeX = Math.max(sizeX, x + w);
+			sizeY = Math.max(sizeY, y + h);
+			
+			mapLocations.put(s, new Rectangle(x, y, w, h));
+		}
+	}
+	
+	public void pushToModel() {
+		worldmap.segmentX = offsetX / TILE_SIZE;
+		worldmap.segmentY = offsetY / TILE_SIZE;
+		worldmap.mapLocations.clear();
+		for (String s : mapLocations.keySet()) {
+			int x = mapLocations.get(s).x / TILE_SIZE;
+			int y = mapLocations.get(s).y / TILE_SIZE;
+			
+			worldmap.mapLocations.put(s, new Point(x, y));
+		}
+		
+		List<String> toRemove = new ArrayList<String>();
+		for (String s : worldmap.labelLocations.keySet()) {
+			if (!mapLocations.containsKey(s)) {
+				toRemove.add(s);
+			}
+		}
+		for (String s : toRemove) {
+			worldmap.labelLocations.remove(s);
+		}
+	}
+	
+}