From 0b4aee855223fc8ddf576c369de4c5334a8cc5b6 Mon Sep 17 00:00:00 2001 From: Kephael Date: Sun, 8 Nov 2015 14:16:44 -0500 Subject: [PATCH 1/2] Cleaned up import statements Enabled VSync for 3D JME game window Fixed comment grammar in com.sim.central package Wrote Javadoc information for com.sim.central.Logging class Cleaned up com.sim.renderer.AutoGenLoader Fixed overwrite save wording. --- roaddesign/.classpath | 71 ++++++++------- roaddesign/properties.cfg | 16 ++-- roaddesign/roaddesign.log | 84 ++++++++---------- roaddesign/roaddesign.log.1 | 59 ++++++++---- .../main/java/com/sim/central/Builders.java | 4 - .../com/sim/central/ComponentHandlers.java | 8 +- .../main/java/com/sim/central/Logging.java | 23 +++-- .../java/com/sim/central/ModelPathState.java | 8 +- .../main/java/com/sim/central/RoadDesign.java | 68 +++----------- .../java/com/sim/core/basic/FlagUtil.java | 3 - .../com/sim/core/basic/RoadShapeCalc.java | 20 ++--- .../java/com/sim/curves/HorizontalCurve.java | 1 - .../com/sim/curves/ThreeCenteredCurve.java | 7 +- .../java/com/sim/curves/VerticalCurve.java | 2 +- .../main/java/com/sim/debug/DebugView.java | 13 +-- .../main/java/com/sim/debug/SimpleViewer.java | 2 - .../java/com/sim/debug/SimpleViewerPanel.java | 10 +-- .../sim/debug/components/DebugComponent.java | 1 - .../java/com/sim/geometries/RoadVector.java | 1 - .../java/com/sim/geometries/Vector23f.java | 4 - .../main/java/com/sim/gui/JCurveDialog.java | 15 +++- .../java/com/sim/gui/JRoadDesignFrame.java | 35 ++++---- .../java/com/sim/gui/JRoadDesignPanel.java | 25 +----- .../main/java/com/sim/gui/JXsecChooser.java | 11 ++- .../main/java/com/sim/gui/JXsecDrawPanel.java | 5 +- .../main/java/com/sim/gui/JXsecEditor.java | 26 ++++-- .../handler/BasicIntersectionGUIHandler.java | 4 - .../sim/gui/handler/BasicRoadGUIHandler.java | 1 - .../java/com/sim/gui/handler/GUIHandler.java | 1 - .../com/sim/gui/handler/MainMouseHandler.java | 21 ++--- .../com/sim/gui/handler/NetworkGUIDrawer.java | 8 -- .../java/com/sim/gui/handler/SaveHandler.java | 13 +-- .../com/sim/intersections/Intersection.java | 4 - .../basic/BasicIntersection.java | 23 +---- .../basic/BasicIntersectionBuilder.java | 2 - .../com/sim/intersections/basic/BasicLeg.java | 1 - .../io/exporters/IntersectionExporter.java | 3 - .../com/sim/io/exporters/NetworkExporter.java | 1 - .../com/sim/io/exporters/RoadExporter.java | 3 - .../com/sim/io/exporters/TerrainExporter.java | 2 - .../basic/BasicIntersectionExporter.java | 2 - .../exporters/basic/BasicNetworkExporter.java | 13 --- .../io/exporters/basic/BasicRoadExporter.java | 1 - .../exporters/basic/BasicTerrainExporter.java | 1 - .../java/com/sim/network/RoadNetwork.java | 11 +-- .../sim/network/RoadNetworkController.java | 10 ++- .../com/sim/network/update/NetworkUpdate.java | 5 -- .../network/update/NetworkUpdateHandler.java | 4 +- .../sim/network/update/RoadAddHandler.java | 5 -- .../com/sim/network/update/RoadAddUpdate.java | 6 -- .../sim/network/update/RoadCloseHandler.java | 1 - .../sim/network/update/RoadCloseUpdate.java | 2 - .../main/java/com/sim/obj/CrossSection.java | 7 +- .../main/java/com/sim/random/GeneralTest.java | 2 - .../java/com/sim/random/HelloTerrain.java | 4 +- .../java/com/sim/random/MenuLookDemo.java | 24 ++--- .../java/com/sim/random/PropertiesTest.java | 5 +- .../main/java/com/sim/random/RoadUtil.java | 2 +- .../src/main/java/com/sim/random/Stroke1.java | 10 ++- .../java/com/sim/random/TabbedPaneDemo.java | 16 ++-- .../java/com/sim/random/WriteXMLFile.java | 3 +- .../java/com/sim/renderer/AutoGenLoader.java | 81 ++--------------- .../src/main/java/com/sim/roads/Road.java | 2 +- .../java/com/sim/roads/basic/BasicRoad.java | 23 ++--- .../main/java/com/sim/terrain/Terrain.java | 3 +- .../com/sim/terrain/basic/BasicTerrain.java | 5 -- .../terrain/basic/BasicTerrainBuilder.java | 1 - .../com/sim/terrain/basic/BasicVectorMap.java | 4 - .../java/com/sim/util/CollectionUtil.java | 7 +- .../src/main/java/com/sim/util/CopyUtil.java | 4 +- .../main/java/com/sim/util/GraphicsUtil.java | 5 +- .../java/com/sim/util/ModelExporterUtils.java | 13 --- .../main/java/com/sim/util/ModelGenUtil.java | 6 +- .../main/java/com/sim/util/ModelImporter.java | 12 --- .../java/com/sim/util/ModelXMLReader.java | 7 +- .../com/sim/util/TriangulatorAdapter.java | 1 - roaddesign/target/classes/.gitignore | 1 + .../classes/com/sim/central/Builders.class | Bin 2548 -> 2548 bytes .../com/sim/central/ComponentHandlers$3.class | Bin 981 -> 1053 bytes .../classes/com/sim/central/Logging.class | Bin 1586 -> 1586 bytes .../com/sim/central/RoadDesign$1.class | Bin 1541 -> 1541 bytes .../classes/com/sim/central/RoadDesign.class | Bin 14694 -> 14694 bytes .../classes/com/sim/core/basic/FlagUtil.class | Bin 1263 -> 1263 bytes .../com/sim/core/basic/RoadShapeCalc.class | Bin 35026 -> 35026 bytes .../com/sim/curves/HorizontalCurve.class | Bin 1117 -> 1117 bytes .../com/sim/curves/ThreeCenteredCurve.class | Bin 4722 -> 4722 bytes .../classes/com/sim/debug/DebugView.class | Bin 1736 -> 1736 bytes .../classes/com/sim/debug/SimpleViewer.class | Bin 2329 -> 2329 bytes .../com/sim/debug/SimpleViewerPanel.class | Bin 3959 -> 3959 bytes .../sim/debug/components/DebugComponent.class | Bin 2535 -> 2535 bytes .../com/sim/geometries/RoadVector.class | Bin 6122 -> 6122 bytes .../com/sim/geometries/Vector23f.class | Bin 7481 -> 7481 bytes .../classes/com/sim/gui/JCurveDialog.class | Bin 3977 -> 3977 bytes .../com/sim/gui/JRoadDesignFrame.class | Bin 5361 -> 5361 bytes .../com/sim/gui/JRoadDesignPanel.class | Bin 613 -> 613 bytes .../classes/com/sim/gui/JXsecChooser.class | Bin 4082 -> 4082 bytes .../classes/com/sim/gui/JXsecDrawPanel.class | Bin 3040 -> 3040 bytes .../classes/com/sim/gui/JXsecEditor.class | Bin 7735 -> 7735 bytes .../handler/BasicIntersectionGUIHandler.class | Bin 3539 -> 3539 bytes .../sim/gui/handler/BasicRoadGUIHandler.class | Bin 1988 -> 1988 bytes .../sim/gui/handler/MainMouseHandler.class | Bin 3731 -> 3731 bytes .../sim/gui/handler/NetworkGUIDrawer.class | Bin 2029 -> 2029 bytes .../com/sim/gui/handler/SaveHandler.class | Bin 3351 -> 3366 bytes .../com/sim/intersections/Intersection.class | Bin 819 -> 819 bytes .../basic/BasicIntersection.class | Bin 11366 -> 11366 bytes .../basic/BasicIntersectionBuilder.class | Bin 13472 -> 13472 bytes .../sim/intersections/basic/BasicLeg.class | Bin 6772 -> 6772 bytes .../io/exporters/IntersectionExporter.class | Bin 426 -> 426 bytes .../sim/io/exporters/NetworkExporter.class | Bin 461 -> 461 bytes .../com/sim/io/exporters/RoadExporter.class | Bin 402 -> 402 bytes .../sim/io/exporters/TerrainExporter.class | Bin 411 -> 411 bytes .../basic/BasicIntersectionExporter.class | Bin 3362 -> 3362 bytes .../basic/BasicNetworkExporter.class | Bin 3970 -> 3970 bytes .../exporters/basic/BasicRoadExporter.class | Bin 1568 -> 1568 bytes .../basic/BasicTerrainExporter.class | Bin 1336 -> 1336 bytes .../classes/com/sim/network/RoadNetwork.class | Bin 4028 -> 4028 bytes .../sim/network/RoadNetworkController.class | Bin 4224 -> 4224 bytes .../sim/network/update/NetworkUpdate.class | Bin 375 -> 375 bytes .../network/update/NetworkUpdateHandler.class | Bin 567 -> 567 bytes .../sim/network/update/RoadAddHandler.class | Bin 2467 -> 2467 bytes .../sim/network/update/RoadAddUpdate.class | Bin 798 -> 798 bytes .../sim/network/update/RoadCloseHandler.class | Bin 1118 -> 1118 bytes .../sim/network/update/RoadCloseUpdate.class | Bin 696 -> 696 bytes .../classes/com/sim/obj/CrossSection.class | Bin 6636 -> 6636 bytes .../classes/com/sim/random/GeneralTest.class | Bin 1105 -> 1105 bytes .../classes/com/sim/random/HelloTerrain.class | Bin 4956 -> 4956 bytes .../com/sim/random/MenuLookDemo$1.class | Bin 545 -> 545 bytes .../classes/com/sim/random/MenuLookDemo.class | Bin 4859 -> 4859 bytes .../com/sim/random/PropertiesTest.class | Bin 945 -> 945 bytes .../classes/com/sim/random/Stroke1.class | Bin 1291 -> 1291 bytes .../classes/com/sim/random/WriteXMLFile.class | Bin 3194 -> 3194 bytes .../com/sim/renderer/AutoGenLoader.class | Bin 14722 -> 14762 bytes .../com/sim/roads/basic/BasicRoad.class | Bin 10632 -> 10632 bytes .../classes/com/sim/terrain/Terrain.class | Bin 2013 -> 2013 bytes .../com/sim/terrain/basic/BasicTerrain.class | Bin 1512 -> 1512 bytes .../terrain/basic/BasicTerrainBuilder.class | Bin 4805 -> 4805 bytes .../sim/terrain/basic/BasicVectorMap.class | Bin 8551 -> 8551 bytes .../classes/com/sim/util/CollectionUtil.class | Bin 2423 -> 2423 bytes .../classes/com/sim/util/CopyUtil.class | Bin 1589 -> 1589 bytes .../classes/com/sim/util/GraphicsUtil.class | Bin 8257 -> 8257 bytes .../com/sim/util/ModelExporterUtils.class | Bin 8933 -> 8933 bytes .../classes/com/sim/util/ModelGenUtil.class | Bin 4511 -> 4511 bytes .../classes/com/sim/util/ModelImporter.class | Bin 12033 -> 12033 bytes .../classes/com/sim/util/ModelXMLReader.class | Bin 6269 -> 6269 bytes .../com/sim/util/TriangulatorAdapter.class | Bin 3532 -> 3532 bytes 145 files changed, 333 insertions(+), 585 deletions(-) create mode 100644 roaddesign/target/classes/.gitignore 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..592e209 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)); + "PT_ADD: (%.3f, %.3f, %.3f)", v.x,v.y, v.z)); // prints point add position to console System.out.printf("(%d,%d)\n", e.getX(), e.getY()); }else{ - Logging.getLogger().info(String.format( + Logging.getLogger().info(String.format( // prints point close position to 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 5b5a5a3250fd6dca38f4926d4ddca96414d523bc..795f62225428204b6822b5b625b54210dd88bf9d 100644 GIT binary patch delta 97 zcmew&{6%=fNp?oz$*0(7n@TfqFvv0pGbk`fGAIH`1qL++Wd=haY0jX|U{r0BJP_bp}HQEe3N2Z3a6a?ZTkT r;Ll*d5DFBH0n$kfMw4f8_)ZSw)R`>IX*YQ{kgnylW3-#RhtmQ8V!;y? diff --git a/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class b/roaddesign/target/classes/com/sim/central/ComponentHandlers$3.class index 29478286a15a3aeb642ff916a4e9315a01ac9955..8d4bbf18cadbcf48cf4a2e56654df4e79fe9fbb0 100644 GIT binary patch delta 184 zcmcc0K9_^*)W2Q(7#J9g7)&;DIWrlH`Q#@j=7c2{WhN%&q=r-$q=tYPj0{pfS&3zd z75c^HnR)5@Ue5WsN%>Cs6*gLSlf9U%S@anh6ekKOvhpw(G8j!>&$L7#pMjBq8ECSw z_BIBg0}K+rI@=he4lu~>V36Mk6lR`W%xrI}31smA6>>0eGpI9YF)#tOXamKV7<3qP Wfiw$)9)kgcF_6UtRK*CSfdBw2VI~#; delta 89 zcmbQsah09x)W2Q(7#J9g7>qV@IWtXeX0l+>Wn@sCD4@v7!=TS#F!?Fd62{ocUCeTf lOp{kK+bc6OXadzUF=#Pp18Eip9R@uHLm-Qbfe{G7006yr4}kyx diff --git a/roaddesign/target/classes/com/sim/central/Logging.class b/roaddesign/target/classes/com/sim/central/Logging.class index 453de0867913d62cda04dfc3a4bffd7a4c0ecda7..d46212ceeb9d92eed76f3cc53cf300210bd57cc5 100644 GIT binary patch delta 105 zcmdnQvx#TJDi%h;$*Wn67zHNZW9hRMVPIkqW#D2EXW(OyU=Rk<;tWy@G7QoT3P4hY zL6$*{L5@M4L7qVyD5A@t%wP%>wPR3aaAi=Ryppv{SdW31fdOa=0|O&N0GJgB0BTeX AD*ylh delta 105 zcmdnQvx#TJDi%iG$*Wn67+KdMo X^cW8@7yxNw#={IYj7KLgV~qy@m*Ntg delta 67 zcmZqWY314Qg@y6fTG)@JY5qYgi=Oq*^LgLrectc$Jl`wBSB8&# zU*^4!3=WgWr}|4-SbBBdf&)XxEq8)!#>wFea*g?%q>xkG&X?T51oJq}U7VqquPCwH ze7>ffvjq5t2p4JQG6^Q>;AeWd$`Y>e0M}W;4buFq- zA~Z2gn>hL{w@flrDqiyCkS#OGlU$0#r`swTrAQ|#mP@I{67BKVOW^<0UjO(D5xf$` zCozhpo-&D3E)4`_p{X|#lO`5PGwsqszqB$S2_BR-)=E2%NeAnVPf3yu(#iA27p04r zrJK#hEvET~+{>8s(+Bv?DjzB>ri0n>xFn=af2-W(T}qA&FjrE#J<#c0Nv1qx8>DqI zkd$>A2*y0?ZOUO?7wqwDu$PT`EZ8iYbSl{7dCjU{*M(JU=ImgGylJ-`R{NH1G{Srt z)sLz^so!ncJ=Wu0X3BdM$ot$T`>B!xgp3jSfL1xkV&f7y#Qk!Fv>azhPU!yXwKAav zHHV{e&IUYhCS9;k-F{E2 zG5M~9B3G(|wIAP8L7}Up)CH(^e!?zDgR7#;*zKz6b2X%0SZgECNK_9-rs`U(KEVRl zMxARV?%GMX4w5cOkLzTO>tdtp<`v^MyYF$e z9=8gwOXG77+skU5j;7>MO~q>ENqyDgv-+9EO?o31lFfQ|JS1B+6<-}1LEI=a+)mr- iZBrRBm3PQQS5e8Zme{BY@;!obf5kjf9^jrw9(oC delta 896 zcmW-dSxgjW6ot>ZGQ$iogSdf+#dUyT2AE-BKml1QDntp&;1be^inyRGR*k0B+L{I> zV#1AmQPU=BV$+bcX)LWtn`p60wGsEEPrgW^@ddT98e6^b<$nKNa{qJgSkG9`_YZyU z{fNT@crm7rePQm_jI3|l#;x`YE<8s9ULeVsjDIj0|6)2`Asw%gfj9U7{~;6qW0uwC z5y&PHpaT)Qu!u>hW-=CY66%?XMy6pk)3J^-(8>&K)<1IaBe=O9 z9=0Nr8{y*y6W4|yH`(@fM7afJ+=>sm&3@R9CU&5OJJ8OZ=wK(hjUTfM``C>G#zXAE zm)wOuW54bEihJ-i_hC5zzn#hhWhJXD%S0!uS))&Lzj1$x1RgL~2lYf?iMtn09x(@f z`Y2G#0SyGBj+3VHlx_*uInG$;tPTYiaZq0dD;z)B^pGyd+dTCWCh)Rlmu&WTb2MzH zzM>cME|y-m>J9tjFC=ml6L|}%yp25GLC6^4T~zTNRu~(3A1nE{9ex~be5U8~+xc22 z77P}PAWh zlIBeU1!G76=UgLn}r(`#Nl)d_(Xvp)KN&Ort@&%^KVLe&ADy0_= zISRM*!6V14)30xfV?3d;XdzGQ5sT;aSBrx>9u4t=&MgV?7mbx{3JrsD1ry{Cb9L3W g4BM7#@X82g$e(uH>&Q0d$_;ZgVoGo7laf!~0ZIDEtpET3 diff --git a/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class b/roaddesign/target/classes/com/sim/core/basic/FlagUtil.class index 379ed6c7a2a30ac66bc6ad1e01c890629d7c95c0..01b8e85c12c8eb2af67d81e171cda2a822570102 100644 GIT binary patch delta 45 zcmaFQ`JQuw9gCnL0~>=G0}q2WgAjuQg9L-?WPcVTMuEvqEKaQc3|tI>lTWg!0RYyT B2@n7P delta 45 zcmaFQ`JQuw9gCm|0~>=S0}q28gAju=g9L-eWPcVTM&Zd#EKaOJ3|tH$lTWg!0RY&f B2`B&n diff --git a/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class b/roaddesign/target/classes/com/sim/core/basic/RoadShapeCalc.class index 8c875d6dd6b0e43de444f3b5d9b079b2411b9863..b3f78d4b08cd9ada12e28da1696a73e581a3c574 100644 GIT binary patch delta 4395 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 X1<$$baw@;dmT#buyEP|k%3J>fz1}6q delta 4395 zcmW;Pd4SH<_XqIzx#xVId+!+gKDIH&SchcajT!6M4apeF+92x}VR(=%$?j(t+2vbb zdQjO%DUvNh*^;G*D3SUmzti`hdEMpQbMEIppXW25=d1bVtNCVI*_u>xVM5L2iH%{9 zgj{Hf{76O#q@b)?Uah1iqPhNUf%ZDz9jzkwY6euTCoD4H(HptZ2YJyK#nBJt&>zoX zfQG)Jvzh3rbNw`CI9`pEsU1s+({F8x##})jBt7PyU<;OKD9fRvs7B{Gz zS_yZlF78tb9#A{nkNj1y68XQ715fqf{#y84gK?#!U?>MHMZ;5WVR5##9;2v`9-eRc%X&=tx!2P0gUHk?e-KCEN_wzeccfD~`ce-Jr3{Qwv*=~KPQ5WhovF@I z7gHasqP|$Gu2VOw+o&IQQ-6F)nK(fMae;>5M;fZvJp>QKG@O`5P?VaBMpHo=Lq%vD z#nO06pe(9S6Q~hQq!bEMDovpdG=nl|rbf=v(b+VW7SLRpPya_tXgMvV)#_SxgSv^9 z(Z6+cyShXDQ2m%z(jHnx`_zMK_=q;Xpm*quF8fx!OzY?tt*3kH1KLQBX_EjvBW-}d5G5hH=bCy0g7wCw&s9vQL<|dsq59pNnn@%#(3AS{ai_#g6r?Xs5 ztw-m$6`kh}bb&MI+sORn38vv=y-j{cVS1vU;-C5nK1CDyTR**Lc*Pj}%P=OYVRf21 z(*$_Scq}tf*l407sm+^HQV|#v18a&Qk13AgrX=D`DO5GFXkg;d(v(446ORri0coZj zdZ{m&@))3TqjcRAQ#tZgi%%#cNmDdM4wH;rYCh8vg-sijGN~wS+M&E@i;AWrsu{h{ zOq!FRqGLPF%h+#vV06*H$l5>2dI8tftRG zK{FmPCX56#QBzOS-A+a=GbJ)Om8jZM4O^x=S&jl`g@&y}8M8{Ozm4b38q_oIAjzyn zirIiRW+OVAO_8_T+^6s!M4P?3WFLyC#mzy@oQ*_t2vy7x)HX-a*nELxwWT?xXY!?< z$uT{X<489r@Ul6nXL1Ue<}?PGuP{U%uKm&GEV9fwOx5{0=36W=m$24c#s+nhxq^M> zDh{cKJDF=ZYQD!g^&9n)dd1wpJ#!Ne%`H4KKj3%sBmPvMnpug6W$l#{hg3NpAE`ltiAxu$QS>04qfx58v@t!Y#74!6N( z^*wHfL);!mxC5?f%un1Ik2np_xQjkAfnoprB|}O2cmtyGI5Ie`iw_S)ZXSjbJXAL^ zTsJWS4b(M9fg%;z^jtleO?9tmY}$#;@yjy`k4N69@QBe9p6Q zMm@`K;k>@n7}tFwZCEMUw{xAg)j16`h^eBpL~#>@&QAfZKC*)DZrnYQv9ij zQ{(xtsmh<3=hYf~#5Cfgra6CUI`VPTMeW8XO+P+mGWoO_t7h>T6XvsK3V&^8@Hw-J z&zp7XCca?y@;By?`Was|XZdp2T;!|fHh*XCs`u4j)hB$-{LSAp@paC}H@JWr!#6pO zZ*cHHhd+FP3TzWS@iKa=<%S`va7DHkND6{TWOMJfe# z)P_C zcq;8fBJDy^(lHb*okDq~bEt?~O#89YB~(+ohU!bVP?B^HwUYF3sEzatrAe<)H>nru zEqz0Sq+e*H^bd`f0iieKmC$U-3@wp?q17@dv`L1AcFOS3M=~mOKt_j-$e7Sc^_2F{ z$k@;o85g=C<3kT5EA&hzS}S22rRI@Iwy;dLF*3!*$?G;=-mq0?ZX+S!#F4GW(${w+Cc} z&6ZX6n7nOI$x3@h`xoRLdtKJrJF?E+lMVJ4&GU!6YyXn1E}#6{6;b1!m+h{+eBf$G z#5I+juAS_1FUW_kmwe;~$j5Gk>~>kQ*M()Do1(FEBs(&&ck`(5X;?W0CufjT&Z4w@ zjY@J3wdGqhkc((3myjlx@rqnQmR!Xw`3`gB8kWd)ESDSDD7Udq?qIjv!(sUu$JMXo zJ}%1x+*I$#L;N9+h~;<6CugXX{PW%ktVJGuh?X{mB2`~qY{L558RSKDkPo?of`|zU zAvP$C@@isG6xD+m)K{AXrO-TxMXK5%h(p()4ARw?g0kozBw&y_EGUoBK?RIgCk0h7 zEvSmOf|^(m)W*`F4%Vuhf_iu_sE=Lho}eMJ+XanqOdF?yCO8));i`H=7d;4?;c?I$ z&w^$oK}(7XT2X$rNYIAL1Z}B8(2lCBb%GAmDCkHn)wV%eWWlg?RJR}U+5X6HGf~wJ zM0NWr+S?)MY=>j09f6T{6z1B|SYpQ_V#i^Roq+RpBCgs=ks%}2neaA5+Z`xucOu5_ zLMi(Z;_SyLYj>lfJ&2k%8x8CsB->BW+E4VQ=Jy1X=B+lyQQTImYXMpuY7YkR9JLg9!jO8Z<49nj7pSDe0Z zCFp`HN#APwvMWt@T^#-9%Fq)RZ`hSJfr~TFl{0x5V-M(a#^~Oi74d4 zDB&g{!A)7%BkO&CNoOx3hr6^e|AfWqUlP-OEav&rSnT7l!I!~yACG-L0q1-<-1p_l z`3jWBm!=qBiQ;@>Bs-jBy6DTeZvy9&k!ll&Gf_byubt!S%u^xM$QZ%4ZS02$iu z?ROy4@5Erg3$JQ>gx{@O*n@?BFBWNgncuHlIDp;$pqAgSqz#3O$k|Me#*@W(02pVHGlt*3p8O8K)3J52w+#4X+S4|>Qy>gReJ W75p7Nm7jFWcTvy(ys-U@*Z&_7F)IE5 diff --git a/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class b/roaddesign/target/classes/com/sim/curves/HorizontalCurve.class index c12a09410756040fd27b5a08cfd8a6bedf2418eb..0f431dbe1de46196ea112ba949dcb03e1e1da2f9 100644 GIT binary patch delta 67 zcmcc1ahGF5KC^Bp0}DeW11Cci10O>)gD^u3gCs*NgFHhVgDOKjgEm6~gCRpAgE>PI WgDpeySTle+vL-vS$N&JZd<=B} delta 67 zcmcc1ahGF5KC^BZ0}DeG11Cc?10O>SgD^uZgCs*7gFHh#gDOJ;gEm7VgCRo_gE>Po WgDpeKSTlh-vL`#T$N&JbMht@h diff --git a/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class b/roaddesign/target/classes/com/sim/curves/ThreeCenteredCurve.class index 7156579428d134553263e3f79dae864704971c0e..ffbc13d93b797123346dd6f162d783a032cb47ad 100644 GIT binary patch delta 535 zcmW-eOGp$@6o$Vugjh*ARxU(|a>@)J-~;Vppx8o9C{4-27^RmAN@kIp)XYVoVZNhm z6vfiWtdT-9DSJSHnF}j12x3;b5lLKx&`(@A|2_Bq_dox+XW6yv8u9r@?_eF<*hnxz z^b^WZafUlVxzrI}k8oi7jlUL*LLz5?yNUj=XiLgL`t`%}G@+5tianl^%(E zB;M=o+%#l04{-1hKN$;PNUaVM&12#j=8#OLGeSO3Im0u`g%vux%5$#qf=0$@VVrhe zGRiAulT7fMH(Kv_%e3MbJ}}Qme0*X__(!ZYrp=Gf7RZc+IGFWL1@1KGoaXvf)0)$_ cf0K{ztt(D<*l*1eIWt958=n8zqv)XbACb^}lK=n! delta 535 zcmW-eOGuSb6otQi2{9A%Ry43gs6R{dCYa*I%1A`e=;ffYASBe#@ilq2-f#co{9s+&xDWVV+A`edkAlj@e(x6(PlUEWd8AP;!2 z>@fX|C_Bm!ANjy1#`w%6UzlN>AQSu&{#MUlrYwZ77Rfh@@-XcVM{Y6itoAymZOv-z c^U|>pSoY>e|I~hwGE+3!di)=sD0*o52PX@D@Bjb+ diff --git a/roaddesign/target/classes/com/sim/debug/DebugView.class b/roaddesign/target/classes/com/sim/debug/DebugView.class index 38d1e5faa4f1fd099d4b34c4b5c9ff98153f1723..3e432de08c9b96bb61fbda84bcd6e613ec80270e 100644 GIT binary patch delta 119 zcmX@XdxCdE6ALE~0~-S`0}lh=GSiD&U8H5>xCiAhHvWhaWGl)(0U=0$K z1get)s*?uF$pBfhlUK8P^C~bfGbk|#F{m(zGN?{wW(#3-ogBfY$Cxm=olQ?T2Pnh9 Nzy!pM3_f6%F93eG5c>cC delta 119 zcmX@XdxCdE6APy}0~><`0}q4bU=0#f z0jg64s#62XsWV71XiQ$s>dmXoz|5e_AjF{0Aj)7cnVBtwF<^28n;v8KHo~$ZB zb*hu~+0$e-fh;WsJ_c=|9vub+AX^2fN0UJh2n{B0Vh>?81L`sd>Jp!<#G%b-JK2xJ dpVN_nlfj9Bm%(N7GL9ftcc2*_lmBwa003D578C#g delta 135 zcmbO!G*f6pG@GOZ13QBW0}q2FgD`_Mg9?KzgD!&{gAs%L$9iHY6Dq1417R!;tYBW3P83BgFb^Mg8`6dG)kqDF08R?UW%uvxti(2%7&7u~$D9At|40X|CM9cdkK7#A^ zJ&Ripau%20y_a)1%Xk^j(`>X&h9Y?qcBBJJ98;!7M3dOY+24&_LiX5~s+uhhE#psI z700P9{EC^MxVoqz`YyByIG57}M|3!$%Ndt;pPL2O`nh3~Tjkx^BG>nN+C1WsS{yvM zC(-lT@h3>!i>SY*f6=SxO%z!r?0WC`4A|nsMq%oPau~^>Xn*0L@TuEaDPL+bQJ<-L J%?C>*s%0_6SMkD*LKO)GX%@ z-64*K&HTj7Pu;O}B27xC1hkcP#xCd7xZr?G>lDVpm3BI;azmNSW`(YItIi!B_ZA1& zt}8t(6Mur#JxWhY{Yx*>s}xxhw!9ubZ>;fdy)biqB@C2Mw!iSXG}7!tS3cQbqJO^h J$G5eM%>}G-ERz5L diff --git a/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class b/roaddesign/target/classes/com/sim/debug/components/DebugComponent.class index 103f26160ea7d13150a9c461da143ee08eab1ce3..fdd28038e6abb2006712633f1f8c66e30646d968 100644 GIT binary patch delta 122 zcmaDZ{9Jg$M^;Ae$)8wV82Kifvn^8;Wng0vW8h_wU{GR^WYA=gVlZToX0T+CVQ>VB zc{9jw{>R40D5(xqrU8`HWKdwxVlZLQX7B*=gBWxt`*ZeB-onu&X$Vwd1XN)RRAB;y Ora%=&Ko#ad6*B;9R}{Yh delta 122 zcmaDZ{9Jg$M^;9j$)8wV82Klgvn^8;V_;(tXW(U!WKd#|V$fueW-w%sVX$P7WpD(F zc{3<%{>R40D5(KdrU_J_#h}2T&0xZy!{7nr2QlbP_UG)MyoIAl(g>)+7^uPosKOLT PngLZ9165c6Rm=bYaTgTW diff --git a/roaddesign/target/classes/com/sim/geometries/RoadVector.class b/roaddesign/target/classes/com/sim/geometries/RoadVector.class index 828302f20a623fbf92df41c5984bcf954f2bb895..8d9402f534f0803d642dbdf61b7e18eeafa216dc 100644 GIT binary patch delta 495 zcmW;IPi#z46bA6`&=-B?-I+J$aW?|wP=E_W?=J@GTPidGzik18w% zumOiq#2~k3Cfkpp1q}o^jsi}op2TLH!Zw`Yhs?NhUhj-?zgKrIVjaeLHD`I>OXRXn zA-{ONa)p;ni4{|k>pC5k8+>8vaw|=?WfQrbPN%bDmdIjK`=+oFchHTy=))8jvQ2rw zn}rfCQ7SnAPo`)AdKqOO;nDb1JV@w)399*Sv*`ciKIV5DQ%L zC(K89SVSJ55aTn?E)SmKYM z+x?^RSLL6|h`R=ktc8)5^n5x@#N+#LqTPol0U`-eln7hIVu!@&kv2A?BTfT4nCl3jgd{R4XBZF(?;VhqpWY?sq@Vy(jG_?dwj&6i|zPI4Hp2 zChAc{3WMAdSx%0j2IELz0s$sPr_h8lS~1O^BlBuj?#%IZyQJoE5%+i@W_ZocP(>z} zzu4Wh!1r~U^EyvUGTovF{7#qXQJAcYX6SJ^-HFbcWkm5r`c`lmPtk#A=*0@}N6Yk_ z9|mbI#xnFu(tWhfZ(>7wLw0@(jZN8Zi!EnHzZcmS`5>|*a)no&9=!_-d(yoR7a#en zQ_%;oafmpM;NzI@#%I(w$$aPSc$t34ehr*YbXiq-`KctUyqK7_ena7pbf0m~P4llr zhxJ$FT;!j~sC5B~YM@Dl=P%t1Y5wF^l5yDN!XpnUGH50rZ4{u3l3ezNRRbt<8 diff --git a/roaddesign/target/classes/com/sim/geometries/Vector23f.class b/roaddesign/target/classes/com/sim/geometries/Vector23f.class index 7321b62d0f0badc060e15d8e7cadb00ccfe4d2ba..cb43b5e67125f25b58cb5db4a89c883f6224944b 100644 GIT binary patch delta 696 zcmWNMYfQ~?9LAsLU#I*}=hQjXIVUO2Na=EF8Ci)_qRzA-q}2`H#UB+zWaQiXV3Tf4yO&L_21U5(eTAW=!iie zViAHxGNM;7SrUv}nJOoZMS42SSdJ*9%cQYXcPYwLfhH&eWNbCMFvI((u3E~{Ru%B!(4n(@m~>-ab)3}dg41O z6?^alb(la0eySpq7*srjDU4tmqxh}de@IMG!;Cx+c^Iw1Odo{P7culh68*7^vye$6 z)-nJEG+{f<(jR(=c5&MB87?ihTxqu1<)dw}JX15)-X0kT2jk&n0#ccX96GU%Nho46 zN|+)q?A_K3gmMM!T!}ckkiaadcNFV6FfbQJy5)nT%#aU1Zj|h>O2ZcAE*!WU_D*Zs z2_Kd#VHYgit%_D)J}Xs#2TNF`PF2Ir8sxDS+gOKM)}w{{(8UJa;(iSC0A8^XpLr0! z*o1#8BXx526{Cg iiWbgunv>_XOkU8kc~L87m$rwOv{rU&ZS0Y(h?)OGBd9h2 delta 702 zcmWNNTS$~q6ouFNZL}F3ol*Z8GfkqhGB2fOp@f$vV^FD=tY(BRs0Ha{rDmCVNi9t+ z+@+=!3WWw?f{;m)6hya|zz5Tp9*U%klnGiC)OlQIeP`{p_h|BH^3b5sx*kgq1tT`V zAJGUxjEozLm?+Vv15A+?lgpS2Gtv-&RQYboH#(Hsp_D_Z2&wc!jNEopPttglTNU1Oa1&!Vu2d|$m^h|YrJ8m4??*VYiU9peX*5( zNT)xt7=T<_aEMkJ3a*kG-CGj$9C@YNq(e`TK$}h8>j{jMT3wfQw#M*S*cpddZp0RD z!cN9x7Zc!OA`UZ2-q^aW=?G>9Y}}40IuOlFDYv_gSuijgCg#Yry}*zQZ|)UGNU_1K z=)B>FA(LA5F?g{^8O5;Bqw1Dm6;G&uli18sHL46wo<=q+aFAzE%Co3tCAxSH_gRHe zp2u5O<0ES@#|!w!dK%ckWo%>&FEWjnxSdUOv6&uTW-VJ3(aIjS@d2;!SrV`EIfYZa q##vt1zz)reomwcnv{>HI(%G#!*rU05Q#;OES{-j|4eXPQu*LrzXRLw% diff --git a/roaddesign/target/classes/com/sim/gui/JCurveDialog.class b/roaddesign/target/classes/com/sim/gui/JCurveDialog.class index 52c92b8c51379b002e871cb499b383ef187564f8..7a70811591c62303c2b4ad5b51e4ac9ca4423950 100644 GIT binary patch delta 255 zcmWO0J4=EA7>42dfojPERL~Mgi%Uh(flg8>pCpNqSfN2#VH9bRlHy|7s7u4w(9#eX zbXWrS=BA*2K!2dIv88vqpW%JsY6KdA*DufIFkOt$%_#kh5wb2aPJ#(COme{#kG5Z! zrp*j*%<^IVWS(!k{$YV%`}iZQ4kGHo(I8O`v8*{_a#&G{xVA~Cz^W>&sZLT&Qo3PX zw>~y?M_Mg1dSa`c_4a9F$2?g)?9yu;V2>dCCd--dz$7`AI3&ywF>8`MX^zcXuysO> cQ?5C~rN})c9ysTjvit6UHm^iI#=aNsKG crN$l}W$vtb;E-pIy!YUV@00*%-c+;m4{v@jbCmSod-Nkpmdrs$^dwoWq@g`CiVZxsj0x=UtDsj>$kcJV9YSmqut!T(3 zfNVi?h$5GG@<^h93<}Aoh)Rm7r-W8Yz1rY*#a@n<3iJZRQiX+TvZxVitxW4^7IFs- z^kQR#CKhF~Mhn{_aEzTRL2v2gi7sC0=A9lsh5bz*KlFQ_Lnam1fLII>$}r&~62lnD zI56Rq4IEe*mz)!nF(ro6VmL#iylu>i;2eXvz!W1G)*~RKj@VJZ=&>lQ8G9`-S>wu>1p} C&`o>* delta 362 zcmWNNODKeK6vcm^noNO8n2KAG5MH`=Y$Z#m&GXKwUBJo zC>trHtYu?m#eTA}lDoOx`#a30ZCu4DmUHVaUa`gCkq$k*(KOKTB2 ziiw~^&{7g9BaL!0si2Tb>8hxwnl@_arZ%XLb}79M^zvw=ffO1=s!0Tzh1!Bch@G_4 zhm&DCn3Bmy7aQ_j6?0-s49M~z~oLkmIDTe5(zV>a-IMgoJp8-+5JL$G}-V7}Obr7&Io^GpPXpeQ^f$ diff --git a/roaddesign/target/classes/com/sim/gui/JXsecChooser.class b/roaddesign/target/classes/com/sim/gui/JXsecChooser.class index a97f1022aee512656c360d87fe94a1a61d1ccacc..8aeff13367512e892f5280e4e23a4b40f2c4b0a9 100644 GIT binary patch delta 278 zcmWNMNlQWj6oo$ti+DY(D8dpRv=N)oCL1WHP>LeSOczNst4R(eh6_>A259&22efhH zCWzKSyV|vE)y7}oFX*m5xaZt+?(JwD?X{r{*yv^gg-M2(W{jD)rs6Wh9H`7P%pBv) zi(vsLi)^sOHp}d@$`NZ^vQ8Qo1w54T@{Es$xL)wnBEUPFe6YorZ2hpqFT4B^)V=DH zIYf`-^bw+;urwVoN(7Cl-d4ZEhZu>8axBvmtei5%8FtQD5xTjMhPWgq+2e{RDY@rb t)C>u-7XcY2qpX|70bm0l|HVU0oRjBt;I2mRAz{|Df~H3$Fz delta 278 zcmWNL%Su846h&7=M%*rH6k!P$Ocd;85fwc!>_LKQMMhLNi3%xtP!qw(95g6!cJTw6 zIB6n;DKF z^CjtKi(d74NQsnYh;1x(oR;~W$a6^$>UbJ7icRJlwUqReQdX$+w(WiWnXZ)0$hCBKX?JP4v diff --git a/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class b/roaddesign/target/classes/com/sim/gui/JXsecDrawPanel.class index b455954873902ad4de270d7c99b61ee99aefcc2e..ac88ef75ea43b90eab3faf3af293bdbdb6c7cb7f 100644 GIT binary patch delta 299 zcmWN|%PWL&6vpxIIWtW$ltL3j5>1FkQ!eEe@#0k`#@&!1WiaISDw|iauvN3PlpU#A zC>skYi`m%8f=Ss}_y<_{ZO-R8o#*5Nxxj7GS6GIZa`FgLLPf^$Ssu3lMjB`{cAC^n6Bc1?ni(a+G_AzVHAOqF@!0Gqrg=^mmvnPS50B>Sg+4y$=aT`x z803c`5r(B0TSAOTn5eY4jETj##E414xXOg=Fez!K}i&LeKWpup#EH0nx-YD{D?0NJIs$wjaf`B4O8Yv>8m)nsvRBW zMrsG;;vnU)i<=x+%EiGyz`>_?y&t`Lz26mY#e17|*EZv#g(_NUz*j1`ZOduHgP%Iu zX{5uHohEge>88)@K?01>gH4bKy+jESr=KJP6EEDMr0W{69kgcMnn3zBlplH9W_&&Dz-d1Xa@ zNvp-G*082NG8$xE!^AYgh9<~qmQ5|NrKiR-wzWuJuh`KWcJ+aRmf6!c<2(E6`Q||X NIJ8_Gm7c1b~O7)l})NmNnF~mMg5|HtT6-1JBsV8;S_Bi7txy!Df2cB0{Myw^gFpCNXRmr`E&R zAue`GI=dx@J(BNXpA@oRN+_3dDx{i9ImG6Bb=i~B*zS! zs)G|o5+{w})EcSO8Iw3|WOBw#j9o70d=;@yDXZ6neb~8(lS>SxK^^)va4 z$2IldNFmqN#|_>6Cc9J*a0^pCR&$r*+@p^BoL3kPH0flsb{=WFl^gQrS*&X$T$6{gN2TPBErw5`IHF zLx0d8mP`|kZc@B2RA&-V>^LY{_RYrpXfBrW*Q zS|}M4=uZlRNF|%Gl;I-8L~byN`%K{>={#mCZDjC<>3krQZ_MBiSrS3EM3W;nW}2sL z-N{~tkc)#^B#_4#)l_CPnK^iwtFw9dRF{(R6|gpHaf~*g1=nbByG?I=q0J1_j%w zE-$LzpnANdeP3o9SJuMACxJy{aRvu_9VLFt> zJ059xDE0w5zQ<*z#C2!2AR1mYEm(QNQ00}Nny5RId8YlelBOrPd7+`UY5XtA;T7{$ z3zVym*UGqE*>;#k_T0#~dUhv+=`x$`>GIKxaxAiZA%d@1^hwzGP8>hYQb&p97xDBk QoZpPlhvMX~*(cuhA5yWTRR910 diff --git a/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class b/roaddesign/target/classes/com/sim/gui/handler/BasicIntersectionGUIHandler.class index df09edd075f430a6dd15524e6d8616a71dab9cd5..4a36ed354cd9bdcd0c024681a64c1f7627177489 100644 GIT binary patch delta 206 zcmWN}xoQG&6vg46AjH2xTNwry2IE3-v~a@|Iw5X>8AlvYlb{hRAs|?YMX(dBowu+O z@)ou}N8Z8PT+TUMzMFp2FPc&bf+SI-d_%3ZG!HxxAw!HTadL9=6nOT}YOPE{6p2#u zjqtx!mR6BgMWaTFy8JdUd6Bh(MU!`0c#^(&Wl5VKI&A5(r^kW*pZmBAShg^ZFau#+ kVTQttgz*G)cw>UilrbO7`DDe6jig_`IkMoy(pQn|9W_NDa{vGU delta 206 zcmWN}&q@Me7=`gC5bRT?Z44sFC}d^@sWAS*7#sz)fi$HSm7qoh!GMcs5$=N4&0Vw# zybHH;9o~b7vpR?O{l%F$^KTpDkRXqt5IH8aizGS4qQo(0WGQpPxpEo(nb2HuNQEP+ zk(1hau3BBKflZSfE#0=c;F_9tj}8NTCUkkE$AUiZT0R)E=7w*A&29Sgz#EAfi@6gs k5i=EYFXjPPyRYYfCoRv+lsD$AgnhB(hZlZ%jf}P31Ae(7F8}}l diff --git a/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class b/roaddesign/target/classes/com/sim/gui/handler/BasicRoadGUIHandler.class index 299a17010efccef2f98a28095791d1f8018c0e14..adb7951861a9d3c6289753395e474404bf575304 100644 GIT binary patch delta 95 zcmX@Ye}sR70xPEk0}F#B11E#jWKGsONm&LJ26+Z81_cIP1|1)FhCstrKXGOE}(-nQ8IXp(8VadjNvoR z1X-q-wwPg#Syq^5l?6&HvO|tzmN;dZE9=~{MvHYG+2Dyy+Lm9*^T`%p6!@m7A{11V zZ55}i5>)61_GQw2c6M>tlXv6GuUqOqz!1{MAt{a+wtq65NHtbBHJhv3>1QNp$VaTA qFRap}lS>Iq-nq8d&3})WK$>Pyek{M4l%&0!ZsBrI4-azg4gCQ^O)^RV delta 270 zcmWNL%Su9F6otPZJk{~|AHgUnItX&8lTcYf_oB-{va~^A1m(akI>u+1|C+U(F#{a}|LZU0iD%btl*GI91z zlCnv0#0YRKIq%Im!J#5wHZ6Z%aiEIjlwr=vaKRWgvec!VsM|~JHFWwFDX!%^ap1Nz qxuK6+iELgzZ75Gdce+Y5*mZ5A6T| delta 95 zcmaFM|CWElK2}Z@1{MZY22KXG$;VmUSv4708MGz~vmG|n1B&T0@GuxKNH7=zRpbJeCGT(psB zA+(HE5eX5r@(=VU`Xk*qaG!Gym&<)JUX1rdcs{wIRb5}In&ky5&`Mu9e$96S=fCxp zbM00G*DEVuTeh;Ds$2Fl?Va#XcWAh6_C-QBae5e`mr_Jk>f&GVVzqxxnqla*=op@2X=X6j~4qp8yxT| q=8Yph$n(iDU&3z+%}(UkJfVwIVsdnVGlnS1TNY!SGlkvkMDu_42RKCl delta 250 zcmWNLT`Ple7>BQED{Q5t)RU*~#?&-Rk+&E^azNxQFT?QHR`S&Lj2tGj z$=36+-)O|IXIkTtYonPYEp(F*+v%l~G(H)Oeo|z$4baDsY*04LC?kw(PB2DJoRKXu z$-1^}rr4JknC4h4>UzU0x6E_L0{7}Zu*4(FJhQ@!$0~1k+;)@Nw#UHk6jrgCx ZLle8Su}24ax)e7K^yHyJN3}*`^B>fiG5r7l diff --git a/roaddesign/target/classes/com/sim/intersections/Intersection.class b/roaddesign/target/classes/com/sim/intersections/Intersection.class index 26d9e01e07e66ebcde5815078efeb677979d2f15..9a275cc0dcb63d7042b94e84396b131baebddfc8 100644 GIT binary patch delta 49 zcmdnYwwZ0i6edQF$y1qZ7-c74VsepHW)NdwVBle31d^-_;tUc%nvp>nNHQ^~0001V B2GRfk delta 49 zcmdnYwwZ0i6edQV$y1qZ7!@a9VsepHXAomxVBle31d^-_;tUc%nvp>nNHQ^~0006Q B2HpSw diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersection.class index 0ad23138708f2fa1b481d519b835a6ff4cd53000..8eeb026787380065b9a625ea7a694c37243d85c5 100644 GIT binary patch delta 841 zcmW-fYfO%D7{-5Byr$MfMe|n9rME)GFwJQ;n`|bGL?3F*%&D=kIV6XW(|DYg%rVQk zyvSj(K9DdreJ~p>O>InusT`ZT=gafEuKWML@9X|=Pjg0dMtOr*1|)+C;4GH;A;%{K(u!AGUhqUlcQ zz`rr+bk!_EG#jtx5Tm)a#ynCrpQ*~U=mlhHq5tuq<;q`ao3F6Vb8Yk0L})DuTE|4K zCsP~9(MFaTbG3=}+Dw75P+KTc0sFO;quNHPvCRBst6$en{MyBR?dGA1sL>v3jnB=$ zH2q3@sk1w;b%1&uq{*v8{E<#E-P_!Lhdo`4`HIw8V&5ufJiVJ^g6 dwkOn7m|HJSNb~eD7t!esB~FvqZO%#z{10lo+&cgO delta 841 zcmW-fYfO(}7{-5B{HbI}iWG{!PN z`p;=1kx-#wb4tUe%?F!Pu{qwopMKYMKkxJ0*M0A8%W2Cw|2AAD&b#pXMJMraf&eNB zM zVi(Phf5g`TudK^!f@xtOZ-}CmXkL-TJ73?(JQaSX8(#?G8~ylhP1~*64^sF^I=`99 zAF}wz0>NU50(D`Xx>6($rRq+(0;p0TmyB19H`RlC3Zh9pd8|G>wR`UsLYuwSu26d) z%56-n#~O=`uVYZGU*SkR8bN?k2v#Z~8cT%6F+}4@GNu~G7$+!=Nt(zkW0o=7n4=8l zX)?<+#e!w9LDSf#=^QeaE0a^2Nu}|;W^qMX+|V3qHJ1iu^U~O2{%xQgd{i!xfOKwZYG zYUfz&UvHfac^7}x6Qq0g#REHOAYF|%U=vI9kd0Q`u4du(GCf{%@ttme;tY*&FXtu({0AQ_*OmYP diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicIntersectionBuilder.class index a6e2a2024cc46381e631902d9a5a2becd1ad35eb..bd8cc3663d710b8ec5385e17f0b62bf85c2a5ba7 100644 GIT binary patch delta 1104 zcmWlXdrVh#7{))(m$48sNEjjoD8x1 zuQjGh{!AR%1d+oG<`PdHY1~65^Q>FIe7hD=NGT7pl!vHf0nbuGBa87{x1BO}v4lO8 z)6Fslc#^YJaK&`Yrhlc18&t}%N`b6V2x~Q!GDR{^Gg(KdR}&ZDN}C9znGjy#7B&&Z ztHiR|K(>&}RzumwBedFUUN`GjR?$W^+i7A4Zy3TpLwLvL4$;9!c6NZh-tk$!0RQ_0 zSTlqV2{yx$3}aCHJr3;r_AW2*?!7SPSeR5_FJNZ4BCky z>zreh^OkLxaYiiH1x0XCFQnPD2O zb<9>B>8dxZ!9fS zh3yu6r_t=Zq?Ie)hi z9x=jh3w4Aj9VJCQq?!6mGt^6tju~aI*&Q>|KDO$(?XRC7eMZ@e3G z#^oQg#s5fUJdCvuL z$W7s>3#QkF(C=>M6Vub?HR8g!?4}V4_NxcmeUvb6HT}PuVA89`2gk z-p+)j3gqI*Cximxm`XC!$z&!zW|2psT@NvrV#=A#lgwcWC9JWhMjj_X1-q$auVoH0 zpZBPuhsB(=s-H}+Qp0tYF+z1Ghu9DG+T*f z8;QJRAlnUX2Qzq?M|j0rHBoK4j9sj<)*E@vp7wB<{T#EpEG?Yl2)(q?M>pp! z+s_~uY_eS`kT*V!2as+@p9>l}N6}*%DJJ z(RdzHI#tSGsV1`0K-MaUb@JiYBz9W7OOt6)K1WqRtETXlrqiYww43KADx_CM45-+v zOJ6SEJVqIRn97M%88NCLUX>)9-mm#&YXJqSVx|__f2^{WPkFa9n)SqL#;A@cJxiQv zyw)&5^<-(Sk=B!^bxgBO6zVx6ex5R|XR$U=uNT;)Mw+yd-P&Y?ek0pVrvgUxqIWgZ zr=mSJ_+F#g&%J6UNe4(VO*75VL9>6|Xj+(~LzL^VQ5~ULNA0w|L4%H&{hQvRtPmII zFv4~t?69HQiPih0>m-?`*`_(_WU{)9veWFkjI^8W`q1{*L%+`PwR-u*^qTs(rSo#? zQ?U9KstbxRjn;sY^_entQ9fN#t}ZK2SCp?o6`RhEw-=@QQjh8@EiheVMKxAjukXB( z2Zj{*)fRt^5dB8DemBPJOw^E#H%yUkP@z9rt`S!2Up6@KJI7WR#H;QOnq4rhZWM33 zP>#DWI^11+;KJ#4qd8@I#=HhxBv)KC5nx9>)b4|f;cnCaqdyq->L)cSE1nRSM4}r@ js!L|7OQF<_XP!%Cp-W?lMKUFN>%yr%yEa_avD diff --git a/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class b/roaddesign/target/classes/com/sim/intersections/basic/BasicLeg.class index b58f20150b0723f051dea417bc842eab4b464ee2..d89723e37b53beefd6e6ae87aeb06cbc11de62be 100644 GIT binary patch delta 751 zcmW-d*-Mmh6o#Ku4dpbsl%u6#q^43yMTT00PU<+hg{6svNgCLq*=9zHOH`ASA^1g_ z&|;~XYxq?vZKP0;LK$d*^bd5?jTbEj9lZJ8bABJ^dCz(0V&-C=##;UMu$&ZpaI%V2 z0&y8G>v?-NOW2PW2k<6G|Kt+FL37GlEwzQ(9wC$>A}MAo$JxmV9Gt{OslJ}ls$9RP zspSlpIZFfQ=%j)HE-*wTpSZ*fReYzKpQ^v9VV+u9Or6+O*Kt)MxJEc|g%u!?#1Nrf zs94NNTeIXFETsisT6N<)Y^06d+#`wmy2JyrXeXP8%p?hX*0`of=ZjiQYe+Mi#xx~- zHA{ViB>opxJt%}fgz;CGo+pZbM2iqBi*V?XsbV2bmXRY~92P4_#YTzv7;pW4L(|FZQmk=S|v-#LO*Md zl=6jYbwHG*5{q0kQUaV(weZ#+@X_JMTdor%Zi1zOF!8WWZs^G#;-pcxxk-j0xgZ@lSEp60Aq-|Jl0bw1zkIr9lZYQl zW}>Cs$iRg|tl%)7Wa`Ti0?2YsTPme0SIayC$tQ#YwsVqbPGO^1+e`GNRI4&hbA~F; za*cD;Q_d4EFu+BIsNge~nW2*JT;Zqcg8uwNwJfDZ4AqU?5G%C=1K05Y2_XWjR)ON` zoN{lL>=u^OiWm1ZaT{A{XD<(k<)Mb?AdN?)^O!6;$yV!Qbdf{1#_Q7v{nYSG!2@dH zpn+j-^PCpdHeNVKJga5bgyJW0=dHTG!{9ysOcBN>_AyO7Ur6SwTFj8aH%_P)GV3h% z@|UOuEd0`K{U%6icoR4*Xg2vc*@VCq;|(oDm{r zi>Ecdp{^CU$|W=2*DjTdcOAYTY;|}_J^oV1I%yzC8rdODI&ves<))^&MT%;g+#yR$ zill|Bs?BnjR%zwFv^)F#MkTXLG2M#kQcRCxdKL3jF};fEQ%t{N`V=#u7>8m872{Bh bQ!&Ge8KF}~8Imz3R43&nb24s@t$p<$_4TY; diff --git a/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class b/roaddesign/target/classes/com/sim/io/exporters/IntersectionExporter.class index cfd53424b9f9cc20f674f070a014ed70b00830fc..217166aaf024115668ed7b5bce076215c61b6b0b 100644 GIT binary patch delta 13 UcmZ3*yoz~4H6tV2+uYybcN delta 13 UcmbQlJc)TjG9x4BE!L#*8weg`^h+|A3lTE25<61*8S~3POyk!hIYf5-ivm2+R91h74CC4dw65=HV zt|{tLAWKPA#^r_wDm+r=QpL^ik!wC{WVs9CfBFq(rYtJ?flO{w)>c;cUabf8ya=|@G%A~MKi&-AX zQ^6ANsPagShUT3*A3Wjk!Y9v+c;$;XTya5@A32udN*F+-kNO4ihvr_KTm;xtKc#WFW$nYl2@2Lx$J9^f|494WA`jY6)CCCq0Twd1;@IkqPBTU YRrj3enNz))pVah4L*JbF@&2^_0gF#BqyPW_ delta 254 zcmWN|Jxf9X7{&4b2?;Jrv;;NXA$15G8hSAc%nU^d%IG~Z>Z)`q~o~CmCdlA*LB2&Zs%Y z4C5qhnYA=W+RT$=m3h`lQDlKrYdsdJkflM6OS`x>yDZUTg*%qHr@#Yi`1bY81}|*# z#uo2v^UV%FC3g9>;g6#F*_T5}Ar3Ump=U7Qjl(oJB%0f{gTQ+mMViTgF1r=g9d{QkhW*g NWN>ECn*4#)004Kw3g`d; delta 61 zcmZ3$vw&yAdlptP22KX?$zNE!Ii(m_7^HzbnaLik{gNs`mKuXDg9d{MgC>IwkhW*g NVsK{Ap8SE;004Ou3iJQ~ 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 10fea340509673372325b250fa87327e82dc93f3..26b98d2068285492cd654d77c3642a07f40ec196 100644 GIT binary patch delta 61 zcmdnNwS#Me9t)=!0}F#V11E#TWOEiTMuo{uESa*JK)yDE2!jrTD1$D89D^Q%0+6lD OV8EcxU^tnB)c^oCstAk# delta 61 zcmdnNwS#Me9t)>90}F!$11E#zWOEiTM#afZESa)eK)w!x2!k$zD1#n@9D_cC0+6lD OV921(U^JP7)c^oD{0Nu; diff --git a/roaddesign/target/classes/com/sim/network/RoadNetwork.class b/roaddesign/target/classes/com/sim/network/RoadNetwork.class index bdcb7028a4d1535e21cd032b980c57e507f13b1e..35ad6fb3c43234873396b646f236b13a91d27005 100644 GIT binary patch delta 259 zcmWO1J4=FL7{>AcQ$6*X?|}vhMbeHC9WXk8VVMm@wFp60G+ETt0SXifDhkRe;Rd12 zq7M*Bn`57$xxKl?seAizadC6q%|tWt{^s-~>7bv00b&d?!cgPW$(gk=+8L*l2|`Tb zkz$xBO{Q67hCH(rnWLonEoq*ar%r|s7WmS}H(7o)|6{q4?T#6*Lvo5dUVq}Xp z3iPr~A3G$~qwGo4E!#sJj-=)mykojJ!RM3+XVP+W_FRWt$db2VORBO|RhOzO`B7b~ nZY1Sz+B?;~_M-CQ=R*(r-J{O0NXtL4PkOZ~`$5Kt)PwjxODZ+1 delta 259 zcmWO1&nv@m9LMqJ2Oqw(?~fdowq(k$lx8A7YHVL6Evc1*j8dBmr=d&~p(q^WT`RYd zKR}k-j{XK`cW0NKynA0By?XWT{ca|k$@e#>XOIqt2pA^8h|Xx^(+N#JMLQF8k|x3= z9#dMFW}F!onWexSCFZGWeo2OB7O0cugB)Lke6z%_=6@_VvfT+|@=}bhm^FEgmSUT< zQKXkG`q^ecJ;sj2-4nZq!@ktq4X;8M2lyNk<49U=Xpi-fs^q*?d#XB-I)9;?}Unjx_mQ7~ZVv&M4Zqbx+*^$8QBzN)IW0HLm95Bxz zIgVK2m^?N4buXvujB|p+DN{69ph<=n%e18ztD7^ToXe|Ci0`eM4r5$M$-By5tAC@t zJ>vA4;FeisiaX{IvdSFytnt7$k5m{)#1_nxb`7O$tL9nrFZwr#z3cU%dq45`5*rVa TKP-VdAyuPmvdR!6)iB@xQ@t-$ delta 249 zcmWNLy-Px27{z~vFGcryUoT{mVW1@?31U-UlaxeF<*jH5EI;O)atWutEG?e3wi>fq z#QrLGr=I1UhXdz1zjmsf`WZX^I$<`jY?5G$4BO(kJ7yP`k_7He@(`aRVw8y!u*fkv zPRMggfioGow{sPyxxnF)S*k2iV}&}aG^878m@B4eO5euC_twlcleA>d>lE%Zf6(1~ zqC7G~hk5k{o=EddRy{{oiF)kwq6DuJwng)%TkmpU&&`MSKlN`A`O>Seyx(~Iij4-z T0n4CCNYyA!Rz1W}b%MWtx^gZx diff --git a/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class b/roaddesign/target/classes/com/sim/network/update/NetworkUpdate.class index e46de8cecce27c9ddf7241085465f4a2e965b302..8a61e82ac9dbba9b883f934bc4a5f3b05254716c 100644 GIT binary patch delta 13 Ucmey)^qpx#5F;b=03)ab1poj5 delta 13 Ucmey)^qpx#5F;bU03*Q!3IG5A diff --git a/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class b/roaddesign/target/classes/com/sim/network/update/NetworkUpdateHandler.class index 7b6d67861a1a26791d932bedcfdbf41a17f6e38a..8ec2a2a68ec7f40a0281a0219e6ff4e2f8992ab7 100644 GIT binary patch delta 13 UcmdnavYllE7ZW4fWNs!M02<(#C>PN{v$gBg_kU6Xl6~ zn|r#adsCh2PogZ>ywt)fn6LU>i)1KaQzlOpO$`s977aSo>Cq&RHl@u{%$hD6u@QZ? q4A?PbFN*^sj*K}m;Vit!Mfg~$~AcGK)W@L~B Il1vP801cc5kN^Mx delta 57 zcmbQoHjiyX855@z0}F#R11E#bMfg~$~AcGK)W@L~B Il1vP801`$9t^fc4 diff --git a/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class b/roaddesign/target/classes/com/sim/network/update/RoadCloseHandler.class index 2d43b227d53159dd8c45675c6f0edce5a00f2105..345986cfb073e99c004d3f6331cd195b945d53d2 100644 GIT binary patch delta 45 zcmcb|agSp|A~Pe;S6q#6(l@_jI1=)qN2!w^Mm^}m?&cn=s8D^MRFc!S!@hivi`Wpjbd~73~ z?W|)5dF-T^UG|0DKL2k;4&tE{KZi)=Fe@oz4dtw-f)JG^tupfw_HvZ{95+>sv06@1 zhr>yFjr9}Z4h=lxG}D~nBWIbTk$*JH!#SnWqSdr&18pj#U12)32S=rxS9KbliqNGd zx^RpDhfsl?T>ukOK@^^I?wh zkP|$j$^G>b2S0|rzfmvPVv##((SNZC8FE3K&car!)3O~u<7nyt` v%hE#3Q^@oUT%a7G+@8B9mrmWoY2x!24_t@A>gWf|1}uk5B6yukTDCpI8b= zWCv^5Nd|@Fv5W2GyKTN{h4$m26dz^yIm8MMvzjBMQ%*J&wpz(HswkqG-PEv;;~b;b zrVfXbv~Y?JPV`I zXjTI)YNkRRw5p4{a=GVb#JC5E%9QT&%e}dLqmq9U#UJAALJ~71 xGfgUU*6l1g)=(a^&cFB*D;MFhu43e6nW6|Nnk2KNDuy&Iajpllqcq~{98B=337UNOgQC=Be7G4uGgz^=IG83aT88z}wAEnsK zjwniLR_txmH2Ycm51j7eo^$U#=bn5ZA9(T_j(WS!2)i37!-t1Ps`1+iW4N@55`uQt z`0fnhq=i~q3DU*@?MxA3nl7Srvq}#Zy=;r`&`(+y83wsz$j*9l<`_kc%h{Ck1T{?J zm$sQ1I+&F#7)=Qxx?ntdutc8OOWAGD#nMj0&3)Mo6*7fzTngOzt@1fny#y<(V^HIp>WF-Z|kz^G~k$;+h|B_~n*@ Q6o1@P4hrQ0J6Dzd2hyiP5&!@I delta 318 zcmWNM%PYij6vaQ|l}Ym(j|GcS7^W09<5?b|X4Du`-*8T%$bMHB~d(SyH=}CH?T$ZiG6k7pD8QHjTQceLCX2bGjR+2%DiCf=I zUb3jAh&rmMr=14+@iIU&qqHzfDmae?2&orz#KY4k|BSIT`9>dws| z)eO{1iw77}9T%Grnq*2iq`Jg35oXwBPO9@SsoZs2bdhwH6>0@Lt2o#sPu4E= zQnnOwTak9?5)KlT(H;xzOX2{-5w{%kzzL6>@yt1|iu%SS@0{|X`KPwNxZ;Ovez_sV Q9e>=D1A5pFCXpZe2P}?4q5uE@ diff --git a/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class b/roaddesign/target/classes/com/sim/random/MenuLookDemo$1.class index b797ebd318b720c01748977ced6717927d12ed9e..e7a5e5692e349af36156af265894bc6a85b9b979 100644 GIT binary patch delta 23 fcmZ3;vXEuNGDgN_lb18vv#wxZW>`7-HKQ2-VF?G( delta 23 fcmZ3;vXEuNGDgNFlb18vvo2#`W>`M?HKQ2-V9y83 diff --git a/roaddesign/target/classes/com/sim/random/MenuLookDemo.class b/roaddesign/target/classes/com/sim/random/MenuLookDemo.class index c29fd77f355e7c94e67930728f74040dc2d1909c..0ace6660549c522781f3a51968e42162418b6d3a 100644 GIT binary patch delta 376 zcmWNNNhrht6o}YCQX)*;a~{|^%vQ)B!vq(P!8^H zZk!z4-JCdhy~FpG?_GYsaldhQ=e`p5aN+wX?sz;l7wBoj^wk;-UNi6>pB4APXD zTG?b_RTgPiMh@l5DspMmtsNUf3P1GO)y;D$=>_3MdhUZ~~O zO&xF4^G*YwH1kCZ-?Z{W8-LivM2Gm%DM55gC_NHOuO!eXneOA{l~ z!Km~yE@MoH6Nk8%lxgK0PFZ3Kf1nF5kYxfeW3&f6htBAFmO$o-VL{VaBo8+wtQbjV zhj|SX>-eyt#-?7kjBE2+#2()4>)#>491+E_=5?w`ooOoPMvbM$<4TQNMf<3G)Re(k^ZyX!QuKHQ`|O2keQrC4x~OBs1MDNq(sP6?G% zP^GaF7d6yVi(Bc@tb;nbl)YLVq=5j9%xQOtCRS)>ixzfi<$yL0Y3EE8F*>C-Oa?GcGRQWW7?}RdXX~n#*T^D_jdgXup>8(y z>WJwyLdFh>>Lrz^PV8xS-;5j4{9{r$QQavy>aLJ;{nrK6TgL+;lv$LEfrWvGffa~(7*xSK$TJqVhqwiC^Pvgix~i!DGBHR delta 77 zcmeC?>gL+;lv$LGfrWvCffa~(7&sYZ8Mqis7}zHNVh$4I1&Zxl7c8WY>MN`^LBTr6hfnNwgvkrgF2l-W{YPmKe0 rE;P8)Ly=<=nrOqo++L75d5HdNVCV{g;} smkSN8J;#b+C zm06>rnS%ERMKdk;G)=9{rBKT%|><-X_tzVn^!JMX!d`BgPlj=i@w zy$c}A>{+Qa#a_MnOQz5r@UxlscW(W*D=aLYiO;N-c}O=W24?d zFM?L=s?M*N>?$2uRDHjL-lFvy)l!{W95^n(t04)UjKzA58fc@s6_{sf)MztpQTfg+ z%T|rvqiyOjXL7>(w8Kgt5Q0mJrWa)t&8W_BmlYMeGDa6wRlBBYw3BwJgU*4Y_KL?A z6?a8OuDjG_qYnw~%ZvarGVXV|i|?=QQdwT?pgnlRK_Af}D;;dJ`e3U`Ihbdd&Ksf8 z$8=b^g0ktTdOfI1ha>ci$4cg zxt*#BO``VdP-w8t%ubDiI9PojI=~)g?1mF!lp`$0;XoNjY8=JUswga}TP(pb#$8rf z>Kas3=5pW^chEQ^=dd#| zX>!P2?yfd0*%0i&T1gaV`L7yhb5C_8e4wSb#(lW2>Kie^(qH2Ne1}>V(Z`;H9ahdI z#HmZRAayW8v)Oqt53zEd3W&@y4dr1fCvvcV4iDFO1dk;6N*L;5R0l&>Jsjz;$@Pe% z(Hf88vFdbWw!MJwwDLG3=|j;mu^Jct&WQn~uJXxkoUrqFzT3(Z#7n5^7vrnKqy2p} zzK8Esi=zhE3b;t)i9AU)MGdvPxY){52w7qtDbRXk5x=QWYbpk)49o zf#~eS0LE@xKYemS=dS#;dqSo#}9= zWeu;j^4qF^e1hp6UZ;xVGc2_l*YO6mB)*$n=LRd+8}YppAEMF{0>!~b-lS{^JuRCx z-oo#yyo4bk?@2QmZpvjgNGI`jjo;@F)T)FGbFGzksS^p&!8?tK_9E{!SofQQck+iC z?^phbA^msqL5&a5a_MdY$yL?G z!I$}GEB_=4lPbzGO3GXr?()iM)fq!wGxH2V<16SY(`mAF!_xjIR*(g&$QL!F3APgq#A*t`S~W6tU+@O_!HWnn z+!^)gfd=%)#=6Y3%jDT1>Ftz6b|DPA5r;iU#$Fk_`_LU9q7U{K!wHsfx!O{P{Mz7>*XZTow)+e@j9w5QNX`|4?bLj)Zd-bhCZ)9dMzY;#H@9h05o z;S$kFWy?yUFI7fX$j~NZ;jH1^*Vnh6n(FBrFMYQH?eZJxq8#|4o-S=oX`stqES7{` za?&qGUOLTvycOp?UamRm>PEVzp2-UG-0*>+wvjY4gkw5R8qYeTkVzBtv=*&BJh*kOxqNkOveFlSmedLVlhbMA<`X%)Diay zPN7aHp)|~(bUZ}2;YsR>MbrZ?Q#M|sp3=s>P)EJ7h5Cq>0oX@(;0O)$-~{DJYvtm5 z8ibpaOBTwbAR0n3G?Y?l7-djC4WQvPhDOj7d3Mt%DyPx(knGQ)aWtRqq=ht|o}+tY z$lXip1idto_R?fJEGL@e#6^05u2Lxzm9d2?*^jC?l%{hOd1i2o2pwpqe5TLhWWiLL z&6)HtX9;#C4`5-PMA1!>7_LX@sNorVv_S~6MK$39{r*fJ| z`%uT}LR6+8lyDcMN;P9}A7^kT%rxHvUpaD{Y+u9#&f>qwWn2?e5innc+sd8VHm@R(ghBLjN+Z@5I=NdtclTnoG=57f>Dq~im@ z)rPEduW@Y(9-aFQOEv2}FtwHk>6~xqr2a`k=TZ4-vj4ZVTE0u?`vfNITw*Mhi~M(; zXBhHBZT57YJv`mXb9J6y3$gcjE&r>Q7d7yUIxk5V#Wzx%yxhreHSh{AW~X>IV0JC9 z)_J`c5Xq}^V_Pa)jZ{biHU2PL=WQ)=dTVerPMBb%LE~D^?`Y(mh4s8U+Z=9gq!$Y{ z`KjkUI`3=)p6Bl*I)e~Sa5MbjBTN7Z87`>U9?49XR9=tnVRWs9jhgI#$@80+7P>)d04>~S1@TCU+rGbAn;$ma)A*AI~$p$;yA^%&T9s44XwLckh zwmD(GVVvTdd`obMe2*B*%_iy>&dS6lv*1EOAHg*yi^(Ra3)%%;TwscHh%jCRU%{z@ Kn&4p0G4MaeHV*^< delta 3681 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 n=W=xm6N|9gWHNaPRtQ=IM{XyAVV@}BNF diff --git a/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class b/roaddesign/target/classes/com/sim/roads/basic/BasicRoad.class index 051d07d8d54aa6d19d557ef15e22e2bf7fd5eced..fc4f314a4965c58d67cfca2ff34375255772ea28 100644 GIT binary patch delta 840 zcmWNOdrZ}37{@=~Ul<$#K^X@Qa1Q5i5n4rJP}xvxqGK(mQ&>QnZ7E|xUIr)#gtsAW zUC?*)zE~}tmpPS#iEY)yG{ee2T7O8&D32DZ^e zH_dD}qT6oYabs!AQg@ldZW7qT6b_ivhXm-0E=%|8#UbK3Z>gKiR6E>1C8YexaXVT{KXq-(5yVna12J8NHEz%<*56xJ5FziExLR z++`m3%w?QvCR|)*XC#JLO=5~3B~`IxDUN*kDAHs~6;GKG+@Z{aPx_gxG*XmqQ&|KR zB%%JHVr>)E9)J^Q2LHAb#A za-EUQMz$Ea-pCC`ZZxvp$PObrjchlv%g6?8aYw=-*BmZUw^hr1?_1gr%xQ;9imdYO zwbMQ_bs*XqX;ar>d&UtGb(AC>w^b(z>6ESLr(6T}@YB@lQ{FOd(iz$`$h)RHb(TH) zjAN#!^aX?Zk|CYrI}P!p&NHg7xTXvIsfYbEQF@-(ahT~@Ka*E7089#9c&$(^T3 zS4q%_`#i5kzqz#huE2HskumH2MUHOpl>TO>)n&RFJ&~WQBK=2XI1kdHU}?`M>|1drz_<+3?$ekgEN` zP<`eP1XxWvtz@#+zY1L*zu9g-k;@iJXs42`j3LQHwlS6MH1adE*ugw@(adgI=wKy# zjqjk1eg0+soV+8JaFh&wC5w}mbczB_r{;u1n$*o8Zd>Ut#oQxK4|O~sK`&Ey$XEQ$ zH}o-`ews{|^Mp-2We?9d%yT+<=~D%Z^sg^09H-ZQM&X{=2TS}&wjf82mKFqxoLrTftDJ}`EU%JM zji5?Ze5Pv4tf5J@EY)bgrnoCI!Ez@O)aOP`HY!0>_2&MP37YD^jx?*m{}D-Ow*L@0 zS3BQa3kYi=1!^+qVn%3*P0?&qEN7Zl(5UZNqVHK_=k;pwFNW3m@USDbYmHoIwiOuj`yK z{arWc(oL@D7TxNmSGRerJM`-=&vcLXy00Ads7$>o*F)9nAC1)`%77`URi(DHJ~Gtr zFO+?&S3W=9R`8!~2C~!*VzbqDx~$If!>Z3G;KBr5k+~y8T?rK~N{x&0g=wQJW44R4%5lm7xG=Y9WIqLlJ{B RLotItP&|gAY_cDFKL9Zj7=r)+ diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrain.class index 73b45c6bccc5f55931e1e3e913886e0b7253e7f1..9a222a7ed5f2717d36be89fed2d0d7c3a0eef22a 100644 GIT binary patch delta 57 zcmaFC{epYLKNd+9237`D23`g=20jLL1_2-~$)Eug(VQ&K>cy(hz`baEQ2E2|Aq Ko$cfetQG({6$%9a diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicTerrainBuilder.class index 95981975f3a8caef9d73ad4d67483cbf29dbf5ec..73497032905d180b5924f7627668a996902605de 100644 GIT binary patch delta 297 zcmWNJODjYH6vuyOB-}fbQDkG#)D#o4m~PO656VwE{Gwi&9Pi}$punf5z9{m; zKEHbZu%w0q31CYjhZ5#kqRO!-C(_5MOmQYD&SeQla$L%h@-m)3BTpi;u2yF@ia zOG|@tp@xO1hckZl{*jjkEb(wIJ_^#qg@lyDAueT@E1Bb35)@^Pk{od(1?4hjxzpb>xAKbZ IM7$-}Kgw%8761SM diff --git a/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class b/roaddesign/target/classes/com/sim/terrain/basic/BasicVectorMap.class index fbb638f982cfb5bc879a48f4ea4a908232a495d8..90f03d436472358264e113a45a4f4f657e8dbbcf 100644 GIT binary patch delta 625 zcmWNNZA{H!7{-4W)ln(suTx8>`U_=cRw|}t71F^DtC(Us!)#`gS`lZ{2(7}_{>!|5 zh%q)cw!?h%Me;shY(6kEFXd%3Hu(^n`_uhA_x*dW>%N|`nz5SO)lTXvVyGpa)g)7g zL(r>t+5=72*=n6__-P@BF!^k!kR2>yr}y6R+%^(vCy5Ty=p>W<1UNt*T@={4h(q4c ztP!^dAIF%^aU*-lpwG1WDP@2vt3ghCk+gTkL*{gb8Jsnpb4HvuoePw4k!q`J7`7cQ zv5U**I81~q-hls>ZhA-39WRt#qPuqLUGRWdM$G3SDU33kN2cgT$8x2DcrCc)l}{%hI>};%g3mu@k;T$Rs!Qn;zxo~m{2N{a-uDng9>C5 zs~mjFB}*>zG=~DsrO@tW%8w>xWy&ovWU(QohLjmnZpczYN)1`Ya#cj@0zp--B}VIr zQ;0;Z$I%A-Y9L4TxN0O{8!6W&sBYK!FYNmM14zz< AyZ`_I delta 625 zcmWNMNl2Ap7=@n$4wXaM)q6#~+273}G{nfEK~sb9YFVf>Sf-RT&>}Jo?OIY&mZD`p zEsRFU5?UnOAX>GG%4R5NSFW_tHVNgT-qm@(^FH4>-#1w?Sus}bNeB`_6?3U3o{f0e z1?vY%uIENhUJT%gP}$R#(F^eKPXnyxUPtCn-ki0hVfg92_+Zd%1{ni#SE zJG9yyV$|*T-q)CW%I9%wd@J8+GDRK%8DKezkkX44PHe{_K#fFqps&(N?e^4cxiO?3JR7;HN z@TeZIwvn!_INDB@c2KAW%Cw6bHBztL>@@$7acyb|zh0E9@>Xj)YS-I{S35p+;8!OB wogi0Ts*|T-x7tbj55_BnLjV8( diff --git a/roaddesign/target/classes/com/sim/util/CollectionUtil.class b/roaddesign/target/classes/com/sim/util/CollectionUtil.class index 5caefcc2e2631607fe6e36dea034fd4ec460d994..7f77ddaa017e138982af5939f98f99de2a608d7b 100644 GIT binary patch delta 140 zcmWNJO%B0O00yTPuZToaKP?g#yr2|G?TEB~Leg7V+r5iOoWj~!q$`PUJDHg>D1&Ec zyt<3b!?yA1P@~I;kQoshdhF3;2nMau?EzgX(sJXJ`#$G(5aNp|v4^F}ptpET3 delta 140 zcmWNJI|{-;07PE|Hwr>@{Y4uKvoU@ULA#jv0~>E;ZMPQ@JcYGqkyL`y47{1gRJO9u zp$Y0fHV+pO(xyp=36_j58+zpQDH(85e`EA|n<#JzHJsFx7Bh(%W9B3*L`!ALmbL$d cAD8QNFSC$Y5_4e6kriilT(lITtN%9cex2$@`ca6a^VL7=#&k7(^KO7{nQr86+4~8KfDs8DtpDfV4e>+~jzc s^}K2f+zjeKRhkT93|f<=S<871fg(mg5fh*))5-H$(;00iv$N>|0LTvxF8}}l delta 93 zcmdnWvz2GVUS>wl$@`ca6onZ$7(^L(7{nO(7$g~#8Kf9g8Dtr>8RQtufV4e>!sK|C s^}HGk+zgsPRoXyxI+LYY%Xy7~A|^l)GX`k}^U3pB(;4k2v$N>|0M5}4RR910 diff --git a/roaddesign/target/classes/com/sim/util/GraphicsUtil.class b/roaddesign/target/classes/com/sim/util/GraphicsUtil.class index 97fd084062cd918c24604168c759a83b9bd4821c..09a6238c6cdcfe07e128bfda15ebe6b021e9a159 100644 GIT binary patch delta 765 zcmWNNTTIV!7{)(uiYc{PDW!C>4)m|3lCfIT!bs8)&7mYVQ&yHaq_~PE@=Hmj)aH~! z`5QKF+!$MqGj6(KF=XS$UGiMLzwh_?{NCsJKF@NV<%|ybTDUXpTN9dqCy98m6mOCU z!o@;;$C2X1_&xMpsoPb$&61YwO!`e{tY;n@@TGuYHW9^Uu_dHYN;c(`v6UJsXk;fx z*hQ1{HmaNu|C#7oIn~Lj9v>RC^ANG(TpVVF*g}rFGXnxVnp=gP7Is!9?F4d8Xgi^t zCx#9Za7d<;6wP!lDp)tUTvD7K+4fRJAN%On@+-73AoD@G7~(3!jA-7K{#gG!=LX~4 zL0vRt3FNLGQ_vR>%i;QE-I0J`4RKbdvde75Yuhe`gIp zsAP)0{8Beldd6=R^2g~5nO?-S9RA^D;A2LZd9YYBUgtFPbRI3}jqu0Q0z?GjZ9#%OCrNu o>lD&Os&$iYJ*>9N33VQGvIEF&mNFr`kuw@KRPbDojg8$r<|JPw3`U&9`=wXCX0Q{r-d?FgN4!26ArcuJ1OjxOgf0+w9pRX zaY*G1vpA=Cor-#ne9q&in<9D?sh4$Jl@VrgXz2P?dZmNhE$v(PV0;j7SZWb%V0 z{G^s&Y~r^%`lV<5;W&St-q^7ugHSVEiWp&`B$$gCnlrV}wJ_&VTu)+*2#*La;TB7* z#gVL;sy)jRg4^R==1&(gQ%Hs`$;4|u(kz?VmP3Kfp~!M6wLCUhKJ_+_9acz-^mg%G zwjg*n;k5aSb;S~0u~aV0@Tis)TS>Z=kY}X?tc(>_PPJ81YgKHsHSCvuLVTxHJ8jd( zCp8den`FM(IhHt*)yzcOL!|8`T6KD@h3VFc&kj&%ZB*DHw%TEu?TDfr4R$1XEcYxS o)+wZmTV`INlnKfKSM`Tzg` diff --git a/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class b/roaddesign/target/classes/com/sim/util/ModelExporterUtils.class index 12c85d6c631c00b1136e878b2b43a398fe4b1e40..0e412b4282460c56717edb978d8bc2b99716558f 100644 GIT binary patch delta 757 zcmWNNX-v-n7{@=~sm8i7ia#k8MP+l_(kB0iYII-33>~Ublw*rFN5^D-ZI~$LYKyh~ zZRmx2O*uyHIW{&Mz0EK$%=7B=9N*{J_j$g#zqxyF2g%R56Eqwb%4jCx&t%5pVmeb; zz*JHRV?E*25Wx}ab(p4`Xy;Avz?gaXm?nUQo-1R!v^Lq&zY_2zXq?bLb7C;X7R1wUGuNShsVj2XsQW1KMo$5ynH zVoWur88bLx-cFm_4thAlJI>0BPS44ZMs2=@7kzkh*PPsA9QW-v4_Iumn?XDIF&lVd zex7oH=k}==cI0z<8N$OWZt~iu-`d10`fc$5A9%(`Q+zVT2kQK1vx8Rm;58G5@nT0t3-SLy1uI+2_G#Z zOv{Osn;4}KuT^4Y*Ids3g}cJ z-74mq)^T0y=~D^)+Q5)D@>!c0))szhEC1qEDj${0R}~7@Hce2aB2=Y#Rcnd1D@8S0 zrCMbuQ-#{)X$u?C`~yr>BQ6~zN{2|)VRCeY3d^h2M7^3ht`>UK%0tT^nf9fQIyb`m aLc8qRa|G%FL^NB7VGnUs63;p7b=gcGiO$EF!+sm_C51pXd3tAES5~H_S#5pH9n<*m55!G3O0!T_Z_=KxRdO_W=&ie~GcHLoqS)9g7M{7b1FOsA6&GapX3Ezo7|x`{Q$ zbKN9vkY?OsOgCn5lRSD&w2yvn^O-yHrr*;s_q0lf@a82xyf!Cqn9W-j@s70?r}Bwy zHe77$RPxnCMor+GEjh}4zT;txC${DwKW*tTh8Sm<348g=6ebz5_=9Oo^4n>cKNTUE zVHa6wTx?usjFcBK<|WaXBp;_ev?m}GZ@ZPhLJ8CYXLDFjz)GvEvdT)UBzpdaO{gIq zUu`E`Su9aDQOY4sJ4sL;8R9`Ril|YrC`-6LUoFhTkBM> zG&O3gnv@}z3U$WQ7Cxob7YI=sVY1w!gv`j8X%xm1hO$i|St2=LFm{p|OLlV@m$4>gG`4IdB{wIRInhKZ zB?pcU4z8|>i?fS2{SMFJ_r2fye3!0E*Y%g#u*AO2rN(SJ31nc!Nh+D7kwvziiyW%S zrHMRRDWH!+hACo-Vgi)0h?{lF*`|UMDmhi=O4%Ew?y2EPe4&UgI1U1sf|_4daReWS_&H~UsD5u5+mSwl1>X0hdV$l?v;S0-g z3mah^Vw&hwd%g}W5#9d>N2p?l26kx{J)&3aW{)BEWwj@xeP+b~2W-gvg5xuX{pb(M CgGh}4 delta 379 zcmWlUO(?^07{@<d^W@gM4^if#q<&`5wbdiC}(NRSEonb*=K^=~r7F2f`xaK|xebNmuA(ikzaSTJlXVgc?_>DD8|xl9HtGQb{N^P zQg{(mHf#&+K|}*0+j~MZ&%JQJ^L_vGKj(axyCQ2vRz>~|HtSK z0fi^*(@C0ANhGJta3wLErYC2t$Z4~A)+|*q(Qp#yn8kS(8s>9>C0wL{%Qoy4Hd1YE zud#>g9OMQS+~OFwt=b*SzQhTG=a~W&KKqJRmB#sw|^ZgvV)&0<(CfgTSxe#a{lS4q~oSlDnM1L zrD_FIAFNMHJFjw>BiNGP)$YC&?0oj-ctfe9<^-t)jn#@KiXc>xxD-VT<8FEIs2x7} zoMpb;`f)T=H$v2dri%Cf_RUw}01Fcd(?G&Ch|U^JS0&TUcyA3MK`EqaDCrtThVjW7 z&Qy&cUn5zfQ4|Q1$?o>uioGi_AAQ&(uYx XF2<{+bkZ{7R6t+DWG#1cI_~@rUWL4z delta 812 zcmWNPdrXdT6vsc`NQsnN>!rPvGH*&MF?UfmLql>273CVjOt}>k!_4h*nayQmC3KtD zWj24fY=n^848u(3GDhaIncI2(c)sU*p5JrM=bZi4XRXhwt#K>SsdXnP-uv3^tBeu& zlR_I(>B%VK7(+kCGMF@yEly>;WhXG5Nz5XX`Aj9>TmjQqN;ZY$u#Q~zkw=+n4Rg7` zJn!JH8FH;8nANygLl@Q(MKSTF16k)i74DK}t99OPM|Kcu8pbYS*lh$3N$fF#y~eeh z(Hw9-Mf`{=!-sMLIBu*JM00`!PBPRqg-Ro=Fsf?DKk|OZ)A-^gh%?suEZsP5b9K3D&(KGSiIH#b*#uC`Knxgs*=B|)lxNTr85fD1P08>Zexm4 zAEMRQSsT49Fqt3?C)fx(DAoHrdZ|j%EF4FuCJ?4{dTSzy%Al|LK{miJO=hB|Fj-T{ zG@qkP@@%LgO=q=cP;97V=i} z`C$HwTMKMk`SQ^swbo*_SAjycL~bopgqAx2v1{6{qM26WC%c5Q3#ejef9$F7Qp;|z a>_*FO!lTW^*@lyB!$V9*X`7SV>+pXi6TfBv diff --git a/roaddesign/target/classes/com/sim/util/ModelXMLReader.class b/roaddesign/target/classes/com/sim/util/ModelXMLReader.class index d012bf41340065925f75ea1f5234f39febd54760..cb2e66a2009bee89f14e00d4f540e871d3890556 100644 GIT binary patch delta 268 zcmWNM%Su9F6otPtF?8gQnucVS90($CSk5wnh(s;Qkmw3_83x)tyHOYs!68pi5I75t zlLieMg^hZOhP{E*n(P~Ee|zn2x|@FO7|S?c=5Hd5j|c&JF+>?A#*}iNI1BVsCcy>+ z9FpXgL0pDtk>XADyXK$RULfRJxmo-a2x`$VCrFV#0TL`?Q(}}Q#s$l=OpX=iSyfzP zk9DeSQdjpt1&1x3+3|kEKUT3y4>jTT<>x?mj~L;EF^}bUDKM|s-_grT(miY(3DK-`W delta 268 zcmWlUOG`ol6okLKNpun2RJ5`Of*^$8vfO0^6>0Rs%8F2tXsLzT%OWw_h1u8DCc5gCv2z_lw}Z+wFE`sprt{arJAIRK|xy$ncXiG2}e+*AGI|! z3I$SQV?&G7-w-WL4J~caH$Ct0J@5N9-KN|4Fv7hA=p#a$PWtt?vE&S4k-%Y?9$}mj zy=Z#DF>J>5y?GT&VKOB~npUQ1Cxc5?I%XJ^oMcw#t-3Wwh27Kb*R delta 258 zcmWNL&nv@m9L8Ut+WP*OHD7Vyt5_Q?H5_&r%LPOEo^V-y%xcPMIrueWOB0zwKE=tw zQBjMdql3%hZ;*?VgUfF6KE0l&o~P$&xDB`dX#^wqh!UcYF8cM4vE;0}weGDs0?gCKf_CiFa2A6V>8;92 zjvir*JaN_-6{cC&FZQk4c+LbomD!Zw7M*M}zz!*P@hGy)9tBEN*yoZ1?kMvl?v+E{ oIO3fu9~|?=3E#qBYBV`hK58n&xoYP^|Ft~&ujSZ{t_QpS0W%gh)&Kwi From 85249438fa73f231c5d730843b2d56965a6c0b15 Mon Sep 17 00:00:00 2001 From: Kephael Date: Sun, 8 Nov 2015 14:30:34 -0500 Subject: [PATCH 2/2] MainMouseHandler comment correction --- .../main/java/com/sim/gui/handler/MainMouseHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 592e209..e7fd2a2 100644 --- a/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java +++ b/roaddesign/src/main/java/com/sim/gui/handler/MainMouseHandler.java @@ -67,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)); // prints point add position to console - System.out.printf("(%d,%d)\n", e.getX(), e.getY()); - }else{ - Logging.getLogger().info(String.format( // prints point close position to console + "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)); }