debut import svg

src/env_map.cpp

@@ -74,25 +74,24 @@ void EnvMap::init(unsigned int config, REAL width, REAL height, REAL minSize, RE
 			CityGenerator::generateCity<PFP>(*this) ;
 			// CityGenerator::generateMall<PFP>(map, position, obstacleMark, buildingMark, sideSize);
 			break ;
-		case 3 : {
-//			std::string filename = "/home/jund/Desktop/drawingQuads.svg" ;
-//			std::string filename = "/home/jund/Desktop/drawingTest.svg" ;
-//			std::string filename = "/home/jund/Desktop/drawingSimple.svg" ;
-//			std::string filename = "/home/jund/Desktop/drawingLines.svg" ;
-//			std::string filename = "/home/jund/Desktop/mapKrutSimple.svg" ;
-//			std::string filename = "/home/jund/Desktop/mapKrut.svg" ;
-//			Algo::Import::importSVG<PFP>(map, filename, position, obstacleMark, buildingMark) ;
+		case 3 :
+			CityGenerator::generateCity<PFP>(*this) ;
+			break ;
+		case 4 :
+			CityGenerator::generatePlanet<PFP>(*this) ;
+			break ;
+		case 5 :
+		{
+//			std::string filename = "./svg/mapRoads.svg" ;
+			std::string filename = "./svg/simpleCross.svg" ;
+			Algo::Import::importSVG<PFP>(map, filename, position, obstacleMark, buildingMark) ;
 
 //			Algo::BooleanOperator::mergeVertices<PFP>(map, position) ;
 //			map.closeMap() ;
 //			Algo::Modelisation::CatmullClarkSubdivision<PFP>(map, position) ;
 //			Algo::Modelisation::computeDual<PFP>(map) ;
 		}
-			CityGenerator::generateCity<PFP>(*this) ;
-			break ;
-		case 4 :
-			CityGenerator::generatePlanet<PFP>(*this) ;
-			break ;
+		break;
 	}
 
 //	CityGenerator::simplifyFreeSpace<PFP>(map, position, obstacleMark, buildingMark);

src/simulator.cpp

@@ -15,7 +15,7 @@ Simulator::Simulator(int minSize) :
 {
 	srand(10) ;
 	nbStepsPerUnit_ = 1 / timeStep_ ;
-	init(1, minSize, 2.0f) ;
+	init(5, minSize, 2.0f) ;
 }
 
 Simulator::~Simulator()

svg/simpleCross.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg11242"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="simpleCross.svg">
+  <defs
+     id="defs11244" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="212.26079"
+     inkscape:cy="876.10013"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:object-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="994"
+     inkscape:window-x="1680"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata11247">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 165,316.51917 c 73.41625,-38.99172 146.35598,-175.10802 217.92351,-172.24418 76.6571,3.06751 151.63468,147.3847 220.64792,172.24418"
+       id="path11252"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 382.89448,144.27384 1.39123,-208.340229"
+       id="path2984"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>