Improving the views preview

org/lateralgm/components/visual/RoomEditor.java

@@ -47,6 +47,8 @@
 import org.lateralgm.resources.sub.Tile;
 import org.lateralgm.resources.sub.Instance.PInstance;
 import org.lateralgm.resources.sub.Tile.PTile;
+import org.lateralgm.resources.sub.View.PView;
+import org.lateralgm.resources.sub.View;
 import org.lateralgm.subframes.RoomFrame;
 import org.lateralgm.subframes.CodeFrame;
 import org.lateralgm.ui.swing.visuals.RoomVisual;
@@ -587,6 +589,7 @@ public Object validate(PRoomEditor k, Object v)
 				case SHOW_OBJECTS:
 				case SHOW_TILES:
 				case SHOW_VIEWS:
+					updateViewsObjectFollowingProperty();
 					roomVisual.setVisible(k.rvBinding,(Boolean) v);
 					break;
 				case DELETE_UNDERLYING_OBJECTS:
@@ -608,5 +611,75 @@ public Object validate(PRoomEditor k, Object v)
 				}
 			return v;
 			}
+
+		// Set the 'object to follow' coordinates for each view in the room
+		private void updateViewsObjectFollowingProperty()
+			{
+			// If the views are not enabled
+			if ((Boolean) room.get(PRoom.VIEWS_ENABLED) == false)
+				return;
+
+			for (View view : room.views)
+				{
+				// If the view is not visible, don't show it
+				if ((Boolean) view.properties.get(PView.VISIBLE) == false)
+					return;
+
+				// Get the reference to the 'Object following' object
+				ResourceReference<GmObject> objectToFollowReference = null;
+
+				// If there is 'Object following' object for the selected view
+				if (view.properties.get(PView.OBJECT) != null)
+					objectToFollowReference = view.properties.get(PView.OBJECT);
+
+				// If there is no object to follow, reset the corresponding view properties
+				if (objectToFollowReference == null)
+					{
+					view.properties.put(PView.OBJECT_FOLLOWING_X,-1);
+					view.properties.put(PView.OBJECT_FOLLOWING_Y,-1);
+					continue;
+					}
+
+				Instance instanceToFollow = null;
+
+				// get the first instance in the room
+				for (Instance instance : room.instances)
+					{
+						ResourceReference<GmObject> instanceObject = instance.properties.get(PInstance.OBJECT);
+
+						if (instanceObject == objectToFollowReference)
+							{
+							instanceToFollow = instance;
+							break;
+							}
+					}
+
+				// If there is an instance to follow
+				if (instanceToFollow != null)
+					{
+					// Properties of the view
+					Point viewPosition = new Point(0,0);
+					int viewWidth = (Integer) view.properties.get(PView.VIEW_W);
+					int viewHeight = (Integer) view.properties.get(PView.VIEW_H);
+
+					// Get the instance position
+					Point instancePosition = new Point(0,0);
+					instancePosition.x = (Integer) instanceToFollow.properties.get(PInstance.X);
+					instancePosition.y = (Integer) instanceToFollow.properties.get(PInstance.Y);
+
+					viewPosition.x = instancePosition.x - viewWidth / 2;
+					viewPosition.y = instancePosition.y - viewHeight / 2;
+
+					// Set this new location into the view properties
+					view.properties.put(PView.OBJECT_FOLLOWING_X, viewPosition.x);
+					view.properties.put(PView.OBJECT_FOLLOWING_Y, viewPosition.y);
+					}
+				else
+					{
+					view.properties.put(PView.OBJECT_FOLLOWING_X,-1);
+					view.properties.put(PView.OBJECT_FOLLOWING_Y,-1);
+					}
+				}
+			}
 		}
 	}

org/lateralgm/components/visual/VisualPanel.java

@@ -64,12 +64,12 @@ protected void componentToVisual(Rectangle r, int z)
 		r.height = zoom(r.height,2 - z);
 		}
 
