Skip to content

Fix model ID to 3D model mapping bug #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johschmitz wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix model ID to 3D model mapping bug #772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions EnvironmentSimulator/Modules/ScenarioEngine/SourceFiles/ScenarioReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,17 @@ Vehicle *ScenarioReader::parseOSCVehicle(pugi::xml_node vehicleNode)
if (!modelIdStr.empty())
{
vehicle->model_id_ = strtoi(modelIdStr);

// If no explicit model3d was specified, update the 3D model path based on model_id
if (!model3d_attr && vehicle->properties_.file_.filepath_.empty())
{
std::string modelFilename = SE_Env::Inst().GetModelFilenameById(vehicle->model_id_);
if (!modelFilename.empty())
{
vehicle->SetModel3DFullPath(modelFilename, DirNameOf(SE_Env::Inst().GetOSCFilePath()) + "/../models");
}
}

if (SE_Env::Inst().GetOptions().IsOptionArgumentSet("record"))
{
CheckModelId(vehicle);
Expand Down
Loading