p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merging errors

This commit is contained in:
nsubiron 2018-02-03 14:35:14 +01:00
parent 66af651711
commit ba0bd9917d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PythonClient/carla/client.py
View File

@ -179,7 +179,7 @@ class CarlaClient(object):
total_size = len(raw_data) / 4
index = 0
while index < total_size:
sensor_type = gettype(getval(index + 2))
sensor_type = gettype(getint(index + 2))
if sensor_type == 'Lidar':
horizontal_angle = getdouble(index)
channels_count = getint(index + 3)

11
PythonClient/carla/sensor.py
View File

@ -7,9 +7,8 @@
"""CARLA sensors."""
import os
import numpy as np
import json
import os
try:
import numpy
@ -311,9 +310,9 @@ class LidarMeasurement(SensorData):
points_count_by_channel_size = channels_count * 4
points_count_by_channel_bytes = raw_data[4*4:4*4 + points_count_by_channel_size]
self.points_count_by_channel = np.frombuffer(points_count_by_channel_bytes, dtype=np.dtype('uint32'))
self.points_count_by_channel = numpy.frombuffer(points_count_by_channel_bytes, dtype=numpy.dtype('uint32'))
self.points_size = int(np.sum(self.points_count_by_channel) * 3 * 8) # three floats X, Y, Z
self.points_size = int(numpy.sum(self.points_count_by_channel) * 3 * 8) # three floats X, Y, Z
begin = 4*4 + points_count_by_channel_size # 4*4 is horizontal_angle, type, channels_count
end = begin + self.points_size
self.points_data = raw_data[begin:end]
@ -333,8 +332,8 @@ class LidarMeasurement(SensorData):
if self._converted_data is None:
points_in_one_channel = self.points_count_by_channel[0]
points = np.frombuffer(self.points_data[:self.points_size], dtype='float')
points = np.reshape(points, (self.channels_count, points_in_one_channel, 3))
points = numpy.frombuffer(self.points_data[:self.points_size], dtype='float')
points = numpy.reshape(points, (self.channels_count, points_in_one_channel, 3))
self._converted_data = {
'horizontal_angle' : self.horizontal_angle,