Добавляем корректные начальные значения при импорте графики

ct-js · Aug 28, 2017 · 36c1e9a · 36c1e9a
1 parent 92113d9
commit 36c1e9a
Show file tree

Hide file tree

Showing 8 changed files with 321 additions and 282 deletions.
diff --git a/projects/catsteroids.ict b/projects/catsteroids.ict
@@ -0,0 +1,56 @@
+{
+  "notes": "/* empty */",
+  "libs": {
+    "place": {},
+    "akatemplate": {
+      "csscss": "canvas {\n  margin: 2rem auto;\n}\nbody {\n  background: black;\n}"
+    },
+    "random": {},
+    "keyboard": {}
+  },
+  "graphs": [
+    {
+      "name": "playerShip2_blue",
+      "untill": 0,
+      "grid": [
+        1,
+        1
+      ],
+      "axis": [
+        56,
+        37
+      ],
+      "origname": "i1.png",
+      "shape": "circle",
+      "left": 56,
+      "top": 37,
+      "frames": 1,
+      "width": 112,
+      "height": 75,
+      "marginx": 0,
+      "marginy": 0,
+      "offy": 0,
+      "offx": 0,
+      "right": 56,
+      "bottom": 38,
+      "r": 12
+    }
+  ],
+  "types": [],
+  "sounds": [],
+  "styles": [],
+  "rooms": [],
+  "graphtick": 1,
+  "soundtick": 0,
+  "roomtick": 0,
+  "typetick": 0,
+  "styletick": 0,
+  "starting": 0,
+  "settings": {
+    "minifyhtmlcss": false,
+    "minifyjs": false,
+    "title": "Catsteroids",
+    "author": "CoMiGo Games",
+    "site": "http://comigogames.ru/"
+  }
+}
diff --git a/projects/catsteroids/img/i1.png b/projects/catsteroids/img/i1.png
diff --git a/projects/catsteroids/img/i1.png_prev.png b/projects/catsteroids/img/i1.png_prev.png
diff --git a/projects/catsteroids/img/[email protected] b/projects/catsteroids/img/[email protected]
diff --git a/projects/catsteroids/img/splash.png b/projects/catsteroids/img/splash.png
diff --git a/tags/graphic-editor.tag b/tags/graphic-editor.tag
diff --git a/tags/graphics-panel.tag b/tags/graphics-panel.tag
@@ -79,12 +79,16 @@ graphics-panel.panel.view
                         untill: 0,
                         grid: [1, 1],
                         axis: [0, 0],
+                        marginx: 0,
+                        marginy: 0,
+                        offx: 0,
+                        offy: 0,
                         origname: path.basename(dest),
-                        shape: "rect",
+                        shape: 'rect',
                         left: 0,
-                        right: this.width,
+                        right: image.width,
                         top: 0,
-                        bottom: this.height
+                        bottom: image.height
                     };
                     this.id = currentProject.graphs.length;
                     window.currentProject.graphs.push(obj);

diff --git a/tags/modules-panel.tag b/tags/modules-panel.tag
@@ -172,7 +172,6 @@ modules-panel.panel.view
                 this.currentModuleHelp = md.render(this.currentModule.main.help || '');
                 this.currentModuleLicense = md.render(this.currentModule.main.license || '');
                 this.currentModuleLogs = md.render(this.currentModule.main.logs || '');
-                console.log(data);
                 this.update();
             });
             this.tab = 'moduleinfo';