diff --git a/LWGlass/.idea/.idea.LWGlass/.idea/.gitignore b/LWGlass/.idea/.idea.LWGlass/.idea/.gitignore new file mode 100644 index 0000000..5ac3ee8 --- /dev/null +++ b/LWGlass/.idea/.idea.LWGlass/.idea/.gitignore @@ -0,0 +1,15 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/contentModel.xml +/.idea.LWGlass.iml +/modules.xml +/projectSettingsUpdater.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Ignored default folder with query files +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/LWGlass/.idea/.idea.LWGlass/.idea/encodings.xml b/LWGlass/.idea/.idea.LWGlass/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/LWGlass/.idea/.idea.LWGlass/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/LWGlass/.idea/.idea.LWGlass/.idea/indexLayout.xml b/LWGlass/.idea/.idea.LWGlass/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/LWGlass/.idea/.idea.LWGlass/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/LWGlass/manifest.jecs b/LWGlass/manifest.jecs index faf1463..838b065 100644 --- a/LWGlass/manifest.jecs +++ b/LWGlass/manifest.jecs @@ -1,5 +1,5 @@ ID: LWGlass Name: LWGlass Author: Astronand -Version: 1.0.0 +Version: 1.1.0 Priority: 0 \ No newline at end of file diff --git a/LWGlass/src/client/Main.cs b/LWGlass/src/client/Main.cs index 3dfa425..567052f 100644 --- a/LWGlass/src/client/Main.cs +++ b/LWGlass/src/client/Main.cs @@ -15,11 +15,7 @@ using UnityEngine; namespace LWGlass.Client { - public class Glass : - ComponentClientCode, - IColorableClientCode, - IResizableX, - IResizableZ + public class Glass : CircuitBoard { [Setting_SliderFloat("LWGlass.Glass.GlassTransparency")] public static float GlassTransparency @@ -61,7 +57,7 @@ namespace LWGlass.Client } public string ColorsFileKey => "Boards"; public float MinColorValue => 0; - + /* public int SizeX { get => Data.SizeX; @@ -78,6 +74,7 @@ namespace LWGlass.Client } public int MinZ => 1; public int MaxZ => 80; + */ public float GridIntervalZ => 1f; protected Material setSharedMaterial() @@ -102,56 +99,7 @@ namespace LWGlass.Client previousSizeZ = SizeZ; obj.transform.localScale = new Vector3(SizeX, .5f, SizeZ) * 0.3f; } - protected override ChildPlacementInfo GenerateChildPlacementInfo() - { - ChildPlacementInfo childPlacementInfo = new ChildPlacementInfo(); - childPlacementInfo.Points = new FixedPlacingPoint[SizeZ * SizeX * 2]; - - int i = 0; - for (int iX = 0; iX < SizeX; iX++) - { - for (int iZ = 0; iZ < SizeZ; iZ++) - { - childPlacementInfo.Points[i++] = new FixedPlacingPoint() - { - Position = new Vector3(iX, .5f, iZ), - UpDirection = new Vector3(0, 1, 0) - }; - childPlacementInfo.Points[i++] = new FixedPlacingPoint() - { - Position = new Vector3(iX, 0, iZ), - UpDirection = new Vector3(0, -1, 0) - }; - } - } - //for (int SX1 = 0; SX1 < SizeX; SX1++) - //{ - // childPlacementInfo.Points[i++] = new FixedPlacingPoint() - // { - // Position = new Vector3(SX1, 0, -.3f ), - // UpDirection = new Vector3(0, 0, -1) - // }; - // childPlacementInfo.Points[i++] = new FixedPlacingPoint() - // { - // Position = new Vector3(SX1, 0, SizeZ+.3f ), - // UpDirection = new Vector3(0, 0, 1) - // }; - //} - //for (int SX1 = 0; SX1 < SizeZ; SX1++) - //{ - // childPlacementInfo.Points[i++] = new FixedPlacingPoint() - // { - // Position = new Vector3(-.3f, 0, SX1 ), - // UpDirection = new Vector3(-1, 0, 0) - // }; - // childPlacementInfo.Points[i++] = new FixedPlacingPoint() - // { - // Position = new Vector3(SizeX+.3f, 0, SX1 ), - // UpDirection = new Vector3(1, 0, 0) - // }; - //} - return childPlacementInfo; - } + protected override IDecoration[] GenerateDecorations(Transform parentToCreateDecorationsUnder) { var myGameObject = new GameObject("glass"); @@ -167,7 +115,7 @@ namespace LWGlass.Client new Decoration() { DecorationObject = myGameObject, - LocalPosition = new Vector3(-.15f, 0, -.15f), + LocalPosition = new Vector3(0,0,0), AutoSetupColliders = true, } };