Merge pull request #1333 from jayant1992/master

Preset images for terrain generator

app/styles/editor/level/modal/terrain_randomize.sass

@@ -3,7 +3,7 @@
   .choose-option
     margin-bottom: 15px
     width: 100%
-    height: 100px
+    height: 200px
     overflow: hidden
     background: white
     border: 1px solid #333
@@ -125,4 +125,7 @@
     
   .hard-option .preset-name
     border-top: 25px solid black
-    color: white
+    color: white
+    
+  .capitalize
+    text-transform: capitalize

app/templates/editor/level/modal/terrain_randomize.jade

@@ -5,11 +5,12 @@ block modal-header-content
 
 block modal-body-content
   div#normal-view
-    a(href="#")
+    each sizeObject, size in presetSizes
-        div.choose-option(data-preset-type="grassy", data-preset-size="small")
+      each preset in presets 
-          div.preset-size.name-label
+        a(href="#")
-            span(data-i18n="editor.small") Small
+          div.choose-option(data-preset-type=preset.type, data-preset-size=size, style="background:url(/images/pages/editor/level/preset_"+preset.type+"_"+size+".jpg) no-repeat center; background-size: cover")
-          div.preset-name
+            div.preset-size.name-label.capitalize
-            span(data-i18n="editor.grassy") Grassy
+              span(data-i18n="editor."+size)  #{size}
-    //- for model in models
+            div.preset-name.capitalize
+              span(data-i18n="editor.grassy") #{preset.type}
 block modal-footer

app/views/editor/level/modals/TerrainRandomizeModal.coffee

@@ -50,7 +50,7 @@ presets = {
   }
 }
 
-sizes = {
+presetSizes = {
   'small': {
     'x':80
     'y':68
@@ -59,6 +59,9 @@ sizes = {
     'x':160
     'y':136
   }
+}
+
+thangSizes = {
   'floorSize': {
     'x':20
     'y':17
@@ -96,55 +99,55 @@ module.exports = class TerrainRandomizeModal extends ModalView
 
   randomizeThangs: (presetName, presetSize) ->
     preset = presets[presetName]
-    presetSize = sizes[presetSize]
+    presetSize = presetSizes[presetSize]
     @thangs = []
     @randomizeFloor preset, presetSize
     @randomizeBorder preset, presetSize
     @randomizeDecorations preset, presetSize
 
   randomizeFloor: (preset, presetSize) ->
-    for i in _.range(0, presetSize.x, sizes.floorSize.x)
+    for i in _.range(0, presetSize.x, thangSizes.floorSize.x)
-      for j in _.range(0, presetSize.y, sizes.floorSize.y)
+      for j in _.range(0, presetSize.y, thangSizes.floorSize.y)
         @thangs.push {
           'id': @getRandomThang(preset.floors)
           'pos': {
-            'x': i + sizes.floorSize.x/2
+            'x': i + thangSizes.floorSize.x/2
-            'y': j + sizes.floorSize.y/2
+            'y': j + thangSizes.floorSize.y/2
           }
         }
 
   randomizeBorder: (preset, presetSize) ->
-    for i in _.range(0, presetSize.x, sizes.borderSize.x)
+    for i in _.range(0, presetSize.x, thangSizes.borderSize.x)
-      for j in _.range(sizes.borderSize.thickness)
+      for j in _.range(thangSizes.borderSize.thickness)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2)
+            'x': i + _.random(-thangSizes.borderSize.x/2, thangSizes.borderSize.x/2)
-            'y': 0 + _.random(-sizes.borderSize.y/2, sizes.borderSize.y)
+            'y': 0 + _.random(-thangSizes.borderSize.y/2, thangSizes.borderSize.y)
           }
         }
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': i + _.random(-sizes.borderSize.x/2, sizes.borderSize.x/2)
+            'x': i + _.random(-thangSizes.borderSize.x/2, thangSizes.borderSize.x/2)
-            'y': presetSize.y + _.random(-sizes.borderSize.y, sizes.borderSize.y/2)
+            'y': presetSize.y + _.random(-thangSizes.borderSize.y, thangSizes.borderSize.y/2)
           }
         }
 
-    for i in _.range(0, presetSize.y, sizes.borderSize.y)
+    for i in _.range(0, presetSize.y, thangSizes.borderSize.y)
       for j in _.range(3)
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': 0 + _.random(-sizes.borderSize.x/2, sizes.borderSize.x)
+            'x': 0 + _.random(-thangSizes.borderSize.x/2, thangSizes.borderSize.x)
-            'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
+            'y': i + _.random(-thangSizes.borderSize.y/2, thangSizes.borderSize.y/2)
           }
         }
         @thangs.push {
           'id': @getRandomThang(preset.borders)
           'pos': {
-            'x': presetSize.x + _.random(-sizes.borderSize.x, sizes.borderSize.x/2)
+            'x': presetSize.x + _.random(-thangSizes.borderSize.x, thangSizes.borderSize.x/2)
-            'y': i + _.random(-sizes.borderSize.y/2, sizes.borderSize.y/2)
+            'y': i + _.random(-thangSizes.borderSize.y/2, thangSizes.borderSize.y/2)
           }
         }
 
@@ -182,9 +185,8 @@ module.exports = class TerrainRandomizeModal extends ModalView
 
   getRenderData: ->
     c = super()
-    models = _.values CocoModel.backedUp
+    c.presets = presets
-    models = (m for m in models when m.hasLocalChanges())
+    c.presetSizes = presetSizes
-    c.models = models
     c
 
   onHidden: ->