|
@@ -730,19 +730,20 @@ class TerrainEditor {
|
|
interactive.cancelEvents = false;
|
|
interactive.cancelEvents = false;
|
|
|
|
|
|
interactive.onWheel = function(e) {
|
|
interactive.onWheel = function(e) {
|
|
|
|
+ e.propagate = true;
|
|
var worldPos = getBrushPlanePos(s2d.mouseX, s2d.mouseY, ctx);
|
|
var worldPos = getBrushPlanePos(s2d.mouseX, s2d.mouseY, ctx);
|
|
renderTerrainUV(ctx);
|
|
renderTerrainUV(ctx);
|
|
drawBrushPreview(worldPos, ctx);
|
|
drawBrushPreview(worldPos, ctx);
|
|
};
|
|
};
|
|
|
|
|
|
interactive.onPush = function(e) {
|
|
interactive.onPush = function(e) {
|
|
|
|
+ e.propagate = false;
|
|
currentBrush.brushMode.lockDir = K.isDown(K.ALT);
|
|
currentBrush.brushMode.lockDir = K.isDown(K.ALT);
|
|
currentBrush.brushMode.subAction = K.isDown(K.SHIFT);
|
|
currentBrush.brushMode.subAction = K.isDown(K.SHIFT);
|
|
currentBrush.brushMode.snapToGrid = K.isDown(K.CTRL);
|
|
currentBrush.brushMode.snapToGrid = K.isDown(K.CTRL);
|
|
var worldPos = getBrushPlanePos(s2d.mouseX, s2d.mouseY, ctx);
|
|
var worldPos = getBrushPlanePos(s2d.mouseX, s2d.mouseY, ctx);
|
|
if( K.isDown( K.MOUSE_LEFT) ) {
|
|
if( K.isDown( K.MOUSE_LEFT) ) {
|
|
currentBrush.firstClick = true;
|
|
currentBrush.firstClick = true;
|
|
- e.propagate = false;
|
|
|
|
lastPos = worldPos.clone();
|
|
lastPos = worldPos.clone();
|
|
if( currentBrush.isValid() ) {
|
|
if( currentBrush.isValid() ) {
|
|
useBrush( lastPos, worldPos, ctx);
|
|
useBrush( lastPos, worldPos, ctx);
|
|
@@ -794,8 +795,10 @@ class TerrainEditor {
|
|
lastPos = worldPos;
|
|
lastPos = worldPos;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- else
|
|
|
|
|
|
+ else {
|
|
renderTerrainUV(ctx);
|
|
renderTerrainUV(ctx);
|
|
|
|
+ e.propagate = true;
|
|
|
|
+ }
|
|
drawBrushPreview(worldPos, ctx);
|
|
drawBrushPreview(worldPos, ctx);
|
|
};
|
|
};
|
|
}
|
|
}
|