8000 updates to build on windows by sina-sixwheel · Pull Request #1 · sixwheel-inc/carla · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

updates to build on windows #1

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
wants to merge 1 commit into
base: ue4-dev
Choose a base branch
from
Open

updates to build on windows #1

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions PythonAPI/examples/manual_control_chrono.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,10 @@ def parse_events(self, client, world, clock):
print("o pressed")
if not self._chrono_enabled:
self._chrono_enabled = True
vehicle_json = "sedan/vehicle/Sedan_Vehicle.json"
powertrain_json = "sedan/powertrain/Sedan_SimpleMapPowertrain.json"
tire_json = "sedan/tire/Sedan_TMeasyTire.json"
base_path = "/home/adas/carla/Build/chrono-install/share/chrono/data/vehicle/"
vehicle_json = "sedan\\vehicle\\Sedan_Vehicle.json"
powertrain_json = "sedan\\powertrain\\Sedan_SimpleMapPowertrain.json"
tire_json = "sedan\\tire\\Sedan_TMeasyTire.json"
base_path = "C:\\sixwheel\\carla\\Build\\chrono-install\\data\\vehicle\\"
world.player.enable_chrono_physics(5000, 0.002, vehicle_json, powertrain_json, tire_json, base_path)
else:
self._chrono_enabled = False
Expand Down
2 changes: 2 additions & 0 deletions Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2355,6 +2355,8 @@ BIND_SYNC(is_sensor_enabled_for_ros) << [this](carla::streaming::detail::stream_
std::string TireJSON,
std::string BaseJSONPath) -> R<void>
{
// Log the parameters
UE_LOG(LogCarla, Log, TEXT("enable_chrono_physics: MaxSubsteps: %d, MaxSubstepDeltaTime: %f, VehicleJSON: %s, PowertrainJSON: %s, TireJSON: %s, BaseJSONPath: %s"), MaxSubsteps, MaxSubstepDeltaTime, *FString(VehicleJSON.c_str()), *FString(PowertrainJSON.c_str()), *FString(TireJSON.c_str()), *FString(BaseJSONPath.c_str()));
REQUIRE_CARLA_EPISODE();
FCarlaActor* CarlaActor = Episode->FindCarlaActor(ActorId);
if (!CarlaActor)
Expand Down
1 change: 1 addition & 0 deletions ...arlaUE4/Plugins/Carla/Source/Carla/Vehicle/MovementComponents/ChronoMovementComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ void UChronoMovementComponent::InitializeChronoVehicle()
Vehicle->InitializeTire(tire, wheel, VisualizationType::MESH);
}
}
UE_LOG(LogCarla, Log, TEXT("Chrono vehicle initialized"));
}

void UChronoMovementComponent::ProcessControl(FVehicleControl &Control)
Expand Down
2 changes: 1 addition & 1 deletion Util/BuildTools/Windows.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ LibCarla: setup
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --server --client --generator "$(GENERATOR)"

setup: downloadplugin
@"${CARLA_BUILD_TOOLS_FOLDER}/Setup.bat" --boost-toolset msvc-14.2 --generator "$(GENERATOR)" $(ARGS)
@"${CARLA_BUILD_TOOLS_FOLDER}/Setup.bat" --boost-toolset msvc-14.3 --generator "$(GENERATOR)" $(ARGS)


.PHONY: Plugins
Expand Down
0