Map Export #61 "data" layerset, only export images for layers with vi…

…sible content, smart object export, noodle shop tests
flypup · Mar 20, 2013 · f2e76d2 · f2e76d2
1 parent c8e4962
commit f2e76d2
Show file tree

Hide file tree

Showing 20 changed files with 1,182 additions and 72 deletions.
diff --git a/app/data/noodleshop3S/data.js b/app/data/noodleshop3S/data.js
diff --git a/app/data/noodleshop3S/elements/bg.png b/app/data/noodleshop3S/elements/bg.png
diff --git a/app/data/noodleshop3S/elements/floor_1.png b/app/data/noodleshop3S/elements/floor_1.png
diff --git a/app/data/noodleshop3S/elements/floor_2.png b/app/data/noodleshop3S/elements/floor_2.png
diff --git a/app/data/noodleshop3S/elements/floor_over_pillar.png b/app/data/noodleshop3S/elements/floor_over_pillar.png
diff --git a/app/data/noodleshop3S/elements/lilpillar.png b/app/data/noodleshop3S/elements/lilpillar.png
diff --git a/app/data/noodleshop3S/elements/pillar2_2.png b/app/data/noodleshop3S/elements/pillar2_2.png
diff --git a/app/data/noodleshop3S/elements/railing.png b/app/data/noodleshop3S/elements/railing.png
diff --git a/app/data/noodleshop3S/elements/steptop.png b/app/data/noodleshop3S/elements/steptop.png
diff --git a/app/data/testmap3S/data.js b/app/data/testmap3S/data.js
@@ -4,6 +4,81 @@ ec && ec.loadMap({
   "width": 1428,
   "height": 1002,
   "layers": [
+    {
+      "name": "bounds",
+      "elements": [
+        {
+          "name": "bounds left",
+          "mapType": "wall",
+          "x": 43,
+          "y": 283,
+          "z": 0,
+          "width": 695,
+          "height": 1410,
+          "depth": 780,
+          "regX": 48,
+          "regY": 995,
+          "shape": "polygons",
+          "shapes": [
+            {
+              "x": 0,
+              "y": 0,
+              "polygons": [
+                [
+                  [
+                    2,
+                    793
+                  ],
+                  [
+                    5,
+                    1393
+                  ],
+                  [
+                    137,
+                    799
+                  ]
+                ]
+              ]
+            }
+          ]
+        },
+        {
+          "name": "bounds top",
+          "mapType": "wall",
+          "x": 805,
+          "y": 86,
+          "z": 0,
+          "width": 1422,
+          "height": 875,
+          "depth": 780,
+          "regX": 792,
+          "regY": 798,
+          "shape": "polygons",
+          "shapes": [
+            {
+              "x": 0,
+              "y": 0,
+              "polygons": [
+                [
+                  [
+                    1,
+                    804
+                  ],
+                  [
+                    1409,
+                    872
+                  ],
+                  [
+                    966,
+                    718
+                  ]
+                ]
+              ]
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "background",
       "elements": [
@@ -44,8 +119,7 @@ ec && ec.loadMap({
                 ]
               ]
             }
-          ],
-          "image": "elements/full_area.png"
+          ]
         }
       ]
     },
@@ -98,12 +172,8 @@ ec && ec.loadMap({
           "mapType": "parallax",
           "x": 169,
           "y": 887,
-          "z": 0,
           "width": 259,
           "height": 70,
-          "depth": 0,
-          "regX": 0,
-          "regY": 0,
           "image": "elements/little_floor.png"
         },
         {
@@ -455,7 +525,5 @@ ec && ec.loadMap({
       ]
     }
   ],
-  "entities": [
-
-  ]
+  "entities": []
 });
diff --git a/app/data/testmap3S/elements/big_box.png b/app/data/testmap3S/elements/big_box.png
diff --git a/app/data/testmap3S/elements/full_area.png b/app/data/testmap3S/elements/full_area.png
diff --git a/app/data/testmap3S/elements/little_box.png b/app/data/testmap3S/elements/little_box.png
diff --git a/app/data/testmap3S/elements/little_test.png b/app/data/testmap3S/elements/little_test.png
diff --git a/app/data/testmap3S/elements/mixed_box.png b/app/data/testmap3S/elements/mixed_box.png
diff --git a/app/index.html b/app/index.html
@@ -105,6 +105,7 @@
         <script src="scripts/controllers/ShadowCloneInput.js"></script>
         <!-- endbuild -->
 
+        <script src="data/noodleshop3S/data.js"></script>
         <script src="data/courtyard/data.js"></script>
         <script src="data/testmap/data.js"></script>
         <script src="data/testmap2/data.js"></script>

diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -275,7 +275,10 @@
 
 		cycleMap: function() {
 			var map;
+
 			if (world.map === maps.courtyard) {
+				map = maps.noodleshop3S;
+			} else if (world.map === maps.noodleshop3S) {
 				map = maps.testmap3S;
 			} else if (world.map === maps.testmap3S) {
 				map = maps.testmap2;

diff --git a/dev/art/noodleshop3S.psd b/dev/art/noodleshop3S.psd