Commit af4b0a5f authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

update CGoGN

parent 53281d25
......@@ -443,11 +443,11 @@ void generatePathToUpperStair(typename PFP::MAP& map,typename PFP::TVEC3& positi
}
//create the path
Dart dPathUp = map.newOrientedFace(4);
Dart dInBetweenUp = map.newOrientedFace(4);
Dart dInBetweenDown = map.newOrientedFace(4);
Dart dInBetweenMid = map.newOrientedFace(4);
Dart dPathDown = map.newOrientedFace(4);
Dart dPathUp = map.newFace(4);
Dart dInBetweenUp = map.newFace(4);
Dart dInBetweenDown = map.newFace(4);
Dart dInBetweenMid = map.newFace(4);
Dart dPathDown = map.newFace(4);
//sew the path
map.sewFaces(dUpper,map.phi1(map.phi1(dPathUp)));
......
......@@ -243,15 +243,14 @@ void EnvMap::init(unsigned int config)
// 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);
scale(3.2808399f);
Algo::BooleanOperator::mergeVertices<PFP>(map,position);
DartMarker amelk(map);
map.closeMap(amelk);
Algo::Modelisation::CatmullClarkSubdivision<PFP>(map,position);
Algo::Modelisation::computeDual<PFP>(map);
// std::string filename = "/home/jund/Desktop/mapKrut.svg";
// Algo::Import::importSVG<PFP>(map,filename,position, obstacleMark, buildingMark);
// scale(3.2808399f);
//
// Algo::BooleanOperator::mergeVertices<PFP>(map, position);
// map.closeMap();
// Algo::Modelisation::CatmullClarkSubdivision<PFP>(map, position);
// Algo::Modelisation::computeDual<PFP>(map);
}
break;
case 4 : CityGenerator::generatePlanet<PFP>(map, position, obstacleMark, buildingMark, 200.0f, nbSquares);
......
......@@ -5,7 +5,7 @@ Simulator::Simulator() : timeStep_(0.2f), globalTime_(0.0f), nbSteps_(0)
srand(10);
nbStepsPerUnit_ = 1 / timeStep_;
init(0,2.0f);
init(0, 2.0f);
}
Simulator::~Simulator()
......@@ -39,9 +39,9 @@ void Simulator::init(unsigned int config, float dimension, bool enablePathFindin
if(enablePathFinding)
{
if(dimension==2.0f)
if(dimension == 2.0f)
addPathsToAgents();
else if(dimension==2.5f)
else if(dimension == 2.5f)
addPathsToAgents_height();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment