From 468126b9b01d2746b3c6fd93cb4525e8a53de2e3 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Fri, 21 Apr 2023 19:39:10 -0700
Subject: [PATCH] use size instead of scale

---
 NewHorizons/Builder/Body/HeightMapBuilder.cs    | 14 +++++++-------
 NewHorizons/External/Modules/HeightMapModule.cs |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NewHorizons/Builder/Body/HeightMapBuilder.cs b/NewHorizons/Builder/Body/HeightMapBuilder.cs
index 5682930e..b5658965 100644
--- a/NewHorizons/Builder/Body/HeightMapBuilder.cs
+++ b/NewHorizons/Builder/Body/HeightMapBuilder.cs
@@ -111,8 +111,8 @@ namespace NewHorizons.Builder.Body
 
                 // If the texturemap is the same as the heightmap don't delete it #176
                 // Do the same with emissionmap
-                // honestly, if you do this with other maps, thats on you
-                if (heightMap == textureMap || heightMap == emissionMap) deleteHeightmapFlag = false;
+                // todo? maybe do this with the other maps, if someone were to ever use heightmap for them (altho that wouldnt make any sense if they did)
+                if (textureMap == heightMap || emissionMap == heightMap) deleteHeightmapFlag = false;
             }
             catch (Exception e)
             {
@@ -200,7 +200,7 @@ namespace NewHorizons.Builder.Body
                     if (module.baseTile != null)
                     {
                         material.EnableKeyword("BASE_TILE");
-                        material.SetFloat("_BaseTileScale", module.baseTile.scale);
+                        material.SetFloat("_BaseTileScale", 1 / module.baseTile.size);
                         material.SetTexture("_BaseTileAlbedo", baseTextureTile);
                         material.SetTexture("_BaseTileSmoothnessMap", baseSmoothnessTile);
                         material.SetFloat("_BaseTileBumpStrength", module.baseTile.normalStrength);
@@ -213,7 +213,7 @@ namespace NewHorizons.Builder.Body
                     if (module.redTile != null)
                     {
                         material.EnableKeyword("RED_TILE");
-                        material.SetFloat("_RedTileScale", module.redTile.scale);
+                        material.SetFloat("_RedTileScale", 1 / module.redTile.size);
                         material.SetTexture("_RedTileAlbedo", redTextureTile);
                         material.SetTexture("_RedTileSmoothnessMap", redSmoothnessTile);
                         material.SetFloat("_RedTileBumpStrength", module.redTile.normalStrength);
@@ -226,7 +226,7 @@ namespace NewHorizons.Builder.Body
                     if (module.greenTile != null)
                     {
                         material.EnableKeyword("GREEN_TILE");
-                        material.SetFloat("_GreenTileScale", module.greenTile.scale);
+                        material.SetFloat("_GreenTileScale", 1 / module.greenTile.size);
                         material.SetTexture("_GreenTileAlbedo", greenTextureTile);
                         material.SetTexture("_GreenTileSmoothnessMap", greenSmoothnessTile);
                         material.SetFloat("_GreenTileBumpStrength", module.greenTile.normalStrength);
@@ -239,7 +239,7 @@ namespace NewHorizons.Builder.Body
                     if (module.blueTile != null)
                     {
                         material.EnableKeyword("BLUE_TILE");
-                        material.SetFloat("_BlueTileScale", module.blueTile.scale);
+                        material.SetFloat("_BlueTileScale", 1 / module.blueTile.size);
                         material.SetTexture("_BlueTileAlbedo", blueTextureTile);
                         material.SetTexture("_BlueTileSmoothnessMap", blueSmoothnessTile);
                         material.SetFloat("_BlueTileBumpStrength", module.blueTile.normalStrength);
@@ -252,7 +252,7 @@ namespace NewHorizons.Builder.Body
                     if (module.alphaTile != null)
                     {
                         material.EnableKeyword("ALPHA_TILE");
-                        material.SetFloat("_AlphaTileScale", module.alphaTile.scale);
+                        material.SetFloat("_AlphaTileScale", 1 / module.alphaTile.size);
                         material.SetTexture("_AlphaTileAlbedo", alphaTextureTile);
                         material.SetTexture("_AlphaTileSmoothnessMap", alphaSmoothnessTile);
                         material.SetFloat("_AlphaTileBumpStrength", module.alphaTile.normalStrength);
diff --git a/NewHorizons/External/Modules/HeightMapModule.cs b/NewHorizons/External/Modules/HeightMapModule.cs
index 4af422fc..abc891b8 100644
--- a/NewHorizons/External/Modules/HeightMapModule.cs
+++ b/NewHorizons/External/Modules/HeightMapModule.cs
@@ -125,11 +125,11 @@ namespace NewHorizons.External.Modules
         public class HeightMapTileInfo
         {
             /// <summary>
-            /// How many times this tile will tile across each "side" of the planet, so around the equator, this tile will loop scale * 4 times.
+            /// The size, in meters, of each tile.
             /// </summary>
             [Range(0f, double.MaxValue)]
             [DefaultValue(1f)]
-            public float scale = 1f;
+            public float size = 1f;
 
             /// <summary>
             /// Relative filepath to a color texture. Optional.