renaming for all scripts

spiiin · Jul 8, 2018 · aee00f7 · aee00f7
1 parent 561e58f
commit aee00f7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 25 deletions.
diff --git a/CadEditor/Scripts/Script-ExportAllChrsToPng.cs b/CadEditor/Scripts/Script-ExportAllChrsToPng.cs
@@ -19,7 +19,7 @@ public void Execute(FormScript formScript)
         formScript.writeLog("--------------------------------------------------------------------");
 
         var formMain = formScript.getFormMain();
-        int palNo = formMain.CurActivePalleteNo;
+        int palNo = formMain.curActivePalleteNo;
 
         var pal = ConfigScript.getPal(palNo);
         for (int i = 0; i < chrDumpsCount; i++)

diff --git a/CadEditor/Scripts/Script-ExportBlocks2x2ToArrays-SoA.cs b/CadEditor/Scripts/Script-ExportBlocks2x2ToArrays-SoA.cs
@@ -15,7 +15,7 @@ public void Execute(FormScript formScript)
         var formMain = formScript.getFormMain();
         formScript.writeLog();
 
-        int curActiveBlockset = formMain.CurActiveBigBlockNo;
+        int curActiveBlockset = formMain.curActiveBigBlockNo;
         var blocks = ConfigScript.getBlocks(curActiveBlockset);
         int blocksCount = blocks.Length;
         formScript.writeLog(String.Format("Current selected block set: {0}. Blocks count: {1}", curActiveBlockset, blocksCount));

diff --git a/CadEditor/Scripts/Script-ExportCurrentScreenBin.cs b/CadEditor/Scripts/Script-ExportCurrentScreenBin.cs
@@ -15,9 +15,9 @@ public void Execute(FormScript formScript)
         var formMain = formScript.getFormMain();
         formScript.writeLog();
 
-        int currentScreenNo = formMain.ScreenNo;
+        int currentScreenNo = formMain.screenNo;
         formScript.writeLog(String.Format("Current active screen: {0}", currentScreenNo));
-        var activeScreen = formMain.Layers[0].screens[currentScreenNo];
+        var activeScreen = formMain.screens[currentScreenNo].layers[0].data;
         var data = activeScreen.Select(x=>(byte)x).ToArray();
         var fname = ConfigScript.ConfigDirectory + String.Format("screen{0}.bin", currentScreenNo);
         using (FileStream f = File.OpenWrite(fname))

diff --git a/CadEditor/Scripts/Script-ExportCurrentScreenPng.cs b/CadEditor/Scripts/Script-ExportCurrentScreenPng.cs
@@ -15,13 +15,13 @@ public void Execute(FormScript formScript)
         var formMain = formScript.getFormMain();
         formScript.writeLog();
 
-        int currentScreenNo = formMain.ScreenNo;
+        int currentScreenNo = formMain.screenNo;
         formScript.writeLog(String.Format("Current active screen: {0}", currentScreenNo));
 
-        var activeScreen = formMain.Layers[0].screens[currentScreenNo];
-        int w = ConfigScript.getScreenWidth(formMain.LevelNoForScreens);
-        int h = ConfigScript.getScreenHeight(formMain.LevelNoForScreens);
-        var im = MapEditor.ScreenToImage(formMain.BigBlocks, formMain.Layers, currentScreenNo, formMain.CurScale, false, 0, 0, w, h);
+        var activeScreen = formMain.screens[currentScreenNo];
+        int w = activeScreen.width;
+        int h = activeScreen.height;
+        var im = MapEditor.ScreenToImage(formMain.bigBlocks, formMain.screens, currentScreenNo, formMain.curScale, false, 0, 0, w, h);
         var fname = ConfigScript.ConfigDirectory + String.Format("screen{0}.png", currentScreenNo);
         im.Save(fname);
         formScript.writeLog(String.Format("Screen exported to file: {0}", fname));

diff --git a/CadEditor/Scripts/Script-FindUnusedBlocks.cs b/CadEditor/Scripts/Script-FindUnusedBlocks.cs
@@ -15,27 +15,23 @@ public void Execute(FormScript formScript)
         //int scrNo = formMain.ScreenNo;
         //formScript.writeLog(String.Format("Current active screen: 0x{0:X}", scrNo));
 
-        int totalBlocksCount = formMain.BigBlocks.Length;
+        int totalBlocksCount = formMain.bigBlocks.Length;
 
         formScript.writeLog(String.Format("Total big blocks count: {0}", totalBlocksCount));
         int[] usedBlocks = new int[totalBlocksCount];
 
-        var layers = formMain.Layers;
+        var screens = formMain.screens;
+
         //count all used blocks
-        for (int layerNo = 0; layerNo < layers.Length; layerNo++)
+        for (int scrNo = 0; scrNo < screens.Length; scrNo++)
         {
-            var layer = layers[layerNo];
-            var screens = layer.screens;
-            if (screens == null)
-            {
-                continue;
-            }
-            for (int scrNo = 0; scrNo < screens.Length; scrNo++)
+            var activeScreen = screens[scrNo];
+            for (int layerNo = 0; layerNo < activeScreen.layers.Length; layerNo++)
             {
-                var activeScreen = screens[scrNo];
-                for (int i = 0; i < activeScreen.Length; i++)
+                var data = activeScreen.layers[layerNo].data;
+                for (int i = 0; i < data.Length; i++)
                 {
-                    int blockNo = activeScreen[i];
+                    int blockNo = data[i];
                     usedBlocks[blockNo]++;
                 }
             }
@@ -59,7 +55,7 @@ public void Execute(FormScript formScript)
 
         if (unusedBlocksCount > 0)
         {
-            var unusedPictures = formMain.BigBlocks.Where((im, index)=> unusedBlocks.Contains(index)).ToArray();
+            var unusedPictures = formMain.bigBlocks.Where((im, index)=> unusedBlocks.Contains(index)).ToArray();
             var glueImage = UtilsGDI.GlueImages(unusedPictures, unusedPictures.Length, 1);
             var fname = ConfigScript.ConfigDirectory + String.Format("unusedBlocks.png");
             glueImage.Save(fname);

diff --git a/CadEditor/Scripts/Script-HelloWorld.cs b/CadEditor/Scripts/Script-HelloWorld.cs
@@ -4,7 +4,6 @@ public class Script
 {
     public void Execute(FormScript formScript)
     {
-        var log = formScript.getLog();
-        log.AppendText("Hello world!\n");
+        formScript.writeLog("Hello world!");
     }
 }