diff --git a/roaddesign/.classpath b/roaddesign/.classpath index fa84d66..0294376 100644 --- a/roaddesign/.classpath +++ b/roaddesign/.classpath @@ -1,36 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/roaddesign/properties.cfg b/roaddesign/properties.cfg index 075cd23..184d7b4 100644 --- a/roaddesign/properties.cfg +++ b/roaddesign/properties.cfg @@ -1,8 +1,8 @@ -#Game Settings written by com.jme.app.BaseGame$BaseGameSettings at Fri Sep 04 19:49:05 EDT 2015 -#Fri Sep 04 19:49:05 EDT 2015 -FREQ=-1 -WIDTH=1152 -RENDERER=LWJGL -HEIGHT=864 -DEPTH=24 -FULLSCREEN=false +#Game Settings written by com.jme.app.BaseGame$BaseGameSettings at Sun Nov 08 14:05:06 EST 2015 +#Sun Nov 08 14:05:06 EST 2015 +FREQ=-1 +WIDTH=1152 +RENDERER=LWJGL +HEIGHT=864 +DEPTH=24 +FULLSCREEN=false diff --git a/roaddesign/roaddesign.log b/roaddesign/roaddesign.log index 59b9d8e..0a7cf4c 100644 --- a/roaddesign/roaddesign.log +++ b/roaddesign/roaddesign.log @@ -1,47 +1,37 @@ -Sep 04, 2015 7:48:21 PM com.sim.central.RoadDesign start -INFO: Starting RoadDesign -Sep 04, 2015 7:48:22 PM com.sim.central.RoadDesign installHandlers -INFO: Installing event handlers for application frame components... -Sep 04, 2015 7:48:22 PM com.sim.central.RoadDesign installHandlers -INFO: Installing event handlers for application frame components...Succeed -Sep 04, 2015 7:48:22 PM com.sim.central.RoadDesign installBuilders -INFO: Installing builders for network components... -Sep 04, 2015 7:48:22 PM com.sim.central.RoadDesign installBuilders -INFO: Installing builders for network components...Succeed -Sep 04, 2015 7:48:22 PM com.sim.network.RoadNetworkController findController -INFO: Building road network controller -Sep 04, 2015 7:48:22 PM com.sim.network.RoadNetworkController findController -INFO: Building road network controller...Succeed -Sep 04, 2015 7:48:22 PM com.sim.central.RoadDesign start -INFO: RoadDesign started -Sep 04, 2015 7:48:38 PM com.sim.central.RoadDesign getXsec -INFO: XSEC: numOfLanes = 1 laneWidth = 12.0 laneSlope = 0.0 shoulderWidth = 1.0 shoulderSlope = 2.0 medianWidth = 20.0 -Sep 04, 2015 7:48:38 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_ADD: (-2509.000, -1049.000, 0.000) -Sep 04, 2015 7:48:39 PM com.sim.central.RoadDesign getCurveParam -INFO: CURVE_PARAM: SPEED=35.000 GRADE=0.000 SUPERELEVATION=4.000 -Sep 04, 2015 7:48:39 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_ADD: (-114.000, 1181.000, 0.000) -Sep 04, 2015 7:48:40 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_CLOSE: (-48.000, 969.000, 0.000) -Sep 04, 2015 7:48:52 PM com.sim.central.RoadDesign getXsec -INFO: XSEC: numOfLanes = 1 laneWidth = 12.0 laneSlope = 0.0 shoulderWidth = 1.0 shoulderSlope = 2.0 medianWidth = 20.0 -Sep 04, 2015 7:48:52 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_ADD: (-2745.000, 492.000, 0.000) -Sep 04, 2015 7:48:54 PM com.sim.central.RoadDesign getCurveParam -INFO: CURVE_PARAM: SPEED=35.000 GRADE=0.000 SUPERELEVATION=4.000 -Sep 04, 2015 7:48:54 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_ADD: (-415.000, -337.000, 0.000) -Sep 04, 2015 7:48:54 PM com.sim.gui.handler.MainMouseHandler mouseClicked -INFO: PT_CLOSE: (-330.000, -167.000, 0.000) -Sep 04, 2015 7:49:02 PM com.sim.central.RoadDesign confirm -INFO: USER_CHOICE: YES C:\Users\Desktop\Documents\RoadVisualizer\RoadVisualizer\roaddesign is not empty! -Do you want to override these files. -Sep 04, 2015 7:49:03 PM com.sim.io.exporters.basic.BasicHeightMapExporter export -INFO: Height map saved successfully -Sep 04, 2015 7:49:03 PM com.sim.gui.handler.SaveHandler actionPerformed -INFO: Model saved to C:\Users\Desktop\Documents\RoadVisualizer\RoadVisualizer\roaddesign -Sep 04, 2015 7:49:03 PM com.sim.central.RoadDesign$1 run -INFO: Starting the renderer... -Sep 04, 2015 7:49:28 PM com.sim.central.RoadDesign$1 run -INFO: The renderer completes successfully +Nov 08, 2015 2:04:53 PM com.sim.central.RoadDesign start +INFO: Starting RoadDesign +Nov 08, 2015 2:04:54 PM com.sim.central.RoadDesign installHandlers +INFO: Installing event handlers for application frame components... +Nov 08, 2015 2:04:54 PM com.sim.central.RoadDesign installHandlers +INFO: Installing event handlers for application frame components...Succeed +Nov 08, 2015 2:04:54 PM com.sim.central.RoadDesign installBuilders +INFO: Installing builders for network components... +Nov 08, 2015 2:04:54 PM com.sim.central.RoadDesign installBuilders +INFO: Installing builders for network components...Succeed +Nov 08, 2015 2:04:54 PM com.sim.network.RoadNetworkController findController +INFO: Building road network controller +Nov 08, 2015 2:04:54 PM com.sim.network.RoadNetworkController findController +INFO: Building road network controller...Succeed +Nov 08, 2015 2:04:54 PM com.sim.central.RoadDesign start +INFO: RoadDesign started +Nov 08, 2015 2:04:56 PM com.sim.central.RoadDesign getXsec +INFO: XSEC: numOfLanes = 1 laneWidth = 12.0 laneSlope = 0.0 shoulderWidth = 10.0 shoulderSlope = 2.0 medianWidth = 20.0 +Nov 08, 2015 2:04:56 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (-3829.000, -1254.000, 0.000) +Nov 08, 2015 2:04:57 PM com.sim.central.RoadDesign getCurveParam +INFO: CURVE_PARAM: SPEED=35.000 GRADE=0.000 SUPERELEVATION=4.000 +Nov 08, 2015 2:04:57 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (416.000, 1141.000, 0.000) +Nov 08, 2015 2:04:58 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_CLOSE: (976.000, 1121.000, 0.000) +Nov 08, 2015 2:05:01 PM com.sim.central.RoadDesign confirm +INFO: USER_CHOICE: YES C:\Users\Desktop\Documents\RoadVisualizer2\roaddesign is not empty! +Do you want to overwrite your existing road design? +Nov 08, 2015 2:05:01 PM com.sim.io.exporters.basic.BasicHeightMapExporter export +INFO: Height map saved successfully +Nov 08, 2015 2:05:01 PM com.sim.gui.handler.SaveHandler actionPerformed +INFO: Model saved to C:\Users\Desktop\Documents\RoadVisualizer2\roaddesign +Nov 08, 2015 2:05:04 PM com.sim.central.RoadDesign$1 run +INFO: Starting the renderer... +Nov 08, 2015 2:06:14 PM com.sim.central.RoadDesign$1 run +INFO: The renderer completes successfully diff --git a/roaddesign/roaddesign.log.1 b/roaddesign/roaddesign.log.1 index 05af4c9..8385c54 100644 --- a/roaddesign/roaddesign.log.1 +++ b/roaddesign/roaddesign.log.1 @@ -1,16 +1,43 @@ -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign start -INFO: Starting RoadDesign -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign installHandlers -INFO: Installing event handlers for application frame components... -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign installHandlers -INFO: Installing event handlers for application frame components...Succeed -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign installBuilders -INFO: Installing builders for network components... -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign installBuilders -INFO: Installing builders for network components...Succeed -Sep 04, 2015 7:19:16 PM com.sim.network.RoadNetworkController findController -INFO: Building road network controller -Sep 04, 2015 7:19:16 PM com.sim.network.RoadNetworkController findController -INFO: Building road network controller...Succeed -Sep 04, 2015 7:19:16 PM com.sim.central.RoadDesign start -INFO: RoadDesign started +Nov 08, 2015 1:22:33 PM com.sim.central.RoadDesign start +INFO: Starting RoadDesign +Nov 08, 2015 1:22:34 PM com.sim.central.RoadDesign installHandlers +INFO: Installing event handlers for application frame components... +Nov 08, 2015 1:22:34 PM com.sim.central.RoadDesign installHandlers +INFO: Installing event handlers for application frame components...Succeed +Nov 08, 2015 1:22:34 PM com.sim.central.RoadDesign installBuilders +INFO: Installing builders for network components... +Nov 08, 2015 1:22:34 PM com.sim.central.RoadDesign installBuilders +INFO: Installing builders for network components...Succeed +Nov 08, 2015 1:22:34 PM com.sim.network.RoadNetworkController findController +INFO: Building road network controller +Nov 08, 2015 1:22:34 PM com.sim.network.RoadNetworkController findController +INFO: Building road network controller...Succeed +Nov 08, 2015 1:22:34 PM com.sim.central.RoadDesign start +INFO: RoadDesign started +Nov 08, 2015 1:22:37 PM com.sim.central.RoadDesign getXsec +INFO: XSEC: numOfLanes = 1 laneWidth = 12.0 laneSlope = 0.0 shoulderWidth = 10.0 shoulderSlope = 2.0 medianWidth = 20.0 +Nov 08, 2015 1:22:37 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (-4149.000, -1454.000, 0.000) +Nov 08, 2015 1:22:39 PM com.sim.central.RoadDesign getCurveParam +INFO: CURVE_PARAM: SUPERELEVATION=4.000 GRADE=0.000 SPEED=35.000 +Nov 08, 2015 1:22:39 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (1228.000, 1436.000, 0.000) +Nov 08, 2015 1:22:39 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_CLOSE: (953.000, 896.000, 0.000) +Nov 08, 2015 1:22:42 PM com.sim.central.RoadDesign getXsec +INFO: XSEC: numOfLanes = 1 laneWidth = 12.0 laneSlope = 0.0 shoulderWidth = 10.0 shoulderSlope = 2.0 medianWidth = 20.0 +Nov 08, 2015 1:22:42 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (138.000, -1109.000, 0.000) +Nov 08, 2015 1:22:43 PM com.sim.central.RoadDesign getCurveParam +INFO: CURVE_PARAM: SUPERELEVATION=4.000 GRADE=0.000 SPEED=35.000 +Nov 08, 2015 1:22:43 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_ADD: (-2702.000, 766.000, 0.000) +Nov 08, 2015 1:22:45 PM com.sim.gui.handler.MainMouseHandler mouseClicked +INFO: PT_CLOSE: (-2532.000, 184.000, 0.000) +Nov 08, 2015 1:22:53 PM com.sim.central.RoadDesign confirm +INFO: USER_CHOICE: YES C:\Users\Desktop\Documents\RoadVisualizer2\roaddesign is not empty! +Do you want to overwrite this file? +Nov 08, 2015 1:22:55 PM com.sim.io.exporters.basic.BasicHeightMapExporter export +INFO: Height map saved successfully +Nov 08, 2015 1:22:55 PM com.sim.gui.handler.SaveHandler actionPerformed +INFO: Model saved to C:\Users\Desktop\Documents\RoadVisualizer2\roaddesign diff --git a/roaddesign/src/main/java/com/sim/central/Builders.java b/roaddesign/src/main/java/com/sim/central/Builders.java index 81ef58d..f332d3c 100644 --- a/roaddesign/src/main/java/com/sim/central/Builders.java +++ b/roaddesign/src/main/java/com/sim/central/Builders.java @@ -1,12 +1,8 @@ package com.sim.central; -import java.util.EventListener; - import java.util.HashMap; import java.util.Map; -import com.sim.core.basic.*; -import com.sim.gui.FrameComponents; import com.sim.intersections.IntersectionBuilder; import com.sim.intersections.basic.BasicIntersectionBuilder; import com.sim.roads.RoadBuilder; diff --git a/roaddesign/src/main/java/com/sim/central/ComponentHandlers.java b/roaddesign/src/main/java/com/sim/central/ComponentHandlers.java index 87136a1..d9f3373 100644 --- a/roaddesign/src/main/java/com/sim/central/ComponentHandlers.java +++ b/roaddesign/src/main/java/com/sim/central/ComponentHandlers.java @@ -2,11 +2,12 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.*; +import java.util.EventListener; +import java.util.HashMap; +import java.util.Map; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import com.sim.gui.FrameComponents; import com.sim.gui.ViewMode; @@ -14,7 +15,6 @@ import com.sim.gui.handler.RenderHandler; import com.sim.gui.handler.ResetHandler; import com.sim.gui.handler.SaveHandler; -import com.sim.roads.RoadTypes; /** @@ -65,7 +65,7 @@ public void actionPerformed(ActionEvent e) { _handlers.handlers.put(FrameComponents.TOOLBAR_VIEW_MODE_BOX, new ActionListener(){ public void actionPerformed(ActionEvent e) { - JComboBox box = (JComboBox)e.getSource(); + JComboBox box = (JComboBox)e.getSource(); RoadDesign.setViewMode( (ViewMode) box.getSelectedItem()); } diff --git a/roaddesign/src/main/java/com/sim/central/Logging.java b/roaddesign/src/main/java/com/sim/central/Logging.java index ca5ad42..e526116 100644 --- a/roaddesign/src/main/java/com/sim/central/Logging.java +++ b/roaddesign/src/main/java/com/sim/central/Logging.java @@ -1,23 +1,27 @@ package com.sim.central; import java.io.IOException; -import java.util.logging.ConsoleHandler; import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; - +/** + * This class is used to statically access a {@link java.util.logging.Logger}. + * The logger uses a {@link java.util.logging.FileHandler} as a handler to write the log messages to a file. + * After displaying the log to the console, it is logged to the file specified by the {@link java.util.logging.FileHandler}. + * @author Dahai Guo + */ public class Logging { - private static Logger logger = null; + private static Logger logger = null; public static boolean init(){ FileHandler fh = null; SimpleFormatter formatterTxt = new SimpleFormatter(); try { fh = new FileHandler( - RoadDesign.getProperty(RoadDesign.LOG_FILE_NAME)); + RoadDesign.getProperty(RoadDesign.LOG_FILE_NAME)); // specifies the FileHandler write to the log file specified in the properties file fh.setFormatter(formatterTxt); } catch (SecurityException e) { @@ -28,14 +32,17 @@ public static boolean init(){ return false; } - logger = Logger.getLogger("sim"); + logger = Logger.getLogger("sim"); // Creates a new logger with the name "sim". logger.setLevel(Level.ALL); - logger.addHandler(fh); + logger.addHandler(fh); // logs to the file specified by the FileHandler - return true; + return true; // initialization was successful } - public static Logger getLogger(){ + /** + * @return a reference to the static logger. + */ + public static Logger getLogger(){ return logger; } } diff --git a/roaddesign/src/main/java/com/sim/central/ModelPathState.java b/roaddesign/src/main/java/com/sim/central/ModelPathState.java index 46126fb..dc4ad5a 100644 --- a/roaddesign/src/main/java/com/sim/central/ModelPathState.java +++ b/roaddesign/src/main/java/com/sim/central/ModelPathState.java @@ -15,14 +15,14 @@ */ public enum ModelPathState { /** - * The files in the model path is consistent. The renderer should be able to + * The files in the model path are consistent. The renderer should be able to * render it. * @see com.sim.renderer.AutoGenLoader */ OK, /** - * The files in the model path is not consistent. The renderer will not be able to + * The files in the model path are not consistent. The renderer will not be able to * render it. * @see com.sim.renderer.AutoGenLoader */ @@ -34,11 +34,11 @@ public enum ModelPathState { EMPTY, /** - * The model path points to a non-existing directory. + * The model path points to a non-existent directory. */ NON_EXIST; - /** + /** * Checks the state of the directory where the model is supposed to * be saved. *

