Small bugfixes (#9)

jgosar · Dec 27, 2022 · a143efe · a143efe
1 parent 1f9b93b
commit a143efe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/MineCity2000-GUI/MineCity2000.cs b/MineCity2000-GUI/MineCity2000.cs
@@ -106,12 +106,13 @@ private void bw_DoWork(object sender, DoWorkEventArgs e)
         {
             BackgroundWorker worker = sender as BackgroundWorker;
 
-            mapper.Worker = worker;
             mapper = new SCMapper(buildingsDir);
+            mapper.Worker = worker;
             mapper.makeMap(inputFile, outputDir);
         }
         private void bw_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
+            button3.Enabled = true;
             if ((e.Cancelled == true))
             {
                 statusLabel.Text = "Canceled!";

diff --git a/MineCity2000/SCMapper.cs b/MineCity2000/SCMapper.cs
@@ -608,9 +608,15 @@ private static int[][] interpolateTriangles(int p1, int p2, int p3, int p4)
                             result[i][j] = p4 * SECTION_HEIGHT + (j - i) * diffLowerLeft;
                         }
                     }
-                    else//wtf
+                    else //Irregular terrain shapes, usually at the start of bridges
                     {
-                        result[i][j] = (((SQUARE_SIZE - j) * (i * p2 + (SQUARE_SIZE - i) * p1) + j * (i * p4 + (SQUARE_SIZE - i) * p3)) * SECTION_HEIGHT) / SQUARE_SIZE * SQUARE_SIZE;
+                        int remainderI = SQUARE_SIZE - 1 - i;
+                        int remainderJ = SQUARE_SIZE - 1 - j;
+                        int weightP1 = remainderI* remainderJ;
+                        int weightP2 = i* remainderJ;
+                        int weightP3 = remainderI * j;
+                        int weightP4 = i * j;
+                        result[i][j] = SECTION_HEIGHT*(p1 * weightP1 + p2 * weightP2 + p3 * weightP3 + p4 * weightP4) / ((SQUARE_SIZE-1) * (SQUARE_SIZE - 1));
                     }
                 }
             }