Skip to content
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

Jump to bottom

Added LINE_STRIP and LINE_LIST support to Marker.js #58

Merged
merged 2 commits into from
Feb 9, 2014
Merged

Added LINE_STRIP and LINE_LIST support to Marker.js #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fbd0a7
Added LINE_STRIP and LINE_LIST support
mszarski Jan 14, 2014
210ad52
Fixed linting errors
mszarski Jan 17, 2014
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
62 changes: 62 additions & 0 deletions src/markers/Marker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,68 @@ ROS3D.Marker = function(options) {
cylinderMesh.scale = new THREE.Vector3(message.scale.x, message.scale.z, message.scale.y);
this.add(cylinderMesh);
break;
case ROS3D.MARKER_LINE_STRIP:
var lineStripGeom = new THREE.Geometry();
var lineStripMaterial = new THREE.LineBasicMaterial({
size : message.scale.x
});

// add the points
var j;
for ( j = 0; j < message.points.length; j++) {
var pt = new THREE.Vector3();
pt.x = message.points[j].x;
pt.y = message.points[j].y;
pt.z = message.points[j].z;
lineStripGeom.vertices.push(pt);
}

// determine the colors for each
if (message.colors.length === message.points.length) {
lineStripMaterial.vertexColors = true;
for ( j = 0; j < message.points.length; j++) {
var clr = new THREE.Color();
clr.setRGB(message.colors[j].r, message.colors[j].g, message.colors[j].b);
lineStripGeom.colors.push(clr);
}
} else {
lineStripMaterial.color.setRGB(message.color.r, message.color.g, message.color.b);
}

// add the line
this.add(new THREE.Line(lineStripGeom, lineStripMaterial));
break;
case ROS3D.MARKER_LINE_LIST:
var lineListGeom = new THREE.Geometry();
var lineListMaterial = new THREE.LineBasicMaterial({
size : message.scale.x
});

// add the points
var k;
for ( k = 0; k < message.points.length; k++) {
var v = new THREE.Vector3();
v.x = message.points[k].x;
v.y = message.points[k].y;
v.z = message.points[k].z;
lineListGeom.vertices.push(v);
}

// determine the colors for each
if (message.colors.length === message.points.length) {
lineListMaterial.vertexColors = true;
for ( k = 0; k < message.points.length; k++) {
var c = new THREE.Color();
c.setRGB(message.colors[k].r, message.colors[k].g, message.colors[k].b);
lineListGeom.colors.push(c);
}
} else {
lineListMaterial.color.setRGB(message.color.r, message.color.g, message.color.b);
}

// add the line
this.add(new THREE.Line(lineListGeom, lineListMaterial,THREE.LinePieces));
break;
case ROS3D.MARKER_CUBE_LIST:
// holds the main object
var object = new THREE.Object3D();
Expand Down