-	protected void visualToComponent(Point p)
+	public void visualToComponent(Point p)
 		{
 		visualToComponent(p,zoom);
 		}
 
-	protected void visualToComponent(Point p, int z)
+	public void visualToComponent(Point p, int z)
 		{
 		p.x = zoom(p.x - overallBounds.x,z) + visualOffsetX(z);
 		p.y = zoom(p.y - overallBounds.y,z) + visualOffsetY(z);
@@ -84,6 +84,10 @@ protected void visualToComponent(Rectangle r, int z)
 		r.height = zoom(r.height,z);
 		}
 
+	public Rectangle getOverallBounds()
+	{
+		return overallBounds;
+	}
 	protected static double zoom(double d, int z)
 		{
 		return z > 0 ? z * d : d / (2 - z);

org/lateralgm/main/Prefs.java

@@ -139,6 +139,8 @@ public static void loadPrefs()
 		str = getString("externalSoundEditorCommand","null");
 		useExternalSoundEditor = !str.isEmpty() && !str.toLowerCase().equals("null");
 		externalSoundEditorCommand = str.toLowerCase().equals("system") ? null : str;
+
+		undoHistorySize = getInt("undoHistorySize", 100);
 		}
 
 	public static String iconPack;
@@ -183,4 +185,6 @@ public static void loadPrefs()
 	public static boolean useExternalSoundEditor;
 	public static String externalSoundEditorCommand;
 
+	public static int undoHistorySize;
+
 	}

org/lateralgm/main/PrefsStore.java

@@ -174,6 +174,13 @@ public static void setDockEventPanel(boolean selected)
 		Prefs.dockEventPanel = selected;
 		}
 
