From c64a2f24ba7f40e33da66d8ee18e56a1e6f06387 Mon Sep 17 00:00:00 2001 From: Marc Garcia Puig Date: Thu, 27 Feb 2020 18:09:16 +0100 Subject: [PATCH] Removed comments --- CHANGELOG.md | 4 ++-- Docs/python_api.md | 2 +- LibCarla/source/carla/geom/Mesh.cpp | 13 +------------ LibCarla/source/carla/geom/Mesh.h | 3 --- .../Source/Carla/OpenDrive/OpenDriveGenerator.cpp | 6 ------ 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdea63417..5ee0ca137 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Fixed linkage between waypoints in InMemoryMap in Traffic Manager * Vehicles get destroyed when they are stuck in Traffic Manager * Implemented intersection anticipation algorithm in Traffic Manager - * Added simple physical map generateion from standalone OpenDRIVE data + * Added simple physical map generation from standalone OpenDRIVE data * Added support for new geometry: `spiral`, `poly3`, and `paramPoly3` * Improved `get_waypoint(location)` performance * New weather system: night time, fog, rain ripples, and now wind affects vegetation and rain (not car physics) @@ -14,7 +14,7 @@ - Added new methods to `BoundingBox`: `contains()`, `get_local_vertices()` and `get_world_vertices(transform)` - Added new function to get a waypoint specifying parameters from the OpenDRIVE: `map.get_waypoint_xodr(road_id, lane_id, s)` - Added 3 new parameters for the `carla.Weather`: `fog_density`, `fog_distance`, and (ground) `wetness` - - Added `calra.client.generate_opendrive_world(opendrive)` that loads a map with custom OpenDRIVE basic physical topology + - Added `carla.client.generate_opendrive_world(opendrive)` that loads a map with custom OpenDRIVE basic physical topology * New python clients: - `weather.py`: allows weather changes using the new weather parameters * Fixed docker build of .BIN for pedestrian navigation diff --git a/Docs/python_api.md b/Docs/python_api.md index d29539e87..53beaa118 100644 --- a/Docs/python_api.md +++ b/Docs/python_api.md @@ -2078,4 +2078,4 @@ Links another command to be executed right after. It allows to ease very common - **Parameters:** - `command` (_[carla.Command](#carla.Command)_) – CommandType. ---- +--- \ No newline at end of file diff --git a/LibCarla/source/carla/geom/Mesh.cpp b/LibCarla/source/carla/geom/Mesh.cpp index 2dfe48674..5b5cd94e3 100644 --- a/LibCarla/source/carla/geom/Mesh.cpp +++ b/LibCarla/source/carla/geom/Mesh.cpp @@ -22,7 +22,7 @@ namespace geom { } // if there are indices, the amount must be multiple of 3 - if (!_indexes.empty() and _indexes.size() % 3 != 0) { + if (!_indexes.empty() && _indexes.size() % 3 != 0) { std::cout << "Mesh validation error: the index amount must be multiple of 3." << std::endl; return false; } @@ -56,7 +56,6 @@ namespace geom { if (!_materials.empty()) { if (_materials.back().index_end == 0) { std::cout << "last material was not closed, closing it..." << std::endl; - // return; EndMaterial(); } } @@ -82,16 +81,6 @@ namespace geom { _materials.back().index_end = close_index; } - /// TODO: delete this, it's just for debug - void Mesh::ShowInfo() const { - std::cout << "----------------------" << std::endl; - std::cout << "Vertices: " << _vertices.size() << std::endl; - std::cout << "Normals: " << _normals.size() << std::endl; - std::cout << "Indexes: " << _indexes.size() << std::endl; - std::cout << "Uvs: " << _uvs.size() << std::endl; - std::cout << "----------------------" << std::endl; - } - std::string Mesh::GenerateOBJ() const { if (!IsValid()) { return ""; diff --git a/LibCarla/source/carla/geom/Mesh.h b/LibCarla/source/carla/geom/Mesh.h index d6283db62..6bdcfc8f3 100644 --- a/LibCarla/source/carla/geom/Mesh.h +++ b/LibCarla/source/carla/geom/Mesh.h @@ -121,9 +121,6 @@ namespace geom { /// Returns the index of the last added vertex (number of vertices). size_t GetLastVertexIndex() const; - /// TODO: delete this, it's just for debug. - void ShowInfo() const; - private: // ========================================================================= diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp index fb6b6411e..f3cc5d3a8 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/OpenDrive/OpenDriveGenerator.cpp @@ -12,9 +12,7 @@ #include #include -// #include "Interface_CollisionDataProvider.h" #include "Engine/Classes/Interfaces/Interface_CollisionDataProvider.h" -// #include "Engine/Source/Runtime/PhysicsCore/Private/Interface_CollisionDataProvider.h" #include "PhysicsEngine/BodySetupEnums.h" #include "ProceduralMeshComponent.h" @@ -30,10 +28,6 @@ AOpenDriveGenerator::AOpenDriveGenerator(const FObjectInitializer &ObjectInitial RoadMesh->bUseAsyncCooking = true; RoadMesh->bUseComplexAsSimpleCollision = true; RoadMesh->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics); - // RoadMesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Block); - // RoadMesh->SetCollisionObjectType(ECollisionChannel::ECC_WorldDynamic); - // RoadMesh->SetGenerateOverlapEvents(true); - // RoadMesh->SetNotifyRigidBodyCollision(true); } bool AOpenDriveGenerator::LoadOpenDrive(const FString &OpenDrive)