diff --git a/2DGAMELIB/_2DGAMELIB/AreM.cs b/2DGAMELIB/_2DGAMELIB/ManagedArea.cs similarity index 89% rename from 2DGAMELIB/_2DGAMELIB/AreM.cs rename to 2DGAMELIB/_2DGAMELIB/ManagedArea.cs index 8970298..44287ba 100644 --- a/2DGAMELIB/_2DGAMELIB/AreM.cs +++ b/2DGAMELIB/_2DGAMELIB/ManagedArea.cs @@ -3,13 +3,14 @@ using System.Drawing.Drawing2D; namespace _2DGAMELIB { - public class AreM : RenderArea + //TODO: Find a better name... + public class ManagedArea : RenderArea { private double strength; private double unitS; - public AreM(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag, double Strength) : + public ManagedArea(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag, double Strength) : base(Unit, XRatio, YRatio, Size, DisMag, HitMag) { SetXYRatio(XRatio, YRatio); diff --git a/2DGAMELIB/_2DGAMELIB/VariantGrid.cs b/2DGAMELIB/_2DGAMELIB/VariantGrid.cs index 4440e96..bc69ac6 100644 --- a/2DGAMELIB/_2DGAMELIB/VariantGrid.cs +++ b/2DGAMELIB/_2DGAMELIB/VariantGrid.cs @@ -289,9 +289,9 @@ namespace _2DGAMELIB { Are.Draw(Current); } - public void Draw(AreM AreM) + public void Draw(ManagedArea ManagedArea) { - AreM.Draw(Current); + ManagedArea.Draw(Current); } private ShapePart GetJoinRoot(PartGroup ps) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index cb4f43a..3ce17f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -97,7 +97,7 @@ namespace SlaveMatrix public ShapePart X1Y4_血管下; - public AreM AreM; + public ManagedArea ManagedArea; public ColorD 陰嚢CD; @@ -422,11 +422,11 @@ namespace SlaveMatrix { get { - return AreM.Position; + return ManagedArea.Position; } set { - AreM.Position = value; + ManagedArea.Position = value; } } @@ -590,8 +590,8 @@ namespace SlaveMatrix X1Y4_陰茎CP = new ColorP(X1Y4_陰茎, 陰茎CD, DisUnit, abj: true); X1Y4_血管下CP = new ColorP(X1Y4_血管下, 血管下CD, DisUnit, abj: true); Intensity = e.濃度; - AreM = new AreM(Med.Unit, 3.0, 7.0, 0.07, Med.DisQuality, Med.HitAccuracy, 0.45); - AreM.BasePoint = new Vector2D(0.5, 0.1); + ManagedArea = new ManagedArea(Med.Unit, 3.0, 7.0, 0.07, Med.DisQuality, Med.HitAccuracy, 0.45); + ManagedArea.BasePoint = new Vector2D(0.5, 0.1); X0Y0_陰嚢.BasePointBase = X0Y0_陰嚢.ToLocal(X0Y0_陰茎.ToGlobal(X0Y0_陰茎.JP[3].Joint)); X0Y1_陰嚢.BasePointBase = X0Y1_陰嚢.ToLocal(X0Y1_陰茎.ToGlobal(X0Y1_陰茎.JP[3].Joint)); X0Y2_陰嚢.BasePointBase = X0Y2_陰嚢.ToLocal(X0Y2_陰茎.ToGlobal(X0Y2_陰茎.JP[3].Joint)); @@ -602,7 +602,7 @@ namespace SlaveMatrix X1Y2_陰嚢.BasePointBase = X1Y2_陰嚢.ToLocal(X1Y2_陰茎.ToGlobal(X1Y2_陰茎.JP[2].Joint)); X1Y3_陰嚢.BasePointBase = X1Y3_陰嚢.ToLocal(X1Y3_陰茎.ToGlobal(X1Y3_陰茎.JP[2].Joint)); X1Y4_陰嚢.BasePointBase = X1Y4_陰嚢.ToLocal(X1Y4_陰茎.ToGlobal(X1Y4_陰茎.JP[2].Joint)); - Vector2D position = AreM.GetPosition(ref AreM.BasePoint); + Vector2D position = ManagedArea.GetPosition(ref ManagedArea.BasePoint); foreach (ShapePart item in Body.EnumJoinRoot) { item.PositionBase = position; @@ -615,14 +615,14 @@ namespace SlaveMatrix public override void Dispose() { base.Dispose(); - AreM.Dispose(); + ManagedArea.Dispose(); } public override void 描画0(RenderArea Are) { - AreM.Clear(); - Body.Draw(AreM); - Are.Draw(AreM); + ManagedArea.Clear(); + Body.Draw(ManagedArea); + Are.Draw(ManagedArea); } public override void 色更新() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 64f90ff..fb986cb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -141,7 +141,7 @@ namespace SlaveMatrix { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { - 調教UI.擬音.Sound(a, GlobalState.GetAreaPoint(ref 調教UI.ペニス.AreM.Position, 0.02), GlobalState.射精.GetVal(Player.変化V_射精, 1.0), new Font("MS Gothic", 1f), Color.White, 0.2 + 0.2 * Rng.XS.NextDouble() * Player.変化V_射精, b: true); + 調教UI.擬音.Sound(a, GlobalState.GetAreaPoint(ref 調教UI.ペニス.ManagedArea.Position, 0.02), GlobalState.射精.GetVal(Player.変化V_射精, 1.0), new Font("MS Gothic", 1f), Color.White, 0.2 + 0.2 * Rng.XS.NextDouble() * Player.変化V_射精, b: true); }); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 5914422..49e45a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -245,7 +245,7 @@ namespace SlaveMatrix public ShapePart X3Y5_膣口; - public AreM AreM; + public ManagedArea ManagedArea; private Vector2D AreMPos; @@ -1233,9 +1233,9 @@ namespace SlaveMatrix X3Y5_陰核CP = new ColorP(X3Y5_陰核, 陰核CD, DisUnit, abj: true); X3Y5_尿道CP = new ColorP(X3Y5_尿道, 尿道CD, DisUnit, abj: true); X3Y5_膣口CP = new ColorP(X3Y5_膣口, 膣口CD, DisUnit, abj: true); - AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); - AreM.BasePoint = new Vector2D(0.5, 0.5); - AreMPos = AreM.GetPosition(ref AreM.BasePoint); + ManagedArea = new ManagedArea(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); + ManagedArea.BasePoint = new Vector2D(0.5, 0.5); + AreMPos = ManagedArea.GetPosition(ref ManagedArea.BasePoint); Intensity = e.濃度; Xi = 1; } @@ -1243,21 +1243,21 @@ namespace SlaveMatrix private void AreMSetPos() { p = 接続根.Difs0.Current.GetPar(接続根.Path0); - AreM.Position = p.ToGlobal(p.JP[接続根.Index].Joint); + ManagedArea.Position = p.ToGlobal(p.JP[接続根.Index].Joint); } public override void Dispose() { base.Dispose(); - AreM.Dispose(); + ManagedArea.Dispose(); } public override void 描画0(RenderArea Are) { - AreM.Clear(); + ManagedArea.Clear(); 位置B = AreMPos; - Body.Draw(AreM); - Are.Draw(AreM); + Body.Draw(ManagedArea); + Are.Draw(ManagedArea); } public override void 接続P() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index 478a8c4..6b74022 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -245,7 +245,7 @@ namespace SlaveMatrix public ShapePart X3Y5_膣口; - public AreM AreM; + public ManagedArea ManagedArea; private Vector2D AreMPos; @@ -1233,9 +1233,9 @@ namespace SlaveMatrix X3Y5_陰核CP = new ColorP(X3Y5_陰核, 陰核CD, DisUnit, abj: true); X3Y5_尿道CP = new ColorP(X3Y5_尿道, 尿道CD, DisUnit, abj: true); X3Y5_膣口CP = new ColorP(X3Y5_膣口, 膣口CD, DisUnit, abj: true); - AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); - AreM.BasePoint = new Vector2D(0.5, 0.5); - AreMPos = AreM.GetPosition(ref AreM.BasePoint); + ManagedArea = new ManagedArea(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); + ManagedArea.BasePoint = new Vector2D(0.5, 0.5); + AreMPos = ManagedArea.GetPosition(ref ManagedArea.BasePoint); Intensity = e.濃度; Xi = 1; } @@ -1243,21 +1243,21 @@ namespace SlaveMatrix private void AreMSetPos() { p = 接続根.Difs0.Current.GetPar(接続根.Path0); - AreM.Position = p.ToGlobal(p.JP[接続根.Index].Joint); + ManagedArea.Position = p.ToGlobal(p.JP[接続根.Index].Joint); } public override void Dispose() { base.Dispose(); - AreM.Dispose(); + ManagedArea.Dispose(); } public override void 描画0(RenderArea Are) { - AreM.Clear(); + ManagedArea.Clear(); 位置B = AreMPos; - Body.Draw(AreM); - Are.Draw(AreM); + Body.Draw(ManagedArea); + Are.Draw(ManagedArea); } public override void 接続P() diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index f88c347..548f46a 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -484,7 +484,7 @@ namespace SlaveMatrix private void Set_ペニス(Element t) { - t.位置B = ペニス.AreM.Position; + t.位置B = ペニス.ManagedArea.Position; } private void Set_ロータ(Element t)