diff --git a/src/Controllers/EnvironmentController.js b/src/Controllers/EnvironmentController.js index 07c253e..b3e1b82 100644 --- a/src/Controllers/EnvironmentController.js +++ b/src/Controllers/EnvironmentController.js @@ -26,7 +26,7 @@ class EnvironmentController extends CanvasController{ var sign = -Math.sign(event.deltaY); // Restrict scale - scale = Math.max(0.5, this.scale+(sign*zoom_speed)); + scale = Math.min(50, this.scale+(sign*zoom_speed*this.scale)); var cur_top = parseInt($('#env-canvas').css('top')); var cur_left = parseInt($('#env-canvas').css('left')); @@ -61,12 +61,17 @@ class EnvironmentController extends CanvasController{ let resolution = 20; Perlin.seed(); - for (let r = 0; r < this.env.num_rows; r++) { - for (let c = 0; c < this.env.num_cols; c++) { - let xval = c/this.env.num_cols*(resolution/this.env.renderer.cell_size*(this.env.num_cols/this.env.num_rows)); - let yval = r/this.env.num_rows*(resolution/this.env.renderer.cell_size*(this.env.num_rows/this.env.num_cols)); + let num_rows = this.env.grid_map.rows + let num_cols = this.env.grid_map.cols + // let num_rows = this.env.num_rows + // let num_cols = this.env.num_cols + + for (let r = 0; r < num_rows; r++) { + for (let c = 0; c < num_cols; c++) { + let xval = c/num_cols*(resolution/this.env.renderer.cell_size*(num_cols/num_rows)); + let yval = r/num_rows*(resolution/this.env.renderer.cell_size*(num_rows/num_cols)); let noise = Perlin.get(xval, yval); - avg_noise += noise/(this.env.num_rows*this.env.num_cols); + avg_noise += noise/(num_rows*num_cols); if (noise > noise_threshold && noise < noise_threshold + thickness/resolution) { let cell = this.env.grid_map.cellAt(c, r); if (cell != null) {