Merge pull request TeachingTechnologistBeth#20 from AliShug/master

Significant rendering update

Author: jackoson

src/com/modsim/Main.java

@@ -1,7 +1,6 @@
 package com.modsim;
 
 import com.modsim.gui.GUI;
-import com.modsim.gui.view.Ticker;
 import com.modsim.simulator.Sim;
 import com.modsim.operations.OperationStack;
 import com.modsim.util.ModuleClipboard;
@@ -36,10 +35,6 @@ public void run() {
 				ui.generateUI();
 				ui.showUI(true);
 
-				// Start render ticking
-				Thread t = new Thread(new Ticker());
-				t.start();
-
 				// Start sim ticking - sim is initialized below *before* this is called
 				sim.start();
 			}

src/com/modsim/gui/GUI.java

@@ -254,15 +254,15 @@ private void createViewport() {
 	 */
 	public void zoomInToView()
 	{
-		view.zoomIn(view.getWidth()/2,view.getHeight()/2);
+		view.zoom(view.getWidth()/2, view.getHeight()/2, 1.0);
 	}
 
 	/*
 	 * Accessible method for zooming out of view
 	 */
 	public void zoomOutToView()
 	{
-		view.zoomOut(view.getWidth()/2,view.getHeight()/2);
+		view.zoom(view.getWidth()/2, view.getHeight()/2, -1.0);
 	}
 
 	public void resetView()

src/com/modsim/gui/ModuleIcon.java

@@ -82,7 +82,8 @@ else if (hlt) {
 		g.translate(getWidth() - 40, getHeight() / 2);
 		double scale = 90 / (module.h + module.w);
 		g.scale(scale, scale);
-		module.paint(g);
+		module.paintStatic(g);
+		module.paintDynamic(g);
 	}
 
 	public void mousePressed(MouseEvent arg0) {

src/com/modsim/gui/view/ContextMenu.java

@@ -167,7 +167,7 @@ public void actionPerformed(ActionEvent e) {
 		///////////////LED Matrix specific
 
 		//Toggle Persistance
-		persistanceOff = new JMenuItem("Turn off persist");
+		persistanceOff = new JMenuItem("Turn off low-speed persistence");
 		persistanceOff.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
 				for (PickableEntity entity : entities) {
@@ -180,7 +180,7 @@ public void actionPerformed(ActionEvent e) {
 			}
 		});
 
-		persistanceOn = new JMenuItem("Turn on persist");
+		persistanceOn = new JMenuItem("Turn on low-speed persistence");
 		persistanceOn.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
 				for (PickableEntity entity : entities) {