diff --git a/roaddesign/src/main/java/com/sim/central/RoadDesign.java b/roaddesign/src/main/java/com/sim/central/RoadDesign.java index 3bddb72..ff7d6fd 100644 --- a/roaddesign/src/main/java/com/sim/central/RoadDesign.java +++ b/roaddesign/src/main/java/com/sim/central/RoadDesign.java @@ -3,63 +3,28 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Point; -import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener; import java.awt.geom.Point2D; -import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; -import java.util.ArrayList; import java.util.EventListener; -import java.util.Formatter; import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.Stack; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JFileChooser; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JToolBar; -import javax.swing.KeyStroke; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EtchedBorder; - import com.jme.app.AbstractGame.ConfigShowMode; -import com.sim.core.basic.DesignConsts; -import com.sim.core.basic.FlagUtil; -import com.sim.core.basic.ModelGenConsts; -import com.sim.core.basic.RoadShapeCalc; import com.sim.curves.CurveParam; -import com.sim.debug.Debug; -import com.sim.debug.DebugView; -import com.sim.debug.components.DebugMesh; -import com.sim.debug.components.DebugPolyLine; import com.sim.geometries.RoadVector; import com.sim.geometries.Vector23f; import com.sim.gui.FrameComponents; @@ -69,22 +34,15 @@ import com.sim.gui.ThreeDEnv; import com.sim.gui.ViewMode; import com.sim.gui.WorkMode; -import com.sim.gui.handler.NetworkGUIDrawer; -import com.sim.intersections.Intersection; import com.sim.intersections.IntersectionBuilder; -import com.sim.intersections.basic.BasicIntersection; import com.sim.network.RoadNetwork; import com.sim.network.RoadNetworkController; import com.sim.network.update.NetworkUpdate; import com.sim.obj.CrossSection; -import com.sim.random.RoadUtil; import com.sim.renderer.AutoGenLoader; -import com.sim.roads.Road; import com.sim.roads.RoadBuilder; -import com.sim.roads.basic.BasicRoad; -import com.sim.terrain.*; +import com.sim.terrain.TerrainBuilder; import com.sim.util.ArgumentList; -import com.sim.util.ModelExporterUtils; /** * This class centralizes the communication in the road design process. It mainly @@ -122,17 +80,17 @@ public class RoadDesign { public static boolean DEBUG = false; /** - * Title of the application window + * Title of the application window. */ public static final String TITLE = "title"; /** - * Path to file which stores the texture information for meshes + * Path to file which stores the texture information for meshes. */ public static final String TEXTURE_DIRECTORY = "texture_directory"; /** - * Directory to where texture files are saved + * Directory to where texture files are saved. */ public static final String TEXTURE_DIR = "texture_dir"; @@ -143,13 +101,13 @@ public class RoadDesign { public static final String MODEL_PATH = "model_path"; /** - * How the real size of the network compares what it shows + * How the real size of the network compares to what is shown * on the design panel. */ public static final String INIT_SCALE = "init_scale"; /** - * In {@link #MODEL_DIR MODEL_DIR}, there should exists a file which + * In {@link #MODEL_DIR MODEL_DIR}, there should exist a file which * records all the files in MODEL_DIR. */ public static final String MODEL_DIR = "model_dir"; @@ -160,22 +118,22 @@ public class RoadDesign { public static final String START_VIEW_PATH = "start_view"; /** - * Filename for the heightmap + * Filename for the height map. */ public static final String HEIGHT_MAP_FILE = "heightmap_name"; /** - * Width of the height map + * Width of the height map. */ public static final String HEIGHT_MAP_WIDTH = "heightmap_width"; /** - * Height of the height map + * Height of the height map. */ public static final String HEIGHT_MAP_HEIGHT = "heightmap_height"; /** - * The file that contains the scale of the height map + * The file that contains the scale of the height map. */ public static final String HEIGHT_MAP_SCALE_FILE = "heightmap_scale_file"; @@ -231,7 +189,7 @@ public class RoadDesign { /** * Starts the application.

- * It fails when it could not find the properties file. + * It fails when it can not find the properties file. * * @param propertiesPath where the properties are saved * @throws IOException thrown when the properties files is missing @@ -245,7 +203,7 @@ public static void start(String propertiesPath) { System.exit(1); } - if(!Logging.init()){ + if(!Logging.init()){ // logging did not initialize properly, displays a user prompt asking whether or not to continue int userInput = JOptionPane.showConfirmDialog(null, "Logging did not start correctly. "+ "Do you want to continue?", @@ -254,7 +212,7 @@ public static void start(String propertiesPath) { JOptionPane.WARNING_MESSAGE); if(userInput!=JOptionPane.OK_OPTION){ - System.exit(1); + System.exit(1); // application exits if user chooses to not continue without logging } } diff --git a/roaddesign/src/main/java/com/sim/core/basic/FlagUtil.java b/roaddesign/src/main/java/com/sim/core/basic/FlagUtil.java index a77ee3c..46f31e2 100644 --- a/roaddesign/src/main/java/com/sim/core/basic/FlagUtil.java +++ b/roaddesign/src/main/java/com/sim/core/basic/FlagUtil.java @@ -2,11 +2,8 @@ import java.awt.Color; -import java.util.ArrayList; import com.sim.geometries.RoadVector; -import com.sim.geometries.Vector23f; -import com.sim.obj.CrossSection; /** diff --git a/roaddesign/src/main/java/com/sim/core/basic/RoadShapeCalc.java b/roaddesign/src/main/java/com/sim/core/basic/RoadShapeCalc.java index 8dcdec4..a31190d 100644 --- a/roaddesign/src/main/java/com/sim/core/basic/RoadShapeCalc.java +++ b/roaddesign/src/main/java/com/sim/core/basic/RoadShapeCalc.java @@ -2,20 +2,18 @@ -import java.awt.Color; - - -import java.awt.image.BufferedImage; -import java.nio.IntBuffer; -import java.util.*; -import com.jmex.font3d.math.Triangulator; -import com.sim.curves.*; -import com.sim.geometries.*; +import java.util.ArrayList; +import java.util.NavigableMap; +import java.util.TreeMap; + +import com.sim.curves.HorizontalCurve; +import com.sim.curves.RunOutOff; +import com.sim.curves.VerticalCurve; +import com.sim.geometries.RoadVector; +import com.sim.geometries.Vector23f; import com.sim.obj.CrossSection; import com.sim.roads.basic.BasicRoad; -import com.sim.terrain.basic.BasicTerrain; import com.sim.util.CollectionUtil; -import com.sim.util.ModelGenUtil; //import sim.basic.BasicLegType; diff --git a/roaddesign/src/main/java/com/sim/curves/HorizontalCurve.java b/roaddesign/src/main/java/com/sim/curves/HorizontalCurve.java index aeb1c16..15cfeb3 100644 --- a/roaddesign/src/main/java/com/sim/curves/HorizontalCurve.java +++ b/roaddesign/src/main/java/com/sim/curves/HorizontalCurve.java @@ -1,7 +1,6 @@ package com.sim.curves; import com.sim.geometries.RoadVector; -import com.sim.geometries.Vector23f; /** * Encapsulates parameters for a horizontal curve. diff --git a/roaddesign/src/main/java/com/sim/curves/ThreeCenteredCurve.java b/roaddesign/src/main/java/com/sim/curves/ThreeCenteredCurve.java index 1e4e788..1735eb8 100644 --- a/roaddesign/src/main/java/com/sim/curves/ThreeCenteredCurve.java +++ b/roaddesign/src/main/java/com/sim/curves/ThreeCenteredCurve.java @@ -1,11 +1,6 @@ package com.sim.curves; -import java.awt.Dimension; - -import java.awt.Toolkit; -import java.util.*; - -import javax.swing.JFrame; +import java.util.ArrayList; import com.sim.core.basic.ModelGenConsts; import com.sim.geometries.Vector23f; diff --git a/roaddesign/src/main/java/com/sim/curves/VerticalCurve.java b/roaddesign/src/main/java/com/sim/curves/VerticalCurve.java index a6bde34..b42a3a9 100644 --- a/roaddesign/src/main/java/com/sim/curves/VerticalCurve.java +++ b/roaddesign/src/main/java/com/sim/curves/VerticalCurve.java @@ -1,6 +1,6 @@ package com.sim.curves; -import com.sim.geometries.*; +import com.sim.geometries.RoadVector; /** * Encapsulates parameters for a vertical curve. diff --git a/roaddesign/src/main/java/com/sim/debug/DebugView.java b/roaddesign/src/main/java/com/sim/debug/DebugView.java index 97f418b..3a4be75 100644 --- a/roaddesign/src/main/java/com/sim/debug/DebugView.java +++ b/roaddesign/src/main/java/com/sim/debug/DebugView.java @@ -1,22 +1,11 @@ package com.sim.debug; -import java.awt.Dimension; - -import java.awt.Toolkit; -import java.util.*; +import java.util.ArrayList; import javax.swing.JDialog; -import javax.swing.JFrame; -import com.sim.central.RoadDesign; import com.sim.debug.components.DebugComponent; -import com.sim.debug.components.DebugMesh; import com.sim.debug.components.DebugPolyLine; import com.sim.geometries.RoadVector; -import com.sim.intersections.basic.BasicIntersection; -import com.sim.network.RoadNetwork; -import com.sim.roads.basic.BasicRoad; -//import sim.basic.BasicOuterPath; -//import sim.basic.BasicVectorMap; public class DebugView { diff --git a/roaddesign/src/main/java/com/sim/debug/SimpleViewer.java b/roaddesign/src/main/java/com/sim/debug/SimpleViewer.java index 54cc73c..0bd95ff 100644 --- a/roaddesign/src/main/java/com/sim/debug/SimpleViewer.java +++ b/roaddesign/src/main/java/com/sim/debug/SimpleViewer.java @@ -5,13 +5,11 @@ import java.awt.Toolkit; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import java.util.ArrayList; import javax.swing.JDialog; import javax.swing.JFrame; import com.sim.debug.components.DebugComponent; -import com.sim.geometries.Vector23f; public class SimpleViewer extends JDialog diff --git a/roaddesign/src/main/java/com/sim/debug/SimpleViewerPanel.java b/roaddesign/src/main/java/com/sim/debug/SimpleViewerPanel.java index eee6617..b4d4c60 100644 --- a/roaddesign/src/main/java/com/sim/debug/SimpleViewerPanel.java +++ b/roaddesign/src/main/java/com/sim/debug/SimpleViewerPanel.java @@ -7,19 +7,13 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -import java.awt.geom.Point2D; -import java.util.*; - +import java.util.ArrayList; import javax.swing.JPanel; -import com.sim.central.RoadDesign; import com.sim.debug.components.DebugComponent; -import com.sim.geometries.*; +import com.sim.geometries.Vector23f; import com.sim.gui.ThreeDEnv; -import com.sim.network.update.NetworkUpdate; -import com.sim.network.update.RoadAddUpdate; -import com.sim.network.update.RoadCloseUpdate; public class SimpleViewerPanel extends JPanel diff --git a/roaddesign/src/main/java/com/sim/debug/components/DebugComponent.java b/roaddesign/src/main/java/com/sim/debug/components/DebugComponent.java index 37991de..0950a02 100644 --- a/roaddesign/src/main/java/com/sim/debug/components/DebugComponent.java +++ b/roaddesign/src/main/java/com/sim/debug/components/DebugComponent.java @@ -1,6 +1,5 @@ package com.sim.debug.components; -import java.awt.Dimension; import java.awt.Graphics; import java.util.ArrayList; diff --git a/roaddesign/src/main/java/com/sim/geometries/RoadVector.java b/roaddesign/src/main/java/com/sim/geometries/RoadVector.java index 229a711..c68c871 100644 --- a/roaddesign/src/main/java/com/sim/geometries/RoadVector.java +++ b/roaddesign/src/main/java/com/sim/geometries/RoadVector.java @@ -4,7 +4,6 @@ import com.sim.core.basic.ModelGenConsts; import com.sim.curves.HorizontalCurve; import com.sim.curves.VerticalCurve; -import com.sim.intersections.basic.BasicIntersection; import com.sim.util.Duplicatable; diff --git a/roaddesign/src/main/java/com/sim/geometries/Vector23f.java b/roaddesign/src/main/java/com/sim/geometries/Vector23f.java index b1c29c0..5aefd82 100644 --- a/roaddesign/src/main/java/com/sim/geometries/Vector23f.java +++ b/roaddesign/src/main/java/com/sim/geometries/Vector23f.java @@ -1,9 +1,5 @@ package com.sim.geometries; -import java.awt.Color; - -import com.sim.curves.HorizontalCurve; -import com.sim.curves.VerticalCurve; import com.sim.util.CompareUtil; import com.sim.util.Duplicatable; diff --git a/roaddesign/src/main/java/com/sim/gui/JCurveDialog.java b/roaddesign/src/main/java/com/sim/gui/JCurveDialog.java index 26a954d..c6bb604 100644 --- a/roaddesign/src/main/java/com/sim/gui/JCurveDialog.java +++ b/roaddesign/src/main/java/com/sim/gui/JCurveDialog.java @@ -1,12 +1,19 @@ package com.sim.gui; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.HashMap; import java.util.Map; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; import com.sim.central.RoadDesign; import com.sim.curves.CurveParam; diff --git a/roaddesign/src/main/java/com/sim/gui/JRoadDesignFrame.java b/roaddesign/src/main/java/com/sim/gui/JRoadDesignFrame.java index d60db1b..37e9f16 100644 --- a/roaddesign/src/main/java/com/sim/gui/JRoadDesignFrame.java +++ b/roaddesign/src/main/java/com/sim/gui/JRoadDesignFrame.java @@ -3,28 +3,27 @@ //import sim.basic.BasicOuterPath; //import sim.basic.BasicVectorMap; - - - -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Map; -import javax.swing.*; -import javax.swing.border.EtchedBorder; -import com.sim.debug.DebugView; -import com.sim.debug.components.DebugMesh; -import com.sim.debug.components.DebugPolyLine; -import com.sim.geometries.RoadVector; -import com.sim.intersections.basic.BasicIntersection; -import com.sim.network.RoadNetwork; -import com.sim.roads.basic.BasicRoad; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JToolBar; +import javax.swing.KeyStroke; +import javax.swing.border.EtchedBorder; /** * This class arranges the graphical user interface for the entire application. diff --git a/roaddesign/src/main/java/com/sim/gui/JRoadDesignPanel.java b/roaddesign/src/main/java/com/sim/gui/JRoadDesignPanel.java index 2962336..75c8958 100644 --- a/roaddesign/src/main/java/com/sim/gui/JRoadDesignPanel.java +++ b/roaddesign/src/main/java/com/sim/gui/JRoadDesignPanel.java @@ -1,28 +1,9 @@ package com.sim.gui; -import java.awt.*; -import java.awt.event.*; -import java.awt.geom.Point2D; -import java.util.*; -import javax.swing.*; -import javax.swing.Timer; +import java.awt.Graphics; + +import javax.swing.JPanel; import com.sim.central.RoadDesign; -import com.sim.core.basic.DesignConsts; -import com.sim.core.basic.FlagUtil; -import com.sim.core.basic.ModelGenConsts; -import com.sim.core.basic.RoadShapeCalc; -import com.sim.curves.HorizontalCurve; -import com.sim.curves.VerticalCurve; -import com.sim.geometries.Geom3f; -import com.sim.geometries.Plane3f; -import com.sim.geometries.Ray3f; -import com.sim.geometries.RoadVector; -import com.sim.geometries.Vector23f; -import com.sim.intersections.Intersection; -import com.sim.intersections.basic.BasicIntersection; -import com.sim.roads.Road; -import com.sim.roads.basic.BasicRoad; -import com.sim.util.GraphicsUtil; /** diff --git a/roaddesign/src/main/java/com/sim/gui/JXsecChooser.java b/roaddesign/src/main/java/com/sim/gui/JXsecChooser.java index 080e5cd..f92f05b 100644 --- a/roaddesign/src/main/java/com/sim/gui/JXsecChooser.java +++ b/roaddesign/src/main/java/com/sim/gui/JXsecChooser.java @@ -1,11 +1,18 @@ package com.sim.gui; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; -import javax.swing.*; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JRadioButton; import javax.swing.filechooser.FileNameExtensionFilter; import com.sim.obj.CrossSection; diff --git a/roaddesign/src/main/java/com/sim/gui/JXsecDrawPanel.java b/roaddesign/src/main/java/com/sim/gui/JXsecDrawPanel.java index 9a64738..3a7f1da 100644 --- a/roaddesign/src/main/java/com/sim/gui/JXsecDrawPanel.java +++ b/roaddesign/src/main/java/com/sim/gui/JXsecDrawPanel.java @@ -1,15 +1,12 @@ package com.sim.gui; import java.awt.BasicStroke; - -import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Stroke; -import javax.swing.*; +import javax.swing.JPanel; -import com.sim.central.RoadDesign; import com.sim.obj.CrossSection; diff --git a/roaddesign/src/main/java/com/sim/gui/JXsecEditor.java b/roaddesign/src/main/java/com/sim/gui/JXsecEditor.java index 320101e..a79347b 100644 --- a/roaddesign/src/main/java/com/sim/gui/JXsecEditor.java +++ b/roaddesign/src/main/java/com/sim/gui/JXsecEditor.java @@ -1,19 +1,27 @@ package com.sim.gui; -import java.awt.*; - - -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.GridLayout; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.io.File; -import java.io.FileNotFoundException; -import java.util.Formatter; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; import javax.swing.filechooser.FileNameExtensionFilter; -import com.sim.central.Logging; import com.sim.central.RoadDesign; -import com.sim.core.basic.RoadShapeCalc; import com.sim.obj.CrossSection; diff --git a/roaddesign/src/main/java/com/sim/gui/handler/BasicIntersectionGUIHandler.java b/roaddesign/src/main/java/com/sim/gui/handler/BasicIntersectionGUIHandler.java index fa139a1..4a05228 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/BasicIntersectionGUIHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/BasicIntersectionGUIHandler.java @@ -1,13 +1,9 @@ package com.sim.gui.handler; import java.awt.Color; - - - import java.awt.Graphics; import java.util.ArrayList; -import com.sim.core.basic.ModelGenConsts; import com.sim.geometries.RoadVector; import com.sim.gui.ViewMode; import com.sim.intersections.basic.BasicIntersection; diff --git a/roaddesign/src/main/java/com/sim/gui/handler/BasicRoadGUIHandler.java b/roaddesign/src/main/java/com/sim/gui/handler/BasicRoadGUIHandler.java index 451938d..34b98d9 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/BasicRoadGUIHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/BasicRoadGUIHandler.java @@ -3,7 +3,6 @@ import java.awt.Graphics; import com.sim.gui.ViewMode; -import com.sim.roads.*; import com.sim.roads.basic.BasicRoad; import com.sim.util.GraphicsUtil; diff --git a/roaddesign/src/main/java/com/sim/gui/handler/GUIHandler.java b/roaddesign/src/main/java/com/sim/gui/handler/GUIHandler.java index e7a05c1..6e7ec93 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/GUIHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/GUIHandler.java @@ -3,7 +3,6 @@ import java.awt.Graphics; -import com.sim.gui.ThreeDEnv; import com.sim.gui.ViewMode; diff --git a/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java b/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java index 4571492..e7fd2a2 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java @@ -1,24 +1,19 @@ package com.sim.gui.handler; -import java.awt.event.*; -import java.awt.*; -import java.util.Map; - -import javax.swing.JComponent; -import javax.swing.JPanel; +import java.awt.Point; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; import com.sim.central.Logging; import com.sim.central.RoadDesign; -import com.sim.debug.Debug; -import com.sim.geometries.RoadVector; import com.sim.geometries.Vector23f; -import com.sim.network.RoadNetwork; import com.sim.network.update.NetworkUpdate; -import com.sim.network.update.NetworkUpdateHandler; import com.sim.network.update.RoadAddUpdate; import com.sim.network.update.RoadCloseUpdate; -import com.sim.roads.Road; /** @@ -72,10 +67,10 @@ public void mouseClicked(MouseEvent e) { if(left){ Logging.getLogger().info(String.format( - "PT_ADD: (%.3f, %.3f, %.3f)", v.x,v.y, v.z)); - System.out.printf("(%d,%d)\n", e.getX(), e.getY()); - }else{ - Logging.getLogger().info(String.format( + "PT_ADD: (%.3f, %.3f, %.3f)", v.x,v.y, v.z)); // outputs point add position to file and console + System.out.printf("(%d,%d)\n", e.getX(), e.getY());// outputs mouse click position to console + }else{ + Logging.getLogger().info(String.format( // outputs point close position to file and console "PT_CLOSE: (%.3f, %.3f, %.3f)", v.x,v.y, v.z)); } diff --git a/roaddesign/src/main/java/com/sim/gui/handler/NetworkGUIDrawer.java b/roaddesign/src/main/java/com/sim/gui/handler/NetworkGUIDrawer.java index 94bf20b..f5dcbed 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/NetworkGUIDrawer.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/NetworkGUIDrawer.java @@ -1,20 +1,12 @@ package com.sim.gui.handler; -import java.awt.Color; - - import java.awt.Graphics; -import java.util.ArrayList; import java.util.Iterator; -import com.sim.gui.ThreeDEnv; import com.sim.gui.ViewMode; import com.sim.intersections.Intersection; import com.sim.network.RoadNetwork; import com.sim.roads.Road; -import com.sim.util.GraphicsUtil; - -import com.sim.core.basic.*; /** * This class is able to draw a road network in one of diff --git a/roaddesign/src/main/java/com/sim/gui/handler/SaveHandler.java b/roaddesign/src/main/java/com/sim/gui/handler/SaveHandler.java index 1bba1de..0c1b964 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/SaveHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/SaveHandler.java @@ -1,16 +1,18 @@ package com.sim.gui.handler; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import java.io.FileNotFoundException; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; import com.sim.central.Logging; import com.sim.central.ModelPathState; import com.sim.central.RoadDesign; import com.sim.gui.FrameComponents; -import com.sim.util.ModelExporterUtils; /** * actionPerformed will be called when the user selects to click the save button @@ -60,7 +62,7 @@ public void actionPerformed(ActionEvent e) { if(state!=ModelPathState.EMPTY){ int userInput = RoadDesign.confirm(modelPath+ " is not empty!\n"+ - "Do you want to override these files.", + "Do you want to overwrite your existing road design?", "Saving model"); switch(userInput){ case JOptionPane.CANCEL_OPTION: @@ -97,6 +99,5 @@ private String askModelPath() throws FileNotFoundException{ } return modelPath; } - - + } diff --git a/roaddesign/src/main/java/com/sim/intersections/Intersection.java b/roaddesign/src/main/java/com/sim/intersections/Intersection.java index 1c8e601..2078dbe 100644 --- a/roaddesign/src/main/java/com/sim/intersections/Intersection.java +++ b/roaddesign/src/main/java/com/sim/intersections/Intersection.java @@ -1,12 +1,8 @@ package com.sim.intersections; -import java.util.*; - -import com.sim.geometries.Vector23f; import com.sim.gui.handler.GUIHandler; import com.sim.io.exporters.IntersectionExporter; -import com.sim.roads.Road; public abstract class Intersection implements Cloneable{ diff --git a/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersection.java b/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersection.java index a6806f6..a60a6ce 100644 --- a/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersection.java +++ b/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersection.java @@ -1,25 +1,10 @@ package com.sim.intersections.basic; -import java.awt.Dimension; - - - -import java.awt.Graphics; -import java.awt.Toolkit; -import java.util.*; - -import javax.swing.JFrame; -import javax.swing.JOptionPane; +import java.util.ArrayList; +import java.util.NavigableMap; import com.sim.central.RoadDesign; import com.sim.core.basic.DesignConsts; -import com.sim.core.basic.IntersectionCalcError; -import com.sim.core.basic.ModelGenConsts; -import com.sim.curves.ThreeCenteredCurve; -import com.sim.curves.ThreeCenteredTurnConsts; -import com.sim.debug.DebugView; -import com.sim.debug.components.DebugPoint; -import com.sim.debug.components.DebugPolyLine; import com.sim.geometries.RoadVector; import com.sim.geometries.Vector23f; import com.sim.gui.handler.BasicIntersectionGUIHandler; @@ -27,11 +12,7 @@ import com.sim.io.exporters.basic.BasicIntersectionExporter; import com.sim.network.RoadNetwork; import com.sim.obj.CrossSection; -import com.sim.roads.Road; import com.sim.roads.basic.BasicRoad; -import com.sim.util.CompareUtil; -import com.sim.util.CopyUtil; -import com.sim.util.GraphicsUtil; import com.sim.util.ModelGenUtil; diff --git a/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersectionBuilder.java b/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersectionBuilder.java index 45ec081..289ce84 100644 --- a/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersectionBuilder.java +++ b/roaddesign/src/main/java/com/sim/intersections/basic/BasicIntersectionBuilder.java @@ -6,7 +6,6 @@ import java.util.NavigableMap; import java.util.TreeMap; -import com.sim.core.basic.DesignConsts; import com.sim.core.basic.IntersectionCalcError; import com.sim.curves.ThreeCenteredCurve; import com.sim.curves.ThreeCenteredTurnConsts; @@ -19,7 +18,6 @@ import com.sim.roads.Road; import com.sim.roads.basic.BasicRoad; import com.sim.util.CopyUtil; -import com.sim.util.ModelGenUtil; import com.sim.util.TriangulatorAdapter; diff --git a/roaddesign/src/main/java/com/sim/intersections/basic/BasicLeg.java b/roaddesign/src/main/java/com/sim/intersections/basic/BasicLeg.java index 0c60196..096a55a 100644 --- a/roaddesign/src/main/java/com/sim/intersections/basic/BasicLeg.java +++ b/roaddesign/src/main/java/com/sim/intersections/basic/BasicLeg.java @@ -6,7 +6,6 @@ import com.sim.core.basic.DesignConsts; import com.sim.core.basic.RoadShapeCalc; import com.sim.geometries.RoadVector; -import com.sim.obj.CrossSection; import com.sim.roads.basic.BasicRoad; diff --git a/roaddesign/src/main/java/com/sim/io/exporters/IntersectionExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/IntersectionExporter.java index 8f7d1fc..83433af 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/IntersectionExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/IntersectionExporter.java @@ -1,9 +1,6 @@ package com.sim.io.exporters; import java.io.FileNotFoundException; -import java.util.Formatter; - -import com.sim.intersections.*; public abstract class IntersectionExporter { diff --git a/roaddesign/src/main/java/com/sim/io/exporters/NetworkExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/NetworkExporter.java index 0da0c7f..9ab1270 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/NetworkExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/NetworkExporter.java @@ -1,7 +1,6 @@ package com.sim.io.exporters; import java.io.FileNotFoundException; -import java.io.OutputStream; import com.sim.network.RoadNetwork; diff --git a/roaddesign/src/main/java/com/sim/io/exporters/RoadExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/RoadExporter.java index e1b5091..1dee7fc 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/RoadExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/RoadExporter.java @@ -1,9 +1,6 @@ package com.sim.io.exporters; import java.io.FileNotFoundException; -import java.util.Formatter; - -import com.sim.roads.*; public abstract class RoadExporter { diff --git a/roaddesign/src/main/java/com/sim/io/exporters/TerrainExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/TerrainExporter.java index 9607756..26489ba 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/TerrainExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/TerrainExporter.java @@ -2,8 +2,6 @@ import java.io.FileNotFoundException; -import com.sim.terrain.Terrain; - public abstract class TerrainExporter { /** diff --git a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicIntersectionExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicIntersectionExporter.java index 0224c95..faced28 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicIntersectionExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicIntersectionExporter.java @@ -1,7 +1,5 @@ package com.sim.io.exporters.basic; -import java.io.File; - import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Formatter; diff --git a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicNetworkExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicNetworkExporter.java index d84c4df..8d00e5f 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicNetworkExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicNetworkExporter.java @@ -1,24 +1,13 @@ package com.sim.io.exporters.basic; -import java.awt.Color; -import java.awt.image.BufferedImage; import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.Formatter; import java.util.Iterator; -import javax.imageio.ImageIO; - -import com.jme.math.Triangle; -import com.jme.math.Vector3f; -import com.jme.scene.TriMesh; import com.sim.central.RoadDesign; -import com.sim.geometries.Vector23f; import com.sim.intersections.Intersection; -import com.sim.intersections.basic.BasicIntersection; import com.sim.io.exporters.IntersectionExporter; import com.sim.io.exporters.NetworkExporter; import com.sim.io.exporters.RoadExporter; @@ -27,8 +16,6 @@ import com.sim.roads.Road; import com.sim.roads.basic.BasicRoad; import com.sim.util.ModelExporterUtils; -import com.sim.util.ModelGenUtil; -import com.sim.util.ModelImporter; public class BasicNetworkExporter extends NetworkExporter{ diff --git a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicRoadExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicRoadExporter.java index 6ef27a0..a3bd746 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicRoadExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicRoadExporter.java @@ -1,6 +1,5 @@ package com.sim.io.exporters.basic; -import java.io.File; import java.io.FileNotFoundException; import java.util.Formatter; diff --git a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicTerrainExporter.java b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicTerrainExporter.java index eeb1b7d..88c6c28 100644 --- a/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicTerrainExporter.java +++ b/roaddesign/src/main/java/com/sim/io/exporters/basic/BasicTerrainExporter.java @@ -1,6 +1,5 @@ package com.sim.io.exporters.basic; -import java.io.File; import java.io.FileNotFoundException; import java.util.Formatter; diff --git a/roaddesign/src/main/java/com/sim/network/RoadNetwork.java b/roaddesign/src/main/java/com/sim/network/RoadNetwork.java index 4bf1e14..8cfbac0 100644 --- a/roaddesign/src/main/java/com/sim/network/RoadNetwork.java +++ b/roaddesign/src/main/java/com/sim/network/RoadNetwork.java @@ -1,16 +1,13 @@ package com.sim.network; import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.Iterator; -import java.io.OutputStream; - -import java.util.*; - -import com.sim.geometries.*; -import com.sim.intersections.*; +import com.sim.intersections.Intersection; import com.sim.intersections.basic.BasicIntersection; import com.sim.io.exporters.NetworkExporter; -import com.sim.roads.*; +import com.sim.roads.Road; import com.sim.terrain.Terrain; import com.sim.terrain.basic.BasicTerrain; diff --git a/roaddesign/src/main/java/com/sim/network/RoadNetworkController.java b/roaddesign/src/main/java/com/sim/network/RoadNetworkController.java index 82ad973..96e398b 100644 --- a/roaddesign/src/main/java/com/sim/network/RoadNetworkController.java +++ b/roaddesign/src/main/java/com/sim/network/RoadNetworkController.java @@ -2,7 +2,9 @@ import java.awt.Graphics; import java.io.FileNotFoundException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Stack; import com.sim.central.Logging; import com.sim.central.RoadDesign; @@ -12,7 +14,11 @@ import com.sim.gui.handler.NetworkGUIDrawer; import com.sim.io.exporters.NetworkExporter; import com.sim.io.exporters.basic.BasicNetworkExporter; -import com.sim.network.update.*; +import com.sim.network.update.NetworkUpdate; +import com.sim.network.update.NetworkUpdateHandler; +import com.sim.network.update.NetworkUpdateType; +import com.sim.network.update.RoadAddHandler; +import com.sim.network.update.RoadCloseHandler; import com.sim.roads.Road; diff --git a/roaddesign/src/main/java/com/sim/network/update/NetworkUpdate.java b/roaddesign/src/main/java/com/sim/network/update/NetworkUpdate.java index 33fe0cd..7a94953 100644 --- a/roaddesign/src/main/java/com/sim/network/update/NetworkUpdate.java +++ b/roaddesign/src/main/java/com/sim/network/update/NetworkUpdate.java @@ -1,10 +1,5 @@ package com.sim.network.update; -import java.util.Map; - -import com.sim.network.RoadNetwork; - - public abstract class NetworkUpdate { public abstract NetworkUpdateType getType(); } \ No newline at end of file diff --git a/roaddesign/src/main/java/com/sim/network/update/NetworkUpdateHandler.java b/roaddesign/src/main/java/com/sim/network/update/NetworkUpdateHandler.java index fea6e92..5405f05 100644 --- a/roaddesign/src/main/java/com/sim/network/update/NetworkUpdateHandler.java +++ b/roaddesign/src/main/java/com/sim/network/update/NetworkUpdateHandler.java @@ -1,9 +1,7 @@ package com.sim.network.update; -import java.util.*; - -import com.sim.network.*; +import com.sim.network.RoadNetwork; public abstract class NetworkUpdateHandler { public static final int FAIL = -1; diff --git a/roaddesign/src/main/java/com/sim/network/update/RoadAddHandler.java b/roaddesign/src/main/java/com/sim/network/update/RoadAddHandler.java index e0fbbc0..6784ce7 100644 --- a/roaddesign/src/main/java/com/sim/network/update/RoadAddHandler.java +++ b/roaddesign/src/main/java/com/sim/network/update/RoadAddHandler.java @@ -1,14 +1,9 @@ package com.sim.network.update; -import java.util.ArrayList; - -import javax.swing.JOptionPane; - import com.sim.central.RoadDesign; import com.sim.geometries.RoadVector; import com.sim.intersections.basic.BasicIntersection; import com.sim.network.RoadNetwork; -import com.sim.obj.CrossSection; import com.sim.roads.Road; import com.sim.roads.RoadTypes; import com.sim.roads.basic.BasicRoad; diff --git a/roaddesign/src/main/java/com/sim/network/update/RoadAddUpdate.java b/roaddesign/src/main/java/com/sim/network/update/RoadAddUpdate.java index 7ccd15b..4f9b852 100644 --- a/roaddesign/src/main/java/com/sim/network/update/RoadAddUpdate.java +++ b/roaddesign/src/main/java/com/sim/network/update/RoadAddUpdate.java @@ -1,12 +1,6 @@ package com.sim.network.update; -import java.util.Map; - -import com.sim.geometries.RoadVector; import com.sim.geometries.Vector23f; -import com.sim.network.RoadNetwork; -import com.sim.obj.*; -import com.sim.roads.*; /** * This update request is created when the user left-click on the application diff --git a/roaddesign/src/main/java/com/sim/network/update/RoadCloseHandler.java b/roaddesign/src/main/java/com/sim/network/update/RoadCloseHandler.java index 69d56eb..51aa5ba 100644 --- a/roaddesign/src/main/java/com/sim/network/update/RoadCloseHandler.java +++ b/roaddesign/src/main/java/com/sim/network/update/RoadCloseHandler.java @@ -1,6 +1,5 @@ package com.sim.network.update; -import com.sim.geometries.Vector23f; import com.sim.network.RoadNetwork; import com.sim.roads.Road; diff --git a/roaddesign/src/main/java/com/sim/network/update/RoadCloseUpdate.java b/roaddesign/src/main/java/com/sim/network/update/RoadCloseUpdate.java index 69588a5..5d46379 100644 --- a/roaddesign/src/main/java/com/sim/network/update/RoadCloseUpdate.java +++ b/roaddesign/src/main/java/com/sim/network/update/RoadCloseUpdate.java @@ -1,8 +1,6 @@ package com.sim.network.update; import com.sim.geometries.Vector23f; -import com.sim.network.RoadNetwork; -import com.sim.roads.Road; public class RoadCloseUpdate extends NetworkUpdate{ diff --git a/roaddesign/src/main/java/com/sim/obj/CrossSection.java b/roaddesign/src/main/java/com/sim/obj/CrossSection.java index 7581d0d..f663e3f 100644 --- a/roaddesign/src/main/java/com/sim/obj/CrossSection.java +++ b/roaddesign/src/main/java/com/sim/obj/CrossSection.java @@ -1,8 +1,7 @@ package com.sim.obj; import java.io.File; - -import java.util.*; +import java.util.ArrayList; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -13,17 +12,13 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.sim.core.basic.DesignConsts; -import com.sim.core.basic.ModelGenConsts; import com.sim.core.basic.RoadShapeCalc; import com.sim.geometries.RoadVector; -import com.sim.util.CollectionUtil; diff --git a/roaddesign/src/main/java/com/sim/random/GeneralTest.java b/roaddesign/src/main/java/com/sim/random/GeneralTest.java index d7fa936..4ee02a1 100644 --- a/roaddesign/src/main/java/com/sim/random/GeneralTest.java +++ b/roaddesign/src/main/java/com/sim/random/GeneralTest.java @@ -7,8 +7,6 @@ import javax.imageio.ImageIO; -import com.sim.util.ModelExporterUtils; - public class GeneralTest { public static void main(String args[]) throws IOException{ BufferedImage im = ImageIO.read(new File("model\\height.bmp")); diff --git a/roaddesign/src/main/java/com/sim/random/HelloTerrain.java b/roaddesign/src/main/java/com/sim/random/HelloTerrain.java index 5c83795..124c64f 100644 --- a/roaddesign/src/main/java/com/sim/random/HelloTerrain.java +++ b/roaddesign/src/main/java/com/sim/random/HelloTerrain.java @@ -3,14 +3,12 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.net.URL; import javax.imageio.ImageIO; import javax.swing.ImageIcon; - + import com.jme.app.SimpleGame; import com.jme.bounding.BoundingBox; -import com.jme.image.Image; import com.jme.image.Texture; import com.jme.math.Vector3f; import com.jme.scene.state.TextureState; diff --git a/roaddesign/src/main/java/com/sim/random/MenuLookDemo.java b/roaddesign/src/main/java/com/sim/random/MenuLookDemo.java index ba64f5f..f92fe94 100644 --- a/roaddesign/src/main/java/com/sim/random/MenuLookDemo.java +++ b/roaddesign/src/main/java/com/sim/random/MenuLookDemo.java @@ -1,20 +1,22 @@ package com.sim.random; -import java.awt.*; -import java.awt.event.*; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JRadioButtonMenuItem; +import java.awt.BorderLayout; +import java.awt.Container; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + import javax.swing.ButtonGroup; -import javax.swing.JMenuBar; -import javax.swing.KeyStroke; import javax.swing.ImageIcon; - +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JPanel; -import javax.swing.JTextArea; +import javax.swing.JRadioButtonMenuItem; import javax.swing.JScrollPane; -import javax.swing.JFrame; +import javax.swing.JTextArea; +import javax.swing.KeyStroke; /* MenuLookDemo.java requires images/middle.gif. */ diff --git a/roaddesign/src/main/java/com/sim/random/PropertiesTest.java b/roaddesign/src/main/java/com/sim/random/PropertiesTest.java index 41bb63f..a32a44e 100644 --- a/roaddesign/src/main/java/com/sim/random/PropertiesTest.java +++ b/roaddesign/src/main/java/com/sim/random/PropertiesTest.java @@ -1,7 +1,8 @@ package com.sim.random; -import java.io.*; -import java.util.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; public class PropertiesTest { public static void main(String args[]){ diff --git a/roaddesign/src/main/java/com/sim/random/RoadUtil.java b/roaddesign/src/main/java/com/sim/random/RoadUtil.java index 8d1f816..3b26415 100644 --- a/roaddesign/src/main/java/com/sim/random/RoadUtil.java +++ b/roaddesign/src/main/java/com/sim/random/RoadUtil.java @@ -4,7 +4,7 @@ import java.nio.IntBuffer; -import java.util.*; + //import com.jme.math.Vector3f; import com.jme.math.Vector3f; import com.jmex.font3d.math.Triangulator; diff --git a/roaddesign/src/main/java/com/sim/random/Stroke1.java b/roaddesign/src/main/java/com/sim/random/Stroke1.java index 79104b2..115984e 100644 --- a/roaddesign/src/main/java/com/sim/random/Stroke1.java +++ b/roaddesign/src/main/java/com/sim/random/Stroke1.java @@ -1,7 +1,11 @@ package com.sim.random; -import javax.swing.*; -import java.awt.*; -import java.awt.geom.*; +import java.awt.BasicStroke; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Stroke; +import java.awt.geom.Line2D; + +import javax.swing.JFrame; public class Stroke1 extends JFrame { diff --git a/roaddesign/src/main/java/com/sim/random/TabbedPaneDemo.java b/roaddesign/src/main/java/com/sim/random/TabbedPaneDemo.java index 038a56e..b98e063 100644 --- a/roaddesign/src/main/java/com/sim/random/TabbedPaneDemo.java +++ b/roaddesign/src/main/java/com/sim/random/TabbedPaneDemo.java @@ -1,17 +1,17 @@ package com.sim.random; -import javax.swing.JTabbedPane; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JFrame; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridLayout; import java.awt.event.KeyEvent; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; + public class TabbedPaneDemo extends JPanel { public TabbedPaneDemo() { super(new GridLayout(1, 1)); diff --git a/roaddesign/src/main/java/com/sim/random/WriteXMLFile.java b/roaddesign/src/main/java/com/sim/random/WriteXMLFile.java index d32f0bf..9ed7122 100644 --- a/roaddesign/src/main/java/com/sim/random/WriteXMLFile.java +++ b/roaddesign/src/main/java/com/sim/random/WriteXMLFile.java @@ -1,5 +1,6 @@ package com.sim.random; import java.io.File; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -8,7 +9,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - + import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/roaddesign/src/main/java/com/sim/renderer/AutoGenLoader.java b/roaddesign/src/main/java/com/sim/renderer/AutoGenLoader.java index 9432804..f0bba14 100644 --- a/roaddesign/src/main/java/com/sim/renderer/AutoGenLoader.java +++ b/roaddesign/src/main/java/com/sim/renderer/AutoGenLoader.java @@ -1,25 +1,16 @@ package com.sim.renderer; -import java.awt.Color; -import java.awt.Image; import java.awt.image.BufferedImage; -import java.awt.image.Raster; -import java.io.*; - - -import java.net.URL; - -import java.util.*; +import java.io.File; +import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.zip.DataFormatException; import javax.imageio.ImageIO; import com.jme.app.BaseGame; import com.jme.app.SimpleGame; -import com.jme.bounding.BoundingBox; import com.jme.image.Texture; import com.jme.input.FirstPersonHandler; import com.jme.input.InputHandler; @@ -28,20 +19,16 @@ import com.jme.input.MouseInput; import com.jme.input.joystick.JoystickInput; import com.jme.light.PointLight; -import com.jme.math.Vector2f; import com.jme.math.Vector3f; import com.jme.renderer.Camera; import com.jme.renderer.ColorRGBA; import com.jme.scene.Node; import com.jme.scene.Skybox; import com.jme.scene.Spatial; -import com.jme.scene.TexCoords; +import com.jme.scene.Spatial.TextureCombineMode; import com.jme.scene.Text; import com.jme.scene.TriMesh; -import com.jme.scene.Spatial.TextureCombineMode; -import com.jme.scene.shape.Box; import com.jme.scene.state.BlendState; -import com.jme.scene.state.CullState; import com.jme.scene.state.LightState; import com.jme.scene.state.TextureState; import com.jme.scene.state.WireframeState; @@ -50,20 +37,16 @@ import com.jme.system.JmeException; import com.jme.util.TextureManager; import com.jme.util.Timer; -import com.jme.util.geom.BufferUtils; import com.jme.util.geom.Debugger; -import com.jme.util.resource.ResourceLocatorTool; -import com.jme.util.resource.SimpleResourceLocator; import com.jmex.terrain.TerrainBlock; import com.jmex.terrain.util.ImageBasedHeightMap; import com.sim.central.RoadDesign; import com.sim.io.exporters.basic.BasicHeightMapExporter; -import com.sim.util.CompareUtil; import com.sim.util.ModelImporter; /** * Started Date: Jul 29, 2004
- * Revised Date: Jun 11, 2012
+ * Revised Date: Nov 8, 2015
*
* * Is used to demonstrate the inner workings of SimpleGame. @@ -83,12 +66,9 @@ public class AutoGenLoader extends BaseGame { public static final int YELLOW_MARKER = 4; public static final int PAVEMENT = 5; - private static final Logger logger = Logger.getLogger(AutoGenLoader.class + private static final Logger logger = Logger.getLogger(AutoGenLoader.class // this logger is used to log game activity and separate from the logger in the com.sim.central package .getName()); -// public static String MODEL_PATH="RoadModel\\model20"; -// public static String MESH_FILE; - public static void main(String[] args) throws IOException { AutoGenLoader app = new AutoGenLoader(); @@ -204,11 +184,6 @@ private void updateCamera(){ cam.update(); } -// private float preEle = Float.NaN; -// private int preRow = Integer.MAX_VALUE; -// private int preCol = Integer.MAX_VALUE; -// private static long counter = 0; - /** * Given the camera's position in XY plane, finds its elevation in a height map. * @@ -260,38 +235,9 @@ private float getElevation(BufferedImage heightMap, float x, float y, float[] ra } return ele; } -// float alpha = 0.2f; -// if(!Float.isNaN(preEle)) -// ele = ele*(1-alpha)+alpha*preEle; - -// float ele = (1-v)*((1-u)*eleBL+u*eleBR) + v*((1-u)*eleTL+u*eleTR); - -// if(counter%20==0){ -// System.out.printf("x=%.3f, y=%.3f, col=%d, row=%d, BL=%.3f, BR=%.3f, TL=%.3f, TR=%.3f, u=%.3f, v=%.3f preEle =%.3f ele=%.3f\n", -// x, y, col, row, eleBL, eleBR, eleTL, eleTR, u, v, preEle, ele); -// counter=0; -// }else{ -// counter++; -// } - -/* - if(CompareUtil.floatCompare(ele-preEle, 0)){ - // row!=preRow || col!=preCol){ - System.out.printf("x=%.3f, y=%.3f, col=%d, row=%d, BL=%.3f, BR=%.3f, TL=%.3f, TR=%.3f, u=%.3f, v=%.3f preEle =%.3f ele=%.3f\n", - x, y, col, row, eleBL, eleBR, eleTL, eleTR, u, v, preEle, ele); - } - preRow = row; - preCol = col; - preEle = ele; - return ele; - } -*/ public void closeDisplaySystem(){ super.quit(); -// if(!display.isClosing()){ -// display.close(); -// } } /** @@ -306,7 +252,6 @@ protected final void render(float interpolation) { display.getRenderer().clearBuffers(); /** Draw the rootNode and all its children. */ display.getRenderer().draw(rootNode); - /** * If showing bounds, draw rootNode's bounds, and the bounds of all its * children. @@ -316,7 +261,7 @@ protected final void render(float interpolation) { /** Draw the fps node to show the fancy information at the bottom. */ display.getRenderer().draw(fpsNode); /** Call simpleRender() in any derived classes. */ - simpleRender(); + simpleRender(); } /** A sky box for our scene. */ @@ -361,9 +306,11 @@ protected final void initSystem() { /** set up the model IO (Written by Dahai Guo) **/ -// AutoGenIO.display = display; ModelImporter.display = display; + /** enable Vsync to reduce CPU and GPU Utilization (3000 FPS is a waste of resources */ + display.setVSyncEnabled(true); + Vector3f [] camParams = new Vector3f[4]; camParams[0] = new Vector3f(); // loc camParams[1] = new Vector3f(); // dir @@ -379,12 +326,6 @@ protected final void initSystem() { heightMapRaster = (short[]) heightMap.getData().getDataElements(0, 0, heightMap.getWidth(), heightMap.getHeight(), null); -// System.out.printf("The heightmap length is %d\n", heightMapRaster.length); -// System.out.printf("(256,256): %d\n", heightMapRaster[512*256+256]); -// System.out.printf("(257,256): %d\n", heightMapRaster[512*256+257]); -// System.out.printf("(256,257): %d\n", heightMapRaster[512*257+256]); -// System.out.printf("(257,257): %d\n", heightMapRaster[512*257+257]); - BufferedImage im = ImageIO.read(new File("model//height.png")); ImageBasedHeightMap ib=new ImageBasedHeightMap(im); tb = new TerrainBlock("heightmap", ib.getSize(), @@ -404,17 +345,13 @@ protected final void initSystem() { } sb = ModelImporter.setupSky(); -// sb.setLocalTranslation(centroid.x, centroid.y, 0); /** Set up how our camera sees. */ -// cam.setFrustumPerspective(45.0f, (float) display.getWidth() -// / (float) display.getHeight(), 1, 1000); cam.setFrustumPerspective(60.0f, (float) display.getWidth() / (float) display.getHeight(), 1, 5000); /** Move our camera to a correct place and orientation. */ cam.setFrame(camParams[0], camParams[1], camParams[2], camParams[3]); -// cam.setFrame(loc, left, up, dir); /** Signal that we've changed our camera's location/frustum. */ cam.update(); /** Assign the camera to this renderer. */ diff --git a/roaddesign/src/main/java/com/sim/roads/Road.java b/roaddesign/src/main/java/com/sim/roads/Road.java index d73abad..1ffbf15 100644 --- a/roaddesign/src/main/java/com/sim/roads/Road.java +++ b/roaddesign/src/main/java/com/sim/roads/Road.java @@ -1,7 +1,7 @@ package com.sim.roads; import com.sim.geometries.RoadVector; -import com.sim.gui.handler.*; +import com.sim.gui.handler.GUIHandler; import com.sim.io.exporters.RoadExporter; import com.sim.network.RoadNetwork; import com.sim.roads.basic.BasicRoad; diff --git a/roaddesign/src/main/java/com/sim/roads/basic/BasicRoad.java b/roaddesign/src/main/java/com/sim/roads/basic/BasicRoad.java index 2acde21..70451a3 100644 --- a/roaddesign/src/main/java/com/sim/roads/basic/BasicRoad.java +++ b/roaddesign/src/main/java/com/sim/roads/basic/BasicRoad.java @@ -1,33 +1,22 @@ package com.sim.roads.basic; -import java.awt.Container; - - - -import java.awt.Graphics; - -import java.util.*; - -import javax.swing.JOptionPane; +import java.util.ArrayList; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Set; +import java.util.TreeMap; import com.sim.central.RoadDesign; -import com.sim.core.basic.IntersectionCalcError; -import com.sim.core.basic.RoadShapeCalc; import com.sim.curves.CurveParam; -import com.sim.curves.HorizontalCurve; -import com.sim.curves.VerticalCurve; import com.sim.geometries.RoadVector; -import com.sim.geometries.Vector23f; import com.sim.gui.handler.BasicRoadGUIHandler; -import com.sim.intersections.*; +import com.sim.intersections.Intersection; import com.sim.intersections.basic.BasicLegType; import com.sim.io.exporters.basic.BasicRoadExporter; import com.sim.network.RoadNetwork; import com.sim.obj.CrossSection; import com.sim.roads.Road; import com.sim.util.CopyUtil; - -import com.sim.util.GraphicsUtil; import com.sim.util.SearchUtil; diff --git a/roaddesign/src/main/java/com/sim/terrain/Terrain.java b/roaddesign/src/main/java/com/sim/terrain/Terrain.java index 9a9de31..d4a7143 100644 --- a/roaddesign/src/main/java/com/sim/terrain/Terrain.java +++ b/roaddesign/src/main/java/com/sim/terrain/Terrain.java @@ -1,8 +1,9 @@ package com.sim.terrain; import java.util.ArrayList; + import com.sim.geometries.RoadVector; -import com.sim.gui.handler.*; +import com.sim.gui.handler.GUIHandler; import com.sim.io.exporters.TerrainExporter; import com.sim.network.RoadNetwork; diff --git a/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrain.java b/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrain.java index 016d04c..cb28a60 100644 --- a/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrain.java +++ b/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrain.java @@ -3,16 +3,11 @@ import java.util.ArrayList; import com.sim.central.RoadDesign; -import com.sim.debug.DebugView; -import com.sim.debug.components.DebugPolyLine; import com.sim.geometries.RoadVector; import com.sim.gui.handler.BasicTerrainGUIHandler; -import com.sim.gui.handler.GUIHandler; -import com.sim.gui.handler.NetworkGUIDrawer; import com.sim.io.exporters.basic.BasicTerrainExporter; import com.sim.network.RoadNetwork; import com.sim.terrain.Terrain; -import com.sim.util.TriangulatorAdapter; diff --git a/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrainBuilder.java b/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrainBuilder.java index 77ff582..246cce6 100644 --- a/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrainBuilder.java +++ b/roaddesign/src/main/java/com/sim/terrain/basic/BasicTerrainBuilder.java @@ -2,7 +2,6 @@ import java.util.ArrayList; -import com.sim.central.Logging; import com.sim.geometries.RoadVector; import com.sim.network.RoadNetwork; import com.sim.terrain.TerrainBuilder; diff --git a/roaddesign/src/main/java/com/sim/terrain/basic/BasicVectorMap.java b/roaddesign/src/main/java/com/sim/terrain/basic/BasicVectorMap.java index 6934d6e..96c022b 100644 --- a/roaddesign/src/main/java/com/sim/terrain/basic/BasicVectorMap.java +++ b/roaddesign/src/main/java/com/sim/terrain/basic/BasicVectorMap.java @@ -1,13 +1,9 @@ package com.sim.terrain.basic; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; -import com.sim.debug.DebugView; -import com.sim.debug.components.DebugMesh; -import com.sim.debug.components.DebugPolyLine; import com.sim.geometries.RoadVector; import com.sim.intersections.Intersection; import com.sim.intersections.basic.BasicIntersection; diff --git a/roaddesign/src/main/java/com/sim/util/CollectionUtil.java b/roaddesign/src/main/java/com/sim/util/CollectionUtil.java index 2a57dce..6965f08 100644 --- a/roaddesign/src/main/java/com/sim/util/CollectionUtil.java +++ b/roaddesign/src/main/java/com/sim/util/CollectionUtil.java @@ -1,6 +1,11 @@ package com.sim.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.NavigableMap; +import java.util.Set; public class CollectionUtil { diff --git a/roaddesign/src/main/java/com/sim/util/CopyUtil.java b/roaddesign/src/main/java/com/sim/util/CopyUtil.java index e504ee5..5049ba5 100644 --- a/roaddesign/src/main/java/com/sim/util/CopyUtil.java +++ b/roaddesign/src/main/java/com/sim/util/CopyUtil.java @@ -1,9 +1,7 @@ package com.sim.util; -import java.util.*; - -import com.sim.geometries.*; +import java.util.ArrayList; public class CopyUtil { diff --git a/roaddesign/src/main/java/com/sim/util/GraphicsUtil.java b/roaddesign/src/main/java/com/sim/util/GraphicsUtil.java index 0f96b84..7018247 100644 --- a/roaddesign/src/main/java/com/sim/util/GraphicsUtil.java +++ b/roaddesign/src/main/java/com/sim/util/GraphicsUtil.java @@ -2,20 +2,17 @@ import java.awt.BasicStroke; - import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Stroke; -import java.awt.geom.Point2D; import java.util.ArrayList; -import com.sim.core.basic.FlagUtil; import com.sim.core.basic.ModelGenConsts; import com.sim.geometries.RoadVector; import com.sim.geometries.Vector23f; -import com.sim.gui.*; +import com.sim.gui.ThreeDEnv; /** diff --git a/roaddesign/src/main/java/com/sim/util/ModelExporterUtils.java b/roaddesign/src/main/java/com/sim/util/ModelExporterUtils.java index 4d5a2b1..56be3e7 100644 --- a/roaddesign/src/main/java/com/sim/util/ModelExporterUtils.java +++ b/roaddesign/src/main/java/com/sim/util/ModelExporterUtils.java @@ -1,25 +1,12 @@ package com.sim.util; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.channels.FileChannel; -import java.nio.channels.FileLock; -import java.nio.channels.OverlappingFileLockException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Formatter; -import java.util.Scanner; -import com.sim.central.ModelPathState; -import com.sim.central.RoadDesign; import com.sim.core.basic.DesignConsts; import com.sim.core.basic.ModelGenConsts; import com.sim.geometries.RoadVector; -import com.sim.intersections.Intersection; import com.sim.obj.CrossSection; -import com.sim.roads.basic.BasicRoad; public class ModelExporterUtils { diff --git a/roaddesign/src/main/java/com/sim/util/ModelGenUtil.java b/roaddesign/src/main/java/com/sim/util/ModelGenUtil.java index b879bbc..02c0509 100644 --- a/roaddesign/src/main/java/com/sim/util/ModelGenUtil.java +++ b/roaddesign/src/main/java/com/sim/util/ModelGenUtil.java @@ -1,8 +1,10 @@ package com.sim.util; -import java.util.*; +import java.util.ArrayList; -import com.sim.geometries.*; +import com.sim.geometries.Circle2f; +import com.sim.geometries.RoadVector; +import com.sim.geometries.Vector23f; public class ModelGenUtil { diff --git a/roaddesign/src/main/java/com/sim/util/ModelImporter.java b/roaddesign/src/main/java/com/sim/util/ModelImporter.java index 8d2de2a..8eb114a 100644 --- a/roaddesign/src/main/java/com/sim/util/ModelImporter.java +++ b/roaddesign/src/main/java/com/sim/util/ModelImporter.java @@ -5,30 +5,18 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Scanner; -import java.util.Set; import java.util.zip.DataFormatException; import javax.imageio.ImageIO; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import com.jme.image.Texture; import com.jme.math.Vector2f; import com.jme.math.Vector3f; -import com.jme.renderer.ColorRGBA; import com.jme.scene.Skybox; import com.jme.scene.TexCoords; import com.jme.scene.TriMesh; diff --git a/roaddesign/src/main/java/com/sim/util/ModelXMLReader.java b/roaddesign/src/main/java/com/sim/util/ModelXMLReader.java index 571f7ba..9a76214 100644 --- a/roaddesign/src/main/java/com/sim/util/ModelXMLReader.java +++ b/roaddesign/src/main/java/com/sim/util/ModelXMLReader.java @@ -1,7 +1,10 @@ package com.sim.util; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/roaddesign/src/main/java/com/sim/util/TriangulatorAdapter.java b/roaddesign/src/main/java/com/sim/util/TriangulatorAdapter.java index caf56e3..0533b43 100644 --- a/roaddesign/src/main/java/com/sim/util/TriangulatorAdapter.java +++ b/roaddesign/src/main/java/com/sim/util/TriangulatorAdapter.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Collections; - import com.jme.math.Vector3f; import com.jmex.font3d.math.Triangulator; import com.sim.geometries.RoadVector; diff --git a/roaddesign/target/classes/.gitignore b/roaddesign/target/classes/.gitignore new file mode 100644 index 0000000..c2d9872 --- /dev/null +++ b/roaddesign/target/classes/.gitignore @@ -0,0 +1 @@ +/com/ diff --git a/roaddesign/target/classes/com/sim/central/Builders.class b/roaddesign/target/classes/com/sim/central/Builders.class index 5b5a5a3..795f622 100644 Binary files a/roaddesign/target/classes/com/sim/central/Builders.class and b/roaddesign/target/classes/com/sim/central/Builders.class differ diff --git a/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class b/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class index 2947828..8d4bbf1 100644 Binary files a/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class and b/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class differ diff --git a/roaddesign/target/classes/com/sim/central/Logging.class b/roaddesign/target/classes/com/sim/central/Logging.class index 453de08..d46212c 100644 Binary files a/roaddesign/target/classes/com/sim/central/Logging.class and b/roaddesign/target/classes/com/sim/central/Logging.class differ diff --git a/roaddesign/target/classes/com/sim/central/RoadDesign$1.class b/roaddesign/target/classes/com/sim/central/RoadDesign$1.class index 564f888..becb210 100644 Binary files a/roaddesign/target/classes/com/sim/central/RoadDesign$1.class and b/roaddesign/target/classes/com/sim/central/RoadDesign$1.class differ diff --git a/roaddesign/target/classes/com/sim/central/RoadDesign.class b/roaddesign/target/classes/com/sim/central/RoadDesign.class index bd131bc..00574c3 100644 Binary files a/roaddesign/target/classes/com/sim/central/RoadDesign.class and b/roaddesign/target/classes/com/sim/central/RoadDesign.class differ diff --git a/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class b/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class index 379ed6c..01b8e85 100644 Binary files a/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class and b/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class differ diff --git a/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class b/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class index 8c875d6..b3f78d4 100644 Binary files a/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class and b/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class differ diff --git a/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class b/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class index c12a094..0f431db 100644 Binary files a/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class and b/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class differ diff --git a/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class b/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class index 7156579..ffbc13d 100644 Binary files a/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class and b/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class differ diff --git a/roaddesign/target/classes/com/sim/debug/DebugView.class b/roaddesign/target/classes/com/sim/debug/DebugView.class index 38d1e5f..3e432de 100644 Binary files a/roaddesign/target/classes/com/sim/debug/DebugView.class and b/roaddesign/target/classes/com/sim/debug/DebugView.class differ diff --git a/roaddesign/target/classes/com/sim/debug/SimpleViewer.class b/roaddesign/target/classes/com/sim/debug/SimpleViewer.class index f0bf226..50883f7 100644 Binary files a/roaddesign/target/classes/com/sim/debug/SimpleViewer.class and b/roaddesign/target/classes/com/sim/debug/SimpleViewer.class differ diff --git a/roaddesign/target/classes/com/sim/debug/SimpleViewerPanel.class b/roaddesign/target/classes/com/sim/debug/SimpleViewerPanel.class index 98b6b9e..208c36d 100644 Binary files a/roaddesign/target/classes/com/sim/debug/SimpleViewerPanel.class and b/roaddesign/target/classes/com/sim/debug/SimpleViewerPanel.class differ diff --git a/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class b/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class index 103f261..fdd2803 100644 Binary files a/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class and b/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class differ diff --git a/roaddesign/target/classes/com/sim/geometries/RoadVector.class b/roaddesign/target/classes/com/sim/geometries/RoadVector.class index 828302f..8d9402f 100644 Binary files a/roaddesign/target/classes/com/sim/geometries/RoadVector.class and b/roaddesign/target/classes/com/sim/geometries/RoadVector.class differ diff --git a/roaddesign/target/classes/com/sim/geometries/Vector23f.class b/roaddesign/target/classes/com/sim/geometries/Vector23f.class index 7321b62..cb43b5e 100644 Binary files a/roaddesign/target/classes/com/sim/geometries/Vector23f.class and b/roaddesign/target/classes/com/sim/geometries/Vector23f.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JCurveDialog.class b/roaddesign/target/classes/com/sim/gui/JCurveDialog.class index 52c92b8..7a70811 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JCurveDialog.class and b/roaddesign/target/classes/com/sim/gui/JCurveDialog.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JRoadDesignFrame.class b/roaddesign/target/classes/com/sim/gui/JRoadDesignFrame.class index b17e58d..883d0d8 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JRoadDesignFrame.class and b/roaddesign/target/classes/com/sim/gui/JRoadDesignFrame.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JRoadDesignPanel.class b/roaddesign/target/classes/com/sim/gui/JRoadDesignPanel.class index 05d80e4..0bac9d0 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JRoadDesignPanel.class and b/roaddesign/target/classes/com/sim/gui/JRoadDesignPanel.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JXsecChooser.class b/roaddesign/target/classes/com/sim/gui/JXsecChooser.class index a97f102..8aeff13 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JXsecChooser.class and b/roaddesign/target/classes/com/sim/gui/JXsecChooser.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class b/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class index b455954..ac88ef7 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class and b/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class differ diff --git a/roaddesign/target/classes/com/sim/gui/JXsecEditor.class b/roaddesign/target/classes/com/sim/gui/JXsecEditor.class index c870b1b..10f2c86 100644 Binary files a/roaddesign/target/classes/com/sim/gui/JXsecEditor.class and b/roaddesign/target/classes/com/sim/gui/JXsecEditor.class differ diff --git a/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class b/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class index df09edd..4a36ed3 100644 Binary files a/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class and b/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class differ diff --git a/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class b/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class index 299a170..adb7951 100644 Binary files a/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class and b/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class differ diff --git a/roaddesign/target/classes/com/sim/gui/handler/MainMouseHandler.class b/roaddesign/target/classes/com/sim/gui/handler/MainMouseHandler.class index 2dc16a5..da46437 100644 Binary files a/roaddesign/target/classes/com/sim/gui/handler/MainMouseHandler.class and b/roaddesign/target/classes/com/sim/gui/handler/MainMouseHandler.class differ diff --git a/roaddesign/target/classes/com/sim/gui/handler/NetworkGUIDrawer.class b/roaddesign/target/classes/com/sim/gui/handler/NetworkGUIDrawer.class index 7ef507c..86ace2a 100644 Binary files a/roaddesign/target/classes/com/sim/gui/handler/NetworkGUIDrawer.class and b/roaddesign/target/classes/com/sim/gui/handler/NetworkGUIDrawer.class differ diff --git a/roaddesign/target/classes/com/sim/gui/handler/SaveHandler.class b/roaddesign/target/classes/com/sim/gui/handler/SaveHandler.class index cef829a..a3d4855 100644 Binary files a/roaddesign/target/classes/com/sim/gui/handler/SaveHandler.class and b/roaddesign/target/classes/com/sim/gui/handler/SaveHandler.class differ diff --git a/roaddesign/target/classes/com/sim/intersections/Intersection.class b/roaddesign/target/classes/com/sim/intersections/Intersection.class index 26d9e01..9a275cc 100644 Binary files a/roaddesign/target/classes/com/sim/intersections/Intersection.class and b/roaddesign/target/classes/com/sim/intersections/Intersection.class differ diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class index 0ad2313..8eeb026 100644 Binary files a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class and b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class differ diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class index a6e2a20..bd8cc36 100644 Binary files a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class and b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class differ diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class index b58f201..d89723e 100644 Binary files a/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class and b/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class b/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class index cfd5342..217166a 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/NetworkExporter.class b/roaddesign/target/classes/com/sim/io/exporters/NetworkExporter.class index f4f7295..8bdda03 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/NetworkExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/NetworkExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/RoadExporter.class b/roaddesign/target/classes/com/sim/io/exporters/RoadExporter.class index c1ee433..a62899f 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/RoadExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/RoadExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/TerrainExporter.class b/roaddesign/target/classes/com/sim/io/exporters/TerrainExporter.class index 2c0837e..25c5708 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/TerrainExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/TerrainExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicIntersectionExporter.class b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicIntersectionExporter.class index df81762..12ce0d6 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicIntersectionExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicIntersectionExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicNetworkExporter.class b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicNetworkExporter.class index 2d2bff1..7528588 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicNetworkExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicNetworkExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicRoadExporter.class b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicRoadExporter.class index 1596ec2..d75f689 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicRoadExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicRoadExporter.class differ diff --git a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicTerrainExporter.class b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicTerrainExporter.class index 10fea34..26b98d2 100644 Binary files a/roaddesign/target/classes/com/sim/io/exporters/basic/BasicTerrainExporter.class and b/roaddesign/target/classes/com/sim/io/exporters/basic/BasicTerrainExporter.class differ diff --git a/roaddesign/target/classes/com/sim/network/RoadNetwork.class b/roaddesign/target/classes/com/sim/network/RoadNetwork.class index bdcb702..35ad6fb 100644 Binary files a/roaddesign/target/classes/com/sim/network/RoadNetwork.class and b/roaddesign/target/classes/com/sim/network/RoadNetwork.class differ diff --git a/roaddesign/target/classes/com/sim/network/RoadNetworkController.class b/roaddesign/target/classes/com/sim/network/RoadNetworkController.class index e2e8260..0b347fb 100644 Binary files a/roaddesign/target/classes/com/sim/network/RoadNetworkController.class and b/roaddesign/target/classes/com/sim/network/RoadNetworkController.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class b/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class index e46de8c..8a61e82 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class and b/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class b/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class index 7b6d678..8ec2a2a 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class and b/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/RoadAddHandler.class b/roaddesign/target/classes/com/sim/network/update/RoadAddHandler.class index e59ecec..fecb2ef 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/RoadAddHandler.class and b/roaddesign/target/classes/com/sim/network/update/RoadAddHandler.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/RoadAddUpdate.class b/roaddesign/target/classes/com/sim/network/update/RoadAddUpdate.class index f5026fe..2a7ec6e 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/RoadAddUpdate.class and b/roaddesign/target/classes/com/sim/network/update/RoadAddUpdate.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class b/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class index 2d43b22..345986c 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class and b/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class differ diff --git a/roaddesign/target/classes/com/sim/network/update/RoadCloseUpdate.class b/roaddesign/target/classes/com/sim/network/update/RoadCloseUpdate.class index efe8b9a..27ee4fd 100644 Binary files a/roaddesign/target/classes/com/sim/network/update/RoadCloseUpdate.class and b/roaddesign/target/classes/com/sim/network/update/RoadCloseUpdate.class differ diff --git a/roaddesign/target/classes/com/sim/obj/CrossSection.class b/roaddesign/target/classes/com/sim/obj/CrossSection.class index a95306b..a31c61b 100644 Binary files a/roaddesign/target/classes/com/sim/obj/CrossSection.class and b/roaddesign/target/classes/com/sim/obj/CrossSection.class differ diff --git a/roaddesign/target/classes/com/sim/random/GeneralTest.class b/roaddesign/target/classes/com/sim/random/GeneralTest.class index f36e0ee..e2e7ab1 100644 Binary files a/roaddesign/target/classes/com/sim/random/GeneralTest.class and b/roaddesign/target/classes/com/sim/random/GeneralTest.class differ diff --git a/roaddesign/target/classes/com/sim/random/HelloTerrain.class b/roaddesign/target/classes/com/sim/random/HelloTerrain.class index a934249..7631784 100644 Binary files a/roaddesign/target/classes/com/sim/random/HelloTerrain.class and b/roaddesign/target/classes/com/sim/random/HelloTerrain.class differ diff --git a/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class b/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class index b797ebd..e7a5e56 100644 Binary files a/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class and b/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class differ diff --git a/roaddesign/target/classes/com/sim/random/MenuLookDemo.class b/roaddesign/target/classes/com/sim/random/MenuLookDemo.class index c29fd77..0ace666 100644 Binary files a/roaddesign/target/classes/com/sim/random/MenuLookDemo.class and b/roaddesign/target/classes/com/sim/random/MenuLookDemo.class differ diff --git a/roaddesign/target/classes/com/sim/random/PropertiesTest.class b/roaddesign/target/classes/com/sim/random/PropertiesTest.class index 7ce45eb..35f2765 100644 Binary files a/roaddesign/target/classes/com/sim/random/PropertiesTest.class and b/roaddesign/target/classes/com/sim/random/PropertiesTest.class differ diff --git a/roaddesign/target/classes/com/sim/random/Stroke1.class b/roaddesign/target/classes/com/sim/random/Stroke1.class index b28adb7..f999cee 100644 Binary files a/roaddesign/target/classes/com/sim/random/Stroke1.class and b/roaddesign/target/classes/com/sim/random/Stroke1.class differ diff --git a/roaddesign/target/classes/com/sim/random/WriteXMLFile.class b/roaddesign/target/classes/com/sim/random/WriteXMLFile.class index 8c3556a..eea019c 100644 Binary files a/roaddesign/target/classes/com/sim/random/WriteXMLFile.class and b/roaddesign/target/classes/com/sim/random/WriteXMLFile.class differ diff --git a/roaddesign/target/classes/com/sim/renderer/AutoGenLoader.class b/roaddesign/target/classes/com/sim/renderer/AutoGenLoader.class index a15a865..bf88b75 100644 Binary files a/roaddesign/target/classes/com/sim/renderer/AutoGenLoader.class and b/roaddesign/target/classes/com/sim/renderer/AutoGenLoader.class differ diff --git a/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class b/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class index 051d07d..fc4f314 100644 Binary files a/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class and b/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class differ diff --git a/roaddesign/target/classes/com/sim/terrain/Terrain.class b/roaddesign/target/classes/com/sim/terrain/Terrain.class index 6b3ed82..4783cd7 100644 Binary files a/roaddesign/target/classes/com/sim/terrain/Terrain.class and b/roaddesign/target/classes/com/sim/terrain/Terrain.class differ diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class index 73b45c6..9a222a7 100644 Binary files a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class and b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class differ diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class index 9598197..7349703 100644 Binary files a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class and b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class differ diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class index fbb638f..90f03d4 100644 Binary files a/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class and b/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class differ diff --git a/roaddesign/target/classes/com/sim/util/CollectionUtil.class b/roaddesign/target/classes/com/sim/util/CollectionUtil.class index 5caefcc..7f77dda 100644 Binary files a/roaddesign/target/classes/com/sim/util/CollectionUtil.class and b/roaddesign/target/classes/com/sim/util/CollectionUtil.class differ diff --git a/roaddesign/target/classes/com/sim/util/CopyUtil.class b/roaddesign/target/classes/com/sim/util/CopyUtil.class index b1902cc..5d9ca87 100644 Binary files a/roaddesign/target/classes/com/sim/util/CopyUtil.class and b/roaddesign/target/classes/com/sim/util/CopyUtil.class differ diff --git a/roaddesign/target/classes/com/sim/util/GraphicsUtil.class b/roaddesign/target/classes/com/sim/util/GraphicsUtil.class index 97fd084..09a6238 100644 Binary files a/roaddesign/target/classes/com/sim/util/GraphicsUtil.class and b/roaddesign/target/classes/com/sim/util/GraphicsUtil.class differ diff --git a/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class b/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class index 12c85d6..0e412b4 100644 Binary files a/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class and b/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class differ diff --git a/roaddesign/target/classes/com/sim/util/ModelGenUtil.class b/roaddesign/target/classes/com/sim/util/ModelGenUtil.class index 8ab58f0..fdbd3e7 100644 Binary files a/roaddesign/target/classes/com/sim/util/ModelGenUtil.class and b/roaddesign/target/classes/com/sim/util/ModelGenUtil.class differ diff --git a/roaddesign/target/classes/com/sim/util/ModelImporter.class b/roaddesign/target/classes/com/sim/util/ModelImporter.class index 8d1c9d4..d471958 100644 Binary files a/roaddesign/target/classes/com/sim/util/ModelImporter.class and b/roaddesign/target/classes/com/sim/util/ModelImporter.class differ diff --git a/roaddesign/target/classes/com/sim/util/ModelXMLReader.class b/roaddesign/target/classes/com/sim/util/ModelXMLReader.class index d012bf4..cb2e66a 100644 Binary files a/roaddesign/target/classes/com/sim/util/ModelXMLReader.class and b/roaddesign/target/classes/com/sim/util/ModelXMLReader.class differ diff --git a/roaddesign/target/classes/com/sim/util/TriangulatorAdapter.class b/roaddesign/target/classes/com/sim/util/TriangulatorAdapter.class index b03646b..095ee22 100644 Binary files a/roaddesign/target/classes/com/sim/util/TriangulatorAdapter.class and b/roaddesign/target/classes/com/sim/util/TriangulatorAdapter.class differ