+	public static void setUndoHistorySize(int undoHistorySize)
+		{
+		PREFS.putInt("undoHistorySize",undoHistorySize);
+		Prefs.undoHistorySize = undoHistorySize;
+		}
+
+
 	public static int getNumberOfBackups()
 		{
 		return PREFS.getInt("FILE_BACKUP_COUNT",1);

org/lateralgm/messages/messages.properties

@@ -547,6 +547,9 @@ PreferencesFrame.TAB_MIME_PREFIX=MIME Types and Prefixes
 PreferencesFrame.HINT_MIME_PREFIX=Resource extension MIME types and prefixes
 PreferencesFrame.TAB_CODE_EDITOR=Code Editor
 PreferencesFrame.HINT_CODE_EDITOR=Code Editor
+PreferencesFrame.TAB_ROOM_EDITOR=Room Editor
+PreferencesFrame.HINT_ROOM_EDITOR=Room Editor
+PreferencesFrame.UNDO_HISTORY_SIZE=Undo history size (-1 for unlimited)
 PreferencesFrame.APPLY_CHANGES=Apply Changes
 PreferencesFrame.CLOSE=Close
 PreferencesFrame.APPLY_CHANGES_NOTICE=You may need to restart the program for some changes to take effect.

org/lateralgm/resources/sub/View.java

@@ -20,11 +20,11 @@ public class View
 	public enum PView
 		{
 		VISIBLE,VIEW_X,VIEW_Y,VIEW_W,VIEW_H,PORT_X,PORT_Y,PORT_W,PORT_H,BORDER_H,BORDER_V,SPEED_H,
-		SPEED_V,OBJECT
+		SPEED_V,OBJECT, OBJECT_FOLLOWING_X, OBJECT_FOLLOWING_Y
 		}
 
 	private static final EnumMap<PView,Object> DEFS = PropertyMap.makeDefaultMap(PView.class,false,0,
-			0,640,480,0,0,640,480,32,32,-1,-1,null);
+			0,640,480,0,0,640,480,32,32,-1,-1,null,-1,-1);
 
 	public View()
 		{

org/lateralgm/subframes/PreferencesFrame.java

@@ -10,6 +10,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
@@ -30,6 +31,7 @@
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import org.lateralgm.components.NumberField;
 import org.lateralgm.components.impl.DocumentUndoManager;
 import org.lateralgm.main.LGM;
 import org.lateralgm.main.Prefs;
@@ -51,6 +53,9 @@ public class PreferencesFrame extends JFrame implements ActionListener
 	JTextField soundEditorPath, backgroundEditorPath, spriteEditorPath, codeEditorPath, numberBackupsField;
   // Sounds use their own stored filename/extension, which may vary from sound to sound. 
   JTextField backgroundMIME, spriteMIME, scriptMIME;
+
+  // Room editor fields
+  NumberField undoHistorySize;
 
 	private JPanel makeGeneralPrefs()
 	{
@@ -402,6 +407,38 @@ private JPanel makeCodeEditorPrefs()
 	return p;
 	}
 
+	// Create the room editor panel
+	private Component makeRoomEditorPrefs()
+		{
+		JPanel p = new JPanel();
+
+		JLabel undoHistorySizeLabel = new JLabel(Messages.getString("PreferencesFrame.UNDO_HISTORY_SIZE") + " : ");
+		undoHistorySize = new NumberField(-1, 999999, Prefs.undoHistorySize);
+
+		GroupLayout gl = new GroupLayout(p);
+		gl.setAutoCreateGaps(true);
+		gl.setAutoCreateContainerGaps(true);
+
+		gl.setHorizontalGroup(
+			   gl.createSequentialGroup()
+			      .addGroup(gl.createParallelGroup(Alignment.TRAILING)
+			           .addComponent(undoHistorySizeLabel))
+			      .addGroup(gl.createParallelGroup()
+			           .addComponent(undoHistorySize, 100, 100, 100))
+			   );
+
+		gl.setVerticalGroup(
+			   gl.createSequentialGroup()
+			      .addGroup(gl.createParallelGroup(GroupLayout.Alignment.BASELINE)
+			           .addComponent(undoHistorySizeLabel)
+			           .addComponent(undoHistorySize, 18, 18, 18))
+					);
+
+		p.setLayout(gl);	
+
+		return p;
+		}
+
 	public PreferencesFrame()
 	{
 	  setAlwaysOnTop(false);
@@ -424,6 +461,8 @@ public PreferencesFrame()
 				/**/null,makeMimePrefixPrefs(),Messages.getString("PreferencesFrame.HINT_MIME_PREFIX")); //$NON-NLS-1$
 		tabs.addTab(Messages.getString("PreferencesFrame.TAB_CODE_EDITOR"), //$NON-NLS-1$
 				/**/null,makeCodeEditorPrefs(),Messages.getString("PreferencesFrame.HINT_CODE_EDITOR")); //$NON-NLS-1$ 
+		tabs.addTab(Messages.getString("PreferencesFrame.TAB_ROOM_EDITOR"), //$NON-NLS-1$
+				/**/null,makeRoomEditorPrefs(),Messages.getString("PreferencesFrame.HINT_ROOM_EDITOR")); //$NON-NLS-1$ 
 
 		JPanel p = new JPanel();
 		GroupLayout gl = new GroupLayout(p);
@@ -451,7 +490,7 @@ public PreferencesFrame()
 
     add(p,BorderLayout.SOUTH);
 	}
-	
+
 	public void SavePreferences()
   {
     LGM.iconspack = (String)iconCombo.getSelectedItem();
@@ -472,6 +511,8 @@ public void SavePreferences()
 	  PrefsStore.setSoundEditorCommand(soundEditorPath.getText());
 	  PrefsStore.setScriptEditorCommand(codeEditorPath.getText());
 	  PrefsStore.setDockEventPanel(dockEvent.isSelected());
+	  PrefsStore.setDockEventPanel(dockEvent.isSelected());
+	  PrefsStore.setUndoHistorySize(undoHistorySize.getIntValue());
 	}
 
 	public void ResetPreferences()