Removed comments

This commit is contained in:
Marc Garcia Puig 2020-02-27 18:09:16 +01:00
parent f2fcc64a1c
commit c64a2f24ba
5 changed files with 4 additions and 24 deletions

View File

@ -4,7 +4,7 @@
* Fixed linkage between waypoints in InMemoryMap in Traffic Manager * Fixed linkage between waypoints in InMemoryMap in Traffic Manager
* Vehicles get destroyed when they are stuck in Traffic Manager * Vehicles get destroyed when they are stuck in Traffic Manager
* Implemented intersection anticipation algorithm 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` * Added support for new geometry: `spiral`, `poly3`, and `paramPoly3`
* Improved `get_waypoint(location)` performance * Improved `get_waypoint(location)` performance
* New weather system: night time, fog, rain ripples, and now wind affects vegetation and rain (not car physics) * 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 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 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 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: * New python clients:
- `weather.py`: allows weather changes using the new weather parameters - `weather.py`: allows weather changes using the new weather parameters
* Fixed docker build of .BIN for pedestrian navigation * Fixed docker build of .BIN for pedestrian navigation

View File

@ -22,7 +22,7 @@ namespace geom {
} }
// if there are indices, the amount must be multiple of 3 // 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; std::cout << "Mesh validation error: the index amount must be multiple of 3." << std::endl;
return false; return false;
} }
@ -56,7 +56,6 @@ namespace geom {
if (!_materials.empty()) { if (!_materials.empty()) {
if (_materials.back().index_end == 0) { if (_materials.back().index_end == 0) {
std::cout << "last material was not closed, closing it..." << std::endl; std::cout << "last material was not closed, closing it..." << std::endl;
// return;
EndMaterial(); EndMaterial();
} }
} }
@ -82,16 +81,6 @@ namespace geom {
_materials.back().index_end = close_index; _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 { std::string Mesh::GenerateOBJ() const {
if (!IsValid()) { if (!IsValid()) {
return ""; return "";

View File

@ -121,9 +121,6 @@ namespace geom {
/// Returns the index of the last added vertex (number of vertices). /// Returns the index of the last added vertex (number of vertices).
size_t GetLastVertexIndex() const; size_t GetLastVertexIndex() const;
/// TODO: delete this, it's just for debug.
void ShowInfo() const;
private: private:
// ========================================================================= // =========================================================================

View File

@ -12,9 +12,7 @@
#include <carla/rpc/String.h> #include <carla/rpc/String.h>
#include <compiler/enable-ue4-macros.h> #include <compiler/enable-ue4-macros.h>
// #include "Interface_CollisionDataProvider.h"
#include "Engine/Classes/Interfaces/Interface_CollisionDataProvider.h" #include "Engine/Classes/Interfaces/Interface_CollisionDataProvider.h"
// #include "Engine/Source/Runtime/PhysicsCore/Private/Interface_CollisionDataProvider.h"
#include "PhysicsEngine/BodySetupEnums.h" #include "PhysicsEngine/BodySetupEnums.h"
#include "ProceduralMeshComponent.h" #include "ProceduralMeshComponent.h"
@ -30,10 +28,6 @@ AOpenDriveGenerator::AOpenDriveGenerator(const FObjectInitializer &ObjectInitial
RoadMesh->bUseAsyncCooking = true; RoadMesh->bUseAsyncCooking = true;
RoadMesh->bUseComplexAsSimpleCollision = true; RoadMesh->bUseComplexAsSimpleCollision = true;
RoadMesh->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics); 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) bool AOpenDriveGenerator::LoadOpenDrive(const FString &OpenDrive)