Adapting music to web, fixing scripts, fixing bug in initial state

src/LocationState.cpp

@@ -107,6 +107,8 @@ void LocationState::save(nlohmann::json& out) const
 
 void LocationState::load(const nlohmann::json& in)
 {
+	//logger() << "LocationState::load step 1" << std::endl;
+
     cameraAzimuth     = in.value("cameraAzimuth",     cameraAzimuth);
     cameraInclination = in.value("cameraInclination", cameraInclination);
 
@@ -122,6 +124,8 @@ void LocationState::load(const nlohmann::json& in)
 
     tutorialInteractiveObjectsLocked = in.value("tutorialInteractiveObjectsLocked", false);
 
+	//logger() << "LocationState::load step 2" << std::endl;
+
 	nlohmann::json taxiJson = in["taxi"];
 
 	taxiArrivedCallbackCalled = taxiJson.value("taxiArrivedCallbackCalled", false);
@@ -136,20 +140,18 @@ void LocationState::load(const nlohmann::json& in)
 		taxiCarJson.value("positionZ", 0.f)
 	);
 
+	//logger() << "LocationState::load step 3" << std::endl;
+
 	taxiCar.rotation = taxiCarJson.value("rotation", 0.f);
 
 	taxiCar.velocity = taxiCarJson.value("velocity", 0.f);
 
 	taxiCar.steeringAngle = taxiCarJson.value("steeringAngle", 0.f);
 
-	/*taxiCar.acceleration = taxiCarJson.value("acceleration", 20.f);
-	taxiCar.friction = taxiCarJson.value("friction", 6.f);
-	taxiCar.maxSpeed = taxiCarJson.value("maxSpeed", 24.f);
-	taxiCar.maxReverseSpeed = taxiCarJson.value("maxReverseSpeed", 8.f);
-	taxiCar.turnRate = taxiCarJson.value("turnRate", 1.8f);
-	taxiCar.maxSteerAngle = taxiCarJson.value("maxSteerAngle", 0.6f);*/
 	taxiCar.mode = static_cast<NpcCar::Mode>(taxiCarJson.value("mode", 0));
 
+	//logger() << "LocationState::load step 4" << std::endl;
+
 	taxiCar.waypoints.clear();
 	if (taxiCarJson.contains("waypoints") && taxiCarJson["waypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiCarJson["waypoints"].size()); ++i)
@@ -160,6 +162,8 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 5" << std::endl;
+
 	taxiCar.currentWaypoint = taxiCarJson.value("currentWaypoint", 0);
 	taxiCar.waypointReachRadius = taxiCarJson.value("waypointReachRadius", 3.f);
 	taxiCar.wheelAngle = taxiCarJson.value("wheelAngle", 0.f);
@@ -167,6 +171,8 @@ void LocationState::load(const nlohmann::json& in)
 
 	//--------- Taxi initial state -----
 
+	//logger() << "LocationState::load step 6" << std::endl;
+
 	nlohmann::json taxiCarInitialStateJson = taxiJson["taxiCarInitialState"];
 
 	taxiCarInitialState.position = Eigen::Vector3f(
@@ -180,15 +186,12 @@ void LocationState::load(const nlohmann::json& in)
 	taxiCarInitialState.velocity = taxiCarInitialStateJson.value("velocity", 0.f);
 
 	taxiCarInitialState.steeringAngle = taxiCarInitialStateJson.value("steeringAngle", 0.f);
-	/*
-	taxiCarInitialState.acceleration = taxiCarInitialStateJson.value("acceleration", 20.f);
-	taxiCarInitialState.friction = taxiCarInitialStateJson.value("friction", 6.f);
-	taxiCarInitialState.maxSpeed = taxiCarInitialStateJson.value("maxSpeed", 24.f);
-	taxiCarInitialState.maxReverseSpeed = taxiCarInitialStateJson.value("maxReverseSpeed", 8.f);
-	taxiCarInitialState.turnRate = taxiCarInitialStateJson.value("turnRate", 1.8f);
-	taxiCarInitialState.maxSteerAngle = taxiCarInitialStateJson.value("maxSteerAngle", 0.6f);*/
+
 	taxiCarInitialState.mode = static_cast<NpcCar::Mode>(taxiCarInitialStateJson.value("mode", 0));
 
+	//logger() << "LocationState::load step 7" << std::endl;
+
+
 	taxiCarInitialState.waypoints.clear();
 	if (taxiCarInitialStateJson.contains("waypoints") && taxiCarInitialStateJson["waypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiCarInitialStateJson["waypoints"].size()); ++i)
@@ -199,11 +202,14 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 8" << std::endl;
+
 	taxiCarInitialState.currentWaypoint = taxiCarInitialStateJson.value("currentWaypoint", 0);
 	taxiCarInitialState.waypointReachRadius = taxiCarInitialStateJson.value("waypointReachRadius", 3.f);
 	taxiCarInitialState.wheelAngle = taxiCarInitialStateJson.value("wheelAngle", 0.f);
 
 	
+
 	taxiCarWaypoints.clear();
 	if (taxiJson.contains("taxiDefaultWaypoints") && taxiJson["taxiDefaultWaypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiJson["taxiDefaultWaypoints"].size()); ++i)
@@ -214,6 +220,7 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 9" << std::endl;
 
 	taxiCarTriggerPosition = Eigen::Vector3f(
 		taxiJson.value("taxiCarTriggerPositionX", 0.f),
@@ -221,6 +228,9 @@ void LocationState::load(const nlohmann::json& in)
 		taxiJson.value("taxiCarTriggerPositionZ", 0.f)
 	);
 
+	//logger() << "LocationState::load step 10" << std::endl;
+
+
 }
 
 } // namespace FRG