Merge pull request #5056 from ericrius1/paint

marker ball now stays without mouse whether or not user is drawing
This commit is contained in:
Philip Rosedale 2015-06-04 21:42:47 -07:00
commit 164df99f93

View file

@ -131,21 +131,22 @@ function MousePaint() {
function mouseMoveEvent(event) { function mouseMoveEvent(event) {
if (!isDrawing) {
return;
}
var pickRay = Camera.computePickRay(event.x, event.y); var pickRay = Camera.computePickRay(event.x, event.y);
var addVector = Vec3.multiply(Vec3.normalize(pickRay.direction), DRAWING_DISTANCE); var addVector = Vec3.multiply(Vec3.normalize(pickRay.direction), DRAWING_DISTANCE);
var point = Vec3.sum(Camera.getPosition(), addVector); var point = Vec3.sum(Camera.getPosition(), addVector);
points.push(point);
Entities.editEntity(line, { Entities.editEntity(line, {
linePoints: points linePoints: points
}); });
Entities.editEntity(brush, { Entities.editEntity(brush, {
position: point position: point
}); });
if (!isDrawing) {
return;
}
points.push(point);
path.push(point); path.push(point);
if (points.length === MAX_POINTS_PER_LINE) { if (points.length === MAX_POINTS_PER_LINE) {
@ -168,6 +169,10 @@ function MousePaint() {
} }
function mousePressEvent(event) { function mousePressEvent(event) {
if(!event.isLeftButton) {
isDrawing = false;
return;
}
lineRider.mousePressEvent(event); lineRider.mousePressEvent(event);
path = []; path = [];
newLine(); newLine();