From 4edeb09fe14039f0e1bd4824fb00c4b83fd311b2 Mon Sep 17 00:00:00 2001 From: Absolutely disgusting Date: Sat, 25 Oct 2025 21:25:58 +0400 Subject: [PATCH] Added more readable names for Are(RenderArea) --- 2DGAMELIB/_2DGAMELIB/Are.cs | 185 ----------------- 2DGAMELIB/_2DGAMELIB/AreM.cs | 40 ++-- 2DGAMELIB/_2DGAMELIB/But.cs | 2 +- 2DGAMELIB/_2DGAMELIB/Buts.cs | 2 +- 2DGAMELIB/_2DGAMELIB/Difs.cs | 2 +- 2DGAMELIB/_2DGAMELIB/Lab.cs | 10 +- 2DGAMELIB/_2DGAMELIB/Labs.cs | 6 +- 2DGAMELIB/_2DGAMELIB/Med.cs | 2 +- 2DGAMELIB/_2DGAMELIB/Obj.cs | 2 +- 2DGAMELIB/_2DGAMELIB/RenderArea.cs | 176 ++++++++++++++++ 2DGAMELIB/_2DGAMELIB/Sce.cs | 4 +- .../SlaveMatrix/BodyPartClasses/Head.cs | 6 +- .../SlaveMatrix/BodyPartClasses/InfoPanel.cs | 12 +- .../SlaveMatrix/BodyPartClasses/Neck.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Stamp.cs | 6 +- .../SlaveMatrix/BodyPartClasses/Sweat.cs | 6 +- .../SlaveMatrix/BodyPartClasses/TextBubble.cs | 10 +- .../SlaveMatrix/BodyPartClasses/Torso.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Torso_蛇.cs | 4 +- .../SlaveMatrix/BodyPartClasses/Torso_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Waist.cs | 4 +- .../BodyPartClasses/キャップ処理.cs | 8 +- .../SlaveMatrix/BodyPartClasses/スタンプB.cs | 6 +- .../SlaveMatrix/BodyPartClasses/スタンプK.cs | 6 +- .../SlaveMatrix/BodyPartClasses/スタンプW.cs | 6 +- .../SlaveMatrix/BodyPartClasses/ハンド.cs | 4 +- .../SlaveMatrix/BodyPartClasses/ハンド処理.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ペニス.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ペニス処理.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ボテ腹_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/マウス.cs | 4 +- .../SlaveMatrix/BodyPartClasses/マウス処理.cs | 2 +- .../BodyPartClasses/上着ボトム_前掛け.cs | 4 +- .../SlaveMatrix/BodyPartClasses/上腕_人.cs | 4 +- .../SlaveMatrix/BodyPartClasses/上腕_鳥.cs | 2 +- .../BodyPartClasses/下着トップ_クロス.cs | 4 +- .../BodyPartClasses/下着トップ_チューブ.cs | 4 +- .../BodyPartClasses/下着トップ_ビキニ.cs | 4 +- .../BodyPartClasses/下着トップ_ブラ.cs | 4 +- .../BodyPartClasses/下着トップ_マイクロ.cs | 4 +- .../BodyPartClasses/下着ボトム_ノーマル.cs | 4 +- .../BodyPartClasses/下着ボトム_マイクロ.cs | 4 +- .../SlaveMatrix/BodyPartClasses/下腕_人.cs | 4 +- .../SlaveMatrix/BodyPartClasses/下腕_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/下腕_蝙.cs | 4 +- .../SlaveMatrix/BodyPartClasses/下腕_鳥.cs | 4 +- .../SlaveMatrix/BodyPartClasses/乳房.cs | 2 +- .../SlaveMatrix/BodyPartClasses/処理B.cs | 2 +- .../SlaveMatrix/BodyPartClasses/剃刀処理.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単足_植.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足胸.cs | 4 +- .../SlaveMatrix/BodyPartClasses/多足_蠍.cs | 4 +- .../SlaveMatrix/BodyPartClasses/大顎.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ウ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ガ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ヘ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_悪.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_根.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_淫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_腓.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_虫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蛇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_龍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/性器_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/性器_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_牛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_蝙.cs | 4 +- .../SlaveMatrix/BodyPartClasses/手_馬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/挿入処理.cs | 26 +-- .../SlaveMatrix/BodyPartClasses/染み_人.cs | 4 +- .../SlaveMatrix/BodyPartClasses/染み_獣.cs | 4 +- .../SlaveMatrix/BodyPartClasses/節尾_曳航.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節尾_鋏.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足百.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足蠍.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs | 6 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胸肌.cs | 4 +- .../SlaveMatrix/BodyPartClasses/脚_人.cs | 4 +- .../SlaveMatrix/BodyPartClasses/脚_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/脚_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/脚_蹄.cs | 2 +- .../SlaveMatrix/BodyPartClasses/脚_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2.cs | 4 +- .../SlaveMatrix/BodyPartClasses/角2_山3.cs | 4 +- .../SlaveMatrix/BodyPartClasses/角2_巻.cs | 4 +- .../SlaveMatrix/BodyPartClasses/角2_虫.cs | 4 +- .../SlaveMatrix/BodyPartClasses/角2_鬼.cs | 4 +- .../SlaveMatrix/BodyPartClasses/触手_犬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_蔦.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_触.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_軟.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/調教背景.cs | 2 +- .../SlaveMatrix/BodyPartClasses/調鞭処理.cs | 6 +- .../SlaveMatrix/BodyPartClasses/足_人.cs | 6 +- .../SlaveMatrix/BodyPartClasses/足_牛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_馬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蛇.cs | 4 +- .../SlaveMatrix/BodyPartClasses/長物_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頬肌.cs | 4 +- SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs | 52 ++--- SlaveMatrix/SlaveMatrix/GameClasses/CM.cs | 14 +- SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs | 8 +- SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs | 6 +- SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs | 8 +- .../SlaveMatrix/GameClasses/ListView.cs | 8 +- SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs | 192 +++++++++--------- .../SlaveMatrix/GameClasses/Onomatopoeia.cs | 12 +- SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs | 4 +- .../SlaveMatrix/GameClasses/TrainingUI.cs | 56 ++--- SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs | 2 +- 126 files changed, 568 insertions(+), 577 deletions(-) delete mode 100644 2DGAMELIB/_2DGAMELIB/Are.cs create mode 100644 2DGAMELIB/_2DGAMELIB/RenderArea.cs diff --git a/2DGAMELIB/_2DGAMELIB/Are.cs b/2DGAMELIB/_2DGAMELIB/Are.cs deleted file mode 100644 index 84a6c73..0000000 --- a/2DGAMELIB/_2DGAMELIB/Are.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Drawing.Imaging; - -namespace _2DGAMELIB -{ - public class Are : Rect - { - public Bitmap Dis; - public Bitmap Hit; - - protected Graphics gd; - protected Graphics gh; - - protected double unit; - protected double disUnit; - protected double hitUnit; - - protected Size WH = System.Drawing.Size.Empty; - protected Size WHH = System.Drawing.Size.Empty; - protected Size WHA = System.Drawing.Size.Empty; - - public Vector2D BasePoint = Dat.Vec2DZero; - public Vector2D Position = Dat.Vec2DZero; - - public Graphics GD => gd; - public Graphics GH => gh; - - public double Unit => unit; - public double DisUnit => disUnit; - - public Are() { } - public Are(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) - { - Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag); - } - - public Are(Med Med, bool Hit) - { - if (Hit) - { - Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality, Med.HitAccuracy); - } - else - { - Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality); - } - } - private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag) - { - SetXYRatio(XRatio, YRatio); - base.Size = Size; - unit = Unit; - disUnit = Unit * DisMag; - WH.Width = (int)(base.LocalWidth * Unit); - WH.Height = (int)(base.LocalHeight * Unit); - WHA.Width = (int)(base.LocalWidth * disUnit); - WHA.Height = (int)(base.LocalHeight * disUnit); - Dis = new Bitmap((int)((double)WH.Width * DisMag), (int)((double)WH.Height * DisMag)); - gd = Graphics.FromImage(Dis); - - - gd.SmoothingMode = SmoothingMode.None; - gd.PixelOffsetMode = PixelOffsetMode.HighSpeed; - gd.InterpolationMode = InterpolationMode.NearestNeighbor; - //needed for text or smthn - gd.CompositingMode = CompositingMode.SourceOver; - } - private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) - { - Setting(Unit, XRatio, YRatio, Size, DisMag); - - hitUnit = Unit * HitMag; - WHH.Width = (int)(base.LocalWidth * hitUnit); - WHH.Height = (int)(base.LocalHeight * hitUnit); - Hit = new Bitmap(WHH.Width, WHH.Height); - gh = Graphics.FromImage(Hit); - - - gh.SmoothingMode = SmoothingMode.None; - gh.PixelOffsetMode = PixelOffsetMode.HighSpeed; - gh.InterpolationMode = InterpolationMode.NearestNeighbor; - gh.CompositingMode = CompositingMode.SourceOver; - } - - public Vector2D GetPosition() - { - return new Vector2D(Position.X - BasePoint.X * XRatio * Size, Position.Y - BasePoint.Y * YRatio * Size); - } - - - - - - public void Draw(Par Par) - { - Par.Draw(disUnit, gd); - if (gh != null) - { - Par.DrawH(hitUnit, gh); - } - } - - public void Draw(ParT ParT) - { - ParT.Draw(disUnit, gd); - if (gh != null) - { - ParT.DrawH(hitUnit, gh); - } - } - - public void Draw(Pars Pars) - { - Pars.Draw(disUnit, gd); - if (gh != null) - { - Pars.DrawH(hitUnit, gh); - } - } - - public void Draw(Are Are) - { - Vector2D p = Are.GetPosition(); - GD.DrawImage(Are.Dis, (float)(p.X * Are.disUnit), (float)(p.Y * Are.disUnit), Are.WHA.Width, Are.WHA.Height); - if (Are.gh != null && GH != null) - { - GH.DrawImage(Are.Hit, (int)(p.X * Are.hitUnit), (int)(p.Y * Are.hitUnit), Are.WHH.Width, Are.WHH.Height); - } - } - - - - - public void DrawTo(Graphics GD) - { - Vector2D p = GetPosition(); - GD.DrawImage(Dis, (int)(p.X * unit), (int)(p.Y * unit), WH.Width, WH.Height); - } - - public void DrawTo(Graphics GD, Graphics GH) - { - Vector2D p = GetPosition(); - GD.DrawImage(Dis, (int)(p.X * unit), (int)(p.Y * unit), WH.Width, WH.Height); - if (gh != null) - { - GH.DrawImage(Hit, (int)(p.X * hitUnit), (int)(p.Y * hitUnit), WHH.Width, WHH.Height); - } - } - - - - - - - public void Clear() - { - gd.Clear(Color.Transparent); - if (gh != null) - { - gh.Clear(Color.Transparent); - } - } - - public void Clear(Color Color) - { - gd.Clear(Color); - if (gh != null) - { - gh.Clear(Color.Transparent); - } - } - - public void Dispose() - { - Dis.Dispose(); - gd.Dispose(); - if (Hit != null) - { - Hit.Dispose(); - gh.Dispose(); - } - } - } -} diff --git a/2DGAMELIB/_2DGAMELIB/AreM.cs b/2DGAMELIB/_2DGAMELIB/AreM.cs index 68e5ec0..d8d6875 100644 --- a/2DGAMELIB/_2DGAMELIB/AreM.cs +++ b/2DGAMELIB/_2DGAMELIB/AreM.cs @@ -3,7 +3,7 @@ using System.Drawing.Drawing2D; namespace _2DGAMELIB { - public class AreM : Are + public class AreM : RenderArea { private double strength; @@ -13,38 +13,38 @@ namespace _2DGAMELIB { SetXYRatio(XRatio, YRatio); base.Size = Size; - unit = Unit; + unitScale = Unit; strength = Strength; - disUnit = Unit * DisMag; + displayUnitScale = Unit * DisMag; double num = 1.0 - Strength; - unitS = disUnit * num; + unitS = displayUnitScale * num; WH.Width = (int)(base.LocalWidth * Unit); WH.Height = (int)(base.LocalHeight * Unit); - WHA.Width = (int)(base.LocalWidth * disUnit); - WHA.Height = (int)(base.LocalHeight * disUnit); - Dis = new Bitmap((int)((double)WH.Width * DisMag * num), (int)((double)WH.Height * DisMag * num)); - gd = Graphics.FromImage(Dis); - gd.SmoothingMode = SmoothingMode.None; - gd.PixelOffsetMode = PixelOffsetMode.None; + WHA.Width = (int)(base.LocalWidth * displayUnitScale); + WHA.Height = (int)(base.LocalHeight * displayUnitScale); + DisplayLayer = new Bitmap((int)((double)WH.Width * DisMag * num), (int)((double)WH.Height * DisMag * num)); + displayGraphics = Graphics.FromImage(DisplayLayer); + displayGraphics.SmoothingMode = SmoothingMode.None; + displayGraphics.PixelOffsetMode = PixelOffsetMode.None; - hitUnit = Unit * HitMag; - WHH.Width = (int)(base.LocalWidth * hitUnit); - WHH.Height = (int)(base.LocalHeight * hitUnit); - Hit = new Bitmap(WHH.Width, WHH.Height); - gh = Graphics.FromImage(Hit); - gh.SmoothingMode = SmoothingMode.None; - gh.PixelOffsetMode = PixelOffsetMode.None; + hitUnitScale = Unit * HitMag; + WHH.Width = (int)(base.LocalWidth * hitUnitScale); + WHH.Height = (int)(base.LocalHeight * hitUnitScale); + HitLayer = new Bitmap(WHH.Width, WHH.Height); + hitGraphics = Graphics.FromImage(HitLayer); + hitGraphics.SmoothingMode = SmoothingMode.None; + hitGraphics.PixelOffsetMode = PixelOffsetMode.None; } public new void Draw(Pars Pars) { - Pars.Draw(unitS, gd); - if (gh != null) + Pars.Draw(unitS, displayGraphics); + if (hitGraphics != null) { - Pars.DrawH(hitUnit, gh); + Pars.DrawH(hitUnitScale, hitGraphics); } } } diff --git a/2DGAMELIB/_2DGAMELIB/But.cs b/2DGAMELIB/_2DGAMELIB/But.cs index 9184757..5aad4d0 100644 --- a/2DGAMELIB/_2DGAMELIB/But.cs +++ b/2DGAMELIB/_2DGAMELIB/But.cs @@ -109,7 +109,7 @@ namespace _2DGAMELIB return false; } - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (dra) { diff --git a/2DGAMELIB/_2DGAMELIB/Buts.cs b/2DGAMELIB/_2DGAMELIB/Buts.cs index ae1f1b7..1cc5757 100644 --- a/2DGAMELIB/_2DGAMELIB/Buts.cs +++ b/2DGAMELIB/_2DGAMELIB/Buts.cs @@ -57,7 +57,7 @@ namespace _2DGAMELIB } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (But value in buts.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/Difs.cs b/2DGAMELIB/_2DGAMELIB/Difs.cs index d65b555..7da8acf 100644 --- a/2DGAMELIB/_2DGAMELIB/Difs.cs +++ b/2DGAMELIB/_2DGAMELIB/Difs.cs @@ -285,7 +285,7 @@ namespace _2DGAMELIB } - public void Draw(Are Are) + public void Draw(RenderArea Are) { Are.Draw(Current); } diff --git a/2DGAMELIB/_2DGAMELIB/Lab.cs b/2DGAMELIB/_2DGAMELIB/Lab.cs index 5093a29..b6f75b7 100644 --- a/2DGAMELIB/_2DGAMELIB/Lab.cs +++ b/2DGAMELIB/_2DGAMELIB/Lab.cs @@ -7,7 +7,7 @@ namespace _2DGAMELIB { private ParT parT; - private Are Are; + private RenderArea Are; private double Width; @@ -33,17 +33,17 @@ namespace _2DGAMELIB SetRect(); } - public Lab(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) + public Lab(RenderArea Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) { Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor); } - public Lab(Are Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor) + public Lab(RenderArea Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor) { Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor); } - private void Setting(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) + private void Setting(RenderArea Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) { this.Are = Are; this.Width = Width; @@ -98,7 +98,7 @@ namespace _2DGAMELIB if (!string.IsNullOrEmpty(parT.Text)) { parT.RectSize = new Vector2D(Width, 10.0); - Vector2D_2 stringRect = parT.GetStringRect(Are.DisUnit, Are.GD); + Vector2D_2 stringRect = parT.GetStringRect(Are.DisplayUnitScale, Are.DisplayGraphics); double x = ((stringRect.v2.X > Min) ? stringRect.v2.X : Min) + 0.07; parT.RectSize = new Vector2D(x, stringRect.v2.Y); } diff --git a/2DGAMELIB/_2DGAMELIB/Labs.cs b/2DGAMELIB/_2DGAMELIB/Labs.cs index 6475819..08cd58f 100644 --- a/2DGAMELIB/_2DGAMELIB/Labs.cs +++ b/2DGAMELIB/_2DGAMELIB/Labs.cs @@ -9,11 +9,11 @@ namespace _2DGAMELIB private Med Med; - private Are Are; + private RenderArea Are; public Lab this[string Name] => labs[Name]; - public Labs(Med Med, Are Are) + public Labs(Med Med, RenderArea Are) { this.Med = Med; this.Are = Are; @@ -24,7 +24,7 @@ namespace _2DGAMELIB labs.Add(Name, new Lab(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor)); } - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (Lab value in labs.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/Med.cs b/2DGAMELIB/_2DGAMELIB/Med.cs index a37e144..d52cdea 100644 --- a/2DGAMELIB/_2DGAMELIB/Med.cs +++ b/2DGAMELIB/_2DGAMELIB/Med.cs @@ -324,7 +324,7 @@ namespace _2DGAMELIB } - public void Draw(Are Are) + public void Draw(RenderArea Are) { //Note: this is terribly slow... //would be better to not copy the entire frame diff --git a/2DGAMELIB/_2DGAMELIB/Obj.cs b/2DGAMELIB/_2DGAMELIB/Obj.cs index 95ed4f0..621e275 100644 --- a/2DGAMELIB/_2DGAMELIB/Obj.cs +++ b/2DGAMELIB/_2DGAMELIB/Obj.cs @@ -204,7 +204,7 @@ namespace _2DGAMELIB - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (Difs value in Difss.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/RenderArea.cs b/2DGAMELIB/_2DGAMELIB/RenderArea.cs new file mode 100644 index 0000000..d070193 --- /dev/null +++ b/2DGAMELIB/_2DGAMELIB/RenderArea.cs @@ -0,0 +1,176 @@ +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; + +namespace _2DGAMELIB +{ + //Render Area + public class RenderArea : Rect + { + //Display Layer + public Bitmap DisplayLayer; + //Hit Layer + public Bitmap HitLayer; + + protected Graphics displayGraphics; + protected Graphics hitGraphics; + + protected double unitScale; + protected double displayUnitScale; + protected double hitUnitScale; + + protected Size WH = System.Drawing.Size.Empty; + protected Size WHH = System.Drawing.Size.Empty; + protected Size WHA = System.Drawing.Size.Empty; + + public Vector2D BasePoint = Dat.Vec2DZero; + public Vector2D Position = Dat.Vec2DZero; + + public Graphics DisplayGraphics => displayGraphics; + public Graphics HitGraphics => hitGraphics; + + public double UnitScale => unitScale; + public double DisplayUnitScale => displayUnitScale; + + public RenderArea() { } + public RenderArea(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) + { + Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag); + } + + public RenderArea(Med Med, bool Hit) + { + if (Hit) + { + Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality, Med.HitAccuracy); + } + else + { + Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality); + } + } + private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag) + { + SetXYRatio(XRatio, YRatio); + base.Size = Size; + unitScale = Unit; + displayUnitScale = Unit * DisMag; + WH.Width = (int)(base.LocalWidth * Unit); + WH.Height = (int)(base.LocalHeight * Unit); + WHA.Width = (int)(base.LocalWidth * displayUnitScale); + WHA.Height = (int)(base.LocalHeight * displayUnitScale); + DisplayLayer = new Bitmap((int)((double)WH.Width * DisMag), (int)((double)WH.Height * DisMag)); + displayGraphics = Graphics.FromImage(DisplayLayer); + + + displayGraphics.SmoothingMode = SmoothingMode.None; + displayGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + displayGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + //needed for text or smthn + displayGraphics.CompositingMode = CompositingMode.SourceOver; + } + private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) + { + Setting(Unit, XRatio, YRatio, Size, DisMag); + + hitUnitScale = Unit * HitMag; + WHH.Width = (int)(base.LocalWidth * hitUnitScale); + WHH.Height = (int)(base.LocalHeight * hitUnitScale); + HitLayer = new Bitmap(WHH.Width, WHH.Height); + hitGraphics = Graphics.FromImage(HitLayer); + + + hitGraphics.SmoothingMode = SmoothingMode.None; + hitGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + hitGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + hitGraphics.CompositingMode = CompositingMode.SourceOver; + } + + public Vector2D GetPosition() + { + return new Vector2D(Position.X - BasePoint.X * XRatio * Size, Position.Y - BasePoint.Y * YRatio * Size); + } + + public void Draw(Par Par) + { + Par.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + Par.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(ParT ParT) + { + ParT.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + ParT.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(Pars Pars) + { + Pars.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + Pars.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(RenderArea Are) + { + Vector2D p = Are.GetPosition(); + DisplayGraphics.DrawImage(Are.DisplayLayer, (float)(p.X * Are.displayUnitScale), (float)(p.Y * Are.displayUnitScale), Are.WHA.Width, Are.WHA.Height); + if (Are.hitGraphics != null && HitGraphics != null) + { + HitGraphics.DrawImage(Are.HitLayer, (int)(p.X * Are.hitUnitScale), (int)(p.Y * Are.hitUnitScale), Are.WHH.Width, Are.WHH.Height); + } + } + + public void DrawTo(Graphics GD) + { + Vector2D p = GetPosition(); + GD.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height); + } + + public void DrawTo(Graphics displayGraphics, Graphics hitGraphics) + { + Vector2D p = GetPosition(); + displayGraphics.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height); + if (this.hitGraphics != null) + { + hitGraphics.DrawImage(HitLayer, (int)(p.X * hitUnitScale), (int)(p.Y * hitUnitScale), WHH.Width, WHH.Height); + } + } + + public void Clear() + { + displayGraphics.Clear(Color.Transparent); + if (hitGraphics != null) + { + hitGraphics.Clear(Color.Transparent); + } + } + + public void Clear(Color Color) + { + displayGraphics.Clear(Color); + if (hitGraphics != null) + { + hitGraphics.Clear(Color.Transparent); + } + } + + public void Dispose() + { + DisplayLayer.Dispose(); + displayGraphics.Dispose(); + if (HitLayer != null) + { + HitLayer.Dispose(); + hitGraphics.Dispose(); + } + } + } +} diff --git a/2DGAMELIB/_2DGAMELIB/Sce.cs b/2DGAMELIB/_2DGAMELIB/Sce.cs index c172960..3c8b053 100644 --- a/2DGAMELIB/_2DGAMELIB/Sce.cs +++ b/2DGAMELIB/_2DGAMELIB/Sce.cs @@ -50,12 +50,12 @@ namespace _2DGAMELIB Graphics.DrawImage(Start, r, 0, 0, w, h, GraphicsUnit.Pixel, ia); } - public void DrawStart(Are Are) + public void DrawStart(RenderArea Are) { Are.DrawTo(GS); } - public void DrawEnd(Are Are) + public void DrawEnd(RenderArea Are) { Are.DrawTo(GE); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs index 7c6241b..dd178ae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs @@ -1460,12 +1460,12 @@ namespace SlaveMatrix X0Y0_頭.JP[9].Joint = X0Y0_頭.JP[9].Joint.AddX(0.00012); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_頭); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_悪タトゥ_逆十字_逆十字1); Are.Draw(X0Y0_悪タトゥ_逆十字_逆十字2); @@ -1507,7 +1507,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_羽虫_眼右_ハイライト); } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { Are.Draw(X0Y0_虫性_顎下); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs index b9a6381..d7ab64b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { public class InfoPanel { - public Are Are; + public RenderArea Are; private Med Med; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public InfoPanel(Med Med, Are Are) + public InfoPanel(Med Med, RenderArea Are) { this.Med = Med; this.Are = Are; @@ -225,7 +225,7 @@ namespace SlaveMatrix yp.SizeBase = Mai.ParT.SizeBase; yp.Font = new Font("MS Gothic", 1f); yp.FontSize = Mai.ParT.FontSize; - yp.SetStringRectOutline(Are.Unit, Are.GD); + yp.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); yp.RectSize = new Vector2D(yp.OP[0].ps[1].X, yp.OP[0].ps[2].Y); yp.OP.ScalingY(yp.BasePointBase, 0.9); yp.OP.OutlineFalse(); @@ -245,7 +245,7 @@ namespace SlaveMatrix np.SizeBase = Mai.ParT.SizeBase; np.Font = new Font("MS Gothic", 1f); np.FontSize = Mai.ParT.FontSize; - np.SetStringRectOutline(Are.Unit, Are.GD); + np.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); np.RectSize = new Vector2D(np.OP[0].ps[1].X, np.OP[0].ps[2].Y); np.OP.ScalingY(np.BasePointBase, 0.9); np.OP.OutlineFalse(); @@ -280,7 +280,7 @@ namespace SlaveMatrix private void SetButPos() { - yp.PositionBase = new Vector2D(yp.PositionBase.X, Mai.ParT.ToGlobal(Mai.ParT.GetStringRect(Are.Unit, Are.GD).v2).Y + 0.0025); + yp.PositionBase = new Vector2D(yp.PositionBase.X, Mai.ParT.ToGlobal(Mai.ParT.GetStringRect(Are.UnitScale, Are.DisplayGraphics).v2).Y + 0.0025); np.PositionBase = new Vector2D(np.PositionBase.X, yp.ToGlobal(yp.OP.Last().ps.Last()).Y + 0.0025); } @@ -310,7 +310,7 @@ namespace SlaveMatrix nb.Up(ref HitColor); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { if (MaiShow) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs index b9b63d0..98acfed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs @@ -1397,7 +1397,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_植性_蔦); Are.Draw(X0Y0_植性_棘左上); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs index 6fbf3d6..5e9ba78 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix { public Med Med; - public Are Are; + public RenderArea Are; public Cha Cha; @@ -43,7 +43,7 @@ namespace SlaveMatrix protected sep sep; - public virtual void Draw(Are Are) + public virtual void Draw(RenderArea Are) { } @@ -55,7 +55,7 @@ namespace SlaveMatrix { } - public Stamp(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD) + public Stamp(Med Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD) { this.Med = Med; this.Are = Are; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs index d9a74f7..0252900 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix private Vector2D tp; - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (!汗かき.Run && !汗ひき.Run) { @@ -70,7 +70,7 @@ namespace SlaveMatrix } } - public Sweat(Med Med, Are Are, Cha Cha, Mots Mots) + public Sweat(Med Med, RenderArea Are, Cha Cha, Mots Mots) { Ele[] es = null; Ele n = null; @@ -216,7 +216,7 @@ namespace SlaveMatrix for (int i = 0; i < ps.Length; i++) { _ = ref ps[i]; - 汗 = new 汗(Are.DisUnit, 配色指定.N0, Cha.配色, Med, e2); + 汗 = new 汗(Are.DisplayUnitScale, 配色指定.N0, Cha.配色, Med, e2); 汗.SetHitFalse(); 汗.濃度 = ((RNG.XS.NextDouble() < 0.2) ? 1.0 : 0.0); 位置.Add(num switch diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs index 8880052..ceb1ac9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs @@ -41,9 +41,9 @@ namespace SlaveMatrix } } - public TextBubble(Are Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action Action) + public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action Action) { - 吹出し = new 吹出し(Are.DisUnit); + 吹出し = new 吹出し(Are.DisplayUnitScale); 吹出し.SetHitFalse(); 吹出し.右 = 右; 吹出し.吹出しCD.色 = new Color2(ref BackColor, ref Col.Empty); @@ -101,9 +101,9 @@ namespace SlaveMatrix } } - public TextBubble(Are Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis) + public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis) { - 吹出し = new 吹出し(Are.DisUnit); + 吹出し = new 吹出し(Are.DisplayUnitScale); 吹出し.SetHitFalse(); 吹出し.右 = 右; 吹出し.吹出しCD.色 = new Color2(ref BackColor, ref Col.Empty); @@ -184,7 +184,7 @@ namespace SlaveMatrix Tex.Position = 吹出し.X0Y0_吹出し.ToGlobal(吹出し.X0Y0_吹出し.JP[0].Joint); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { Tex.Progression(FPS); if (Dis) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 5215803..4c6d268 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -409,7 +409,7 @@ namespace SlaveMatrix 尺度YB = 0.9; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); キスマーク.Draw(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 0c9edd7..716d32d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -452,7 +452,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴_鱗); Are.Draw(X0Y0_胴_鱗左); @@ -464,7 +464,7 @@ namespace SlaveMatrix } } - public void 拘束具描画(Are Are) + public void 拘束具描画(RenderArea Are) { Are.Draw(X0Y0_輪_革); Are.Draw(X0Y0_輪_金具1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 165ee75..f60ab75 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -616,7 +616,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index dbd8693..130fe69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -2942,7 +2942,7 @@ namespace SlaveMatrix 本体.JoinPA(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -3014,7 +3014,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index 8cd7c2b..7c96511 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -130,7 +130,7 @@ namespace SlaveMatrix public void 吸着(Ele 対象) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.01), Sta.吸着.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); @@ -138,7 +138,7 @@ namespace SlaveMatrix public void 吸脱(Ele 対象) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.01), Sta.吸脱.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); @@ -148,7 +148,7 @@ namespace SlaveMatrix { if ((対象 is キャップ1 && CP中.GetFlag(0.2)) || (対象 is キャップ2 && !対象.右 && CP左.GetFlag(0.2)) || (対象 is キャップ2 && 対象.右 && CP右.GetFlag(0.2))) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.02), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.15, b: true); }); @@ -585,7 +585,7 @@ namespace SlaveMatrix : base(調教UI) { キャップ処理 キャップ処理2 = this; - double disUnit = 調教UI.Are.DisUnit; + double disUnit = 調教UI.Are.DisplayUnitScale; キャップ着.SetDefault(); キャップ1D e = new キャップ1D(); e.SetValuesD("表示", true); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs index b49816c..8eacba8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs @@ -9,7 +9,7 @@ namespace SlaveMatrix { private Mot ぶっかけ垂れ; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -45,7 +45,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Sta.GameData.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Sta.GameData.配色); sep.Sta.SetHitFalse(); sep.Sta.Xv = RNG.XS.NextDouble(); sep.Sta.右 = RNG.XS.NextBool(); @@ -66,7 +66,7 @@ namespace SlaveMatrix } } - public スタンプB(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Mots Mots) + public スタンプB(Med Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Mots Mots) : base(Med, Are, Cha, Bod, EleD) { Ele e = null; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs index d74a23c..dd00553 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { private Ele Par; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); sep.Sta.SetHitFalse(); sep.Ele = he; sep.Par = p; @@ -57,7 +57,7 @@ namespace SlaveMatrix return null; } - public スタンプK(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプK(Med Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) : base(Med, Are, Cha, Bod, EleD) { this.Par = Par; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs index f9f7447..630abe0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { private Ele Par; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); sep.Sta.SetHitFalse(); sep.Sta.角度C = 45.0 * (double)(RNG.XS.NextBool() ? 1 : (-1)) * RNG.XS.NextDouble(); sep.Ele = he; @@ -58,7 +58,7 @@ namespace SlaveMatrix return false; } - public スタンプW(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプW(Med Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) : base(Med, Are, Cha, Bod, EleD) { this.Par = Par; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs index 6af10c4..5337e25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs @@ -5226,7 +5226,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexX) { @@ -5784,7 +5784,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexX) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index 94ac38f..91fabf9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix public void くぱ() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.01), Sta.くぱ.GetVal(Player.変化V_膣, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index 17256a5..49daf76 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -618,7 +618,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 本体.Draw(AreM); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 8b5f27a..4d36f0f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -139,7 +139,7 @@ namespace SlaveMatrix public void 射精_() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Sta.GetAreaPoint(ref 調教UI.ペニス.AreM.Position, 0.02), Sta.射精.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 63bc165..03c221a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs @@ -589,7 +589,7 @@ namespace SlaveMatrix X0Y4_ハイライト.SizeXBase *= num; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); キスマーク.Draw(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs index 3f45657..05b7e69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs @@ -466,7 +466,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexX) { @@ -516,7 +516,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexX) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index a887c5d..39b051a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix public void 吸引() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.吸引.GetVal(1.0, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs index 8d3e0dc..17708dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs @@ -472,7 +472,7 @@ namespace SlaveMatrix 尺度YB = 0.95; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { @@ -493,7 +493,7 @@ namespace SlaveMatrix Are.Draw(X0Y1_縁前_縁中); } - public void 前(Are Are) + public void 前(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs index 19fa871..45f20e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs @@ -3929,7 +3929,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_筋肉上); Are.Draw(X0Y0_上腕); @@ -4034,7 +4034,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_植性_欠損_葉1); } - public void 鎧描画(Are Are) + public void 鎧描画(RenderArea Are) { Are.Draw(X0Y0_鎧_ベルト_ベルト1); Are.Draw(X0Y0_鎧_ベルト_ベルト2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs index b6dd8b1..b985dc6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs @@ -506,7 +506,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_風切羽_羽3); Are.Draw(X0Y0_風切羽_羽2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs index 25fd2f7..81ac235 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs @@ -708,7 +708,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_布_布左_布); Are.Draw(X0Y0_布_布左_皺_皺1); @@ -722,7 +722,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_布_布右_縁_縁2); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ右_布); Are.Draw(X0Y0_カップ右_皺); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs index 16e3468..bec9446 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs @@ -642,7 +642,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_布_布左_布); Are.Draw(X0Y0_布_布左_皺_皺1); @@ -656,7 +656,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_布_布右_縁_縁2); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_布_布); Are.Draw(X0Y0_皺_皺1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs index d54d28a..69af6b1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs @@ -540,12 +540,12 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_紐); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ左_紐); Are.Draw(X0Y0_カップ左_カップ); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs index e0632af..f2ae987 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs @@ -2643,7 +2643,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_バンド_バンド); Are.Draw(X0Y0_バンド_縁_下); @@ -2652,7 +2652,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_バンド_縁_右); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ左_紐); Are.Draw(X0Y0_カップ左_ジャスター_ジャスター1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs index 85f9abf..eff60bf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs @@ -540,11 +540,11 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_紐); Are.Draw(X0Y0_カップ左_紐); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs index 0506096..2662a94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs @@ -3469,7 +3469,7 @@ namespace SlaveMatrix X0Y4_下地.BasePointBase = X0Y4_下地.BasePointBase.AddY(y); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -3496,7 +3496,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs index 8888c3e..f1baa98 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs @@ -2289,7 +2289,7 @@ namespace SlaveMatrix X0Y4_下地.BasePointBase = X0Y4_下地.BasePointBase.AddY(y); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -2316,7 +2316,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs index 80efe4d..bf46e38 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs @@ -5296,7 +5296,7 @@ namespace SlaveMatrix 鎖1.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_下腕); Are.Draw(X0Y0_筋肉_筋肉下); @@ -5316,7 +5316,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性1_手首_鱗1); } - public void 外腕描画(Are Are) + public void 外腕描画(RenderArea Are) { Are.Draw(X0Y0_植性1_通常_花弁_花弁); Are.Draw(X0Y0_植性1_通常_花弁_影_花弁影1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs index 2f6f690..7bebe44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs @@ -567,7 +567,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs index e3b9b45..25fc9da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs @@ -708,7 +708,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_獣翼下腕); Are.Draw(X0Y0_竜性_鱗1); @@ -726,7 +726,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性_鱗13); } - public void 腕輪描画(Are Are) + public void 腕輪描画(RenderArea Are) { Are.Draw(X0Y0_腕輪_革); Are.Draw(X0Y0_腕輪_金具1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs index d80168f..0d8ce14 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs @@ -2420,7 +2420,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_鳥翼下腕); Are.Draw(X0Y0_風切羽_羽15); @@ -2467,7 +2467,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_中雨覆羽_羽1); } - public void 小雨覆描画(Are Are) + public void 小雨覆描画(RenderArea Are) { Are.Draw(X0Y0_小雨覆_小雨覆); Are.Draw(X0Y0_小雨覆_竜性_鱗1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index f6eec77..b46aa44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -1004,7 +1004,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs index 03a4da6..1409287 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs @@ -8,7 +8,7 @@ namespace SlaveMatrix public Med Med; - public Are Are; + public RenderArea Are; public Cha Cha; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index a3c5018..63dda8b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix { if (CP.GetFlag(0.1 * Cha.ChaD.現陰毛)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.剃り.GetVal(Cha.ChaD.現陰毛, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * RNG.XS.NextDouble(), b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index ac3d580..62e861a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -1167,7 +1167,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index 0d2ec4f..88c6c2e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -1081,7 +1081,7 @@ namespace SlaveMatrix 尺度YB = 0.96; } - public void 胸描画(Are Are) + public void 胸描画(RenderArea Are) { Are.Draw(X0Y0_胸郭); Are.Draw(X0Y0_筋肉_筋肉左); @@ -1099,7 +1099,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性_中_鱗2); } - public void 肌描画(Are Are) + public void 肌描画(RenderArea Are) { Are.Draw(X0Y0_紋柄_紋左_紋1); Are.Draw(X0Y0_紋柄_紋左_紋2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index f51e8aa..a08db3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -1326,7 +1326,7 @@ namespace SlaveMatrix yield return X0Y0_前腹_腹節7_節0; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_前腹_腹節7_節0); Are.Draw(X0Y0_前腹_腹節7_節1); @@ -1366,7 +1366,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_生殖口_生殖口1); } - public void 前描画(Are Are) + public void 前描画(RenderArea Are) { Are.Draw(X0Y0_基節_肢内突起左); Are.Draw(X0Y0_基節_肢内突起右); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index baf4e05..43eb92f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -543,7 +543,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); if (!欠損_) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index 28d1238..b018738 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -4076,7 +4076,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾20_尾); Are.Draw(X0Y0_尾20_鱗左5); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs index a00d180..b734b60 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs @@ -2570,7 +2570,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾); Are.Draw(X0Y0_尾9_尾); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index 183ff80..c9ded42 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -6616,7 +6616,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾35_尾); Are.Draw(X0Y0_尾35_鱗左3); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs index 69189b1..4b9bd0b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs @@ -795,7 +795,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0); Are.Draw(X0Y0_尾1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs index 14d6fc2..6c15797 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs @@ -1651,7 +1651,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0_尾); Are.Draw(X0Y0_尾0_線1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs index e70aba0..c2ac1aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs @@ -795,7 +795,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0); Are.Draw(X0Y0_尾1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs index a06c15c..5b2ce43 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs @@ -942,7 +942,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾17); Are.Draw(X0Y0_針); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs index f229640..9da4aa2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs @@ -5914,7 +5914,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾1_根); Are.Draw(X0Y0_尾1_鱗); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs index 8300340..906255e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs @@ -774,7 +774,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾10); Are.Draw(X0Y0_針); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs index 587341d..8f27c97 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs @@ -5909,7 +5909,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾1_根); Are.Draw(X0Y0_尾1_鱗); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index 154f69d..8293be4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -1935,7 +1935,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾5_背板); Are.Draw(X0Y0_尾5_節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs index b6f7817..f707bb3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs @@ -1044,7 +1044,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_尾); Are.Draw(X0Y0_節1_線); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index 0f3e1f9..1c8a7ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -9317,7 +9317,7 @@ namespace SlaveMatrix X0Y0_尾14_尾.AngleBase = 0.0; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (Rパターン) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index c8526c6..76e216d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -4011,7 +4011,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾33_尾); Are.Draw(X0Y0_尾33_柄); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs index 9b92d3f..4c87488 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs @@ -1470,7 +1470,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾40); Are.Draw(X0Y0_尾39); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 8d67373..acfaf55 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -1252,7 +1252,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 位置B = AreMPos; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index 3f953c7..ab1db9a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -1252,7 +1252,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 位置B = AreMPos; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs index fe589dc..9cc1afb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs @@ -444,7 +444,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs index e909fdf..b85e96a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs @@ -863,7 +863,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_獣翼手); Are.Draw(X0Y0_小指_指1); @@ -876,7 +876,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_親指_指3); } - public void 指先描画(Are Are) + public void 指先描画(RenderArea Are) { Are.Draw(X0Y0_小指_指2); Are.Draw(X0Y0_小指_指3); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs index b09ee7f..3179c36 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs @@ -395,7 +395,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs index 355c43b..d009dc2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs @@ -2405,7 +2405,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_鳥翼手); Are.Draw(X0Y0_風切羽_羽10); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index 2e0a6cb..a47922e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -473,7 +473,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口挿.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -484,7 +484,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_口 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口中.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -495,7 +495,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口抜.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -506,7 +506,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣挿.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -517,7 +517,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_膣 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣中.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -528,7 +528,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣抜.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -539,7 +539,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛挿.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -550,7 +550,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_肛 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛中.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -561,7 +561,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛抜.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -572,7 +572,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸挿.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -583,7 +583,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_糸 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸中.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -594,7 +594,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸抜.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -605,7 +605,7 @@ namespace SlaveMatrix { if (CP振動.GetFlag(0.1 + 0.1 * base.強度)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.04), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * base.強度, b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs index b966b82..bc05e23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs @@ -542,7 +542,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_潮1); Are.Draw(X0Y0_潮2); @@ -552,7 +552,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_汗); } - public void 湯気描画(Are Are) + public void 湯気描画(RenderArea Are) { Are.Draw(X0Y0_湯気_湯気左1_湯気1); Are.Draw(X0Y0_湯気_湯気左1_湯気2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs index 55bdb4d..1deda0e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs @@ -542,7 +542,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_潮1); Are.Draw(X0Y0_潮2); @@ -552,7 +552,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_汗); } - public void 湯気描画(Are Are) + public void 湯気描画(RenderArea Are) { Are.Draw(X0Y0_湯気_湯気左1_湯気1); Are.Draw(X0Y0_湯気_湯気左1_湯気2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs index 508bfd2..738b5cb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs @@ -421,7 +421,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_前腿節); Are.Draw(X0Y0_腿節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs index 84006bb..34c6352 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs @@ -398,7 +398,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_牙); Are.Draw(X0Y0_輪_革); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs index 5e54263..921d777 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs @@ -466,7 +466,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs index 04a703a..3b0a27e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs @@ -608,7 +608,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs index 73550e3..b775bf4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs @@ -559,7 +559,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_転節); Are.Draw(X0Y0_腿節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs index bb3ea7b..d1c7fe6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs @@ -398,19 +398,19 @@ namespace SlaveMatrix X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001); } - public void 脇描画(Are Are) + public void 脇描画(RenderArea Are) { Are.Draw(X0Y0_脇_脇); Are.Draw(X0Y0_脇_筋肉); } - public void 服描画(Are Are) + public void 服描画(RenderArea Are) { Are.Draw(X0Y0_肩_シャツ); Are.Draw(X0Y0_肩_ナース); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_肩_肩); Are.Draw(X0Y0_肩_傷I1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs index 747e428..c075897 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs @@ -1781,7 +1781,7 @@ namespace SlaveMatrix 尺度YB = 0.99; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胸郭); Are.Draw(X0Y0_筋肉_筋肉左); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs index 147e7db..23929c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs @@ -985,7 +985,7 @@ namespace SlaveMatrix 尺度YB = 0.99; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_虫性_甲殻2); Are.Draw(X0Y0_虫性_甲殻1_甲殻); @@ -1022,7 +1022,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_コア_コア1_ハイライト); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_コア_コア2_基); Are.Draw(X0Y0_コア_コア2_コア); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs index 7d75bf4..588153d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs @@ -7052,7 +7052,7 @@ namespace SlaveMatrix 鎖3.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { @@ -7252,7 +7252,7 @@ namespace SlaveMatrix } } - public void 外描画(Are Are) + public void 外描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs index 8b3e9a0..3957748 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs index 6be8888..45fb248 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs @@ -793,7 +793,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs index 4b4729e..02e9f1f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs index c27b595..4959357 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs index e20fcbc..c975bf5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs @@ -3576,7 +3576,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs index 6187885..6f122bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs @@ -18,12 +18,12 @@ namespace SlaveMatrix } } - public virtual void 根描画(Are Are) + public virtual void 根描画(RenderArea Are) { 本体.Draw(Are); } - public virtual void 先描画(Are Are) + public virtual void 先描画(RenderArea Are) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs index 20611f0..325832f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs @@ -651,7 +651,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -681,7 +681,7 @@ namespace SlaveMatrix } } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs index 4c9a055..f6e251e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs @@ -518,7 +518,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -543,7 +543,7 @@ namespace SlaveMatrix } } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs index b3647cc..fbea356 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs @@ -447,7 +447,7 @@ namespace SlaveMatrix 鎖1.Dispose(); } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { 本体.Draw(Are); if (!欠損_) @@ -456,7 +456,7 @@ namespace SlaveMatrix } } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); if (!欠損_) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs index dc32494..c8eae76 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs @@ -356,11 +356,11 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { 本体.Draw(Are); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index 859b521..962982f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -7119,7 +7119,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_脚後_鰭_鰭膜1); Are.Draw(X0Y0_脚後_鰭_鰭条1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index 16fdd2e..11b6979 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -4085,7 +4085,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_節); Are.Draw(X0Y0_節1_棘1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs index 8b49b27..3429399 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs @@ -4443,7 +4443,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_腕部_節1_節); Are.Draw(X0Y0_腕部_節1_紋柄_紋柄1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs index 07a2b81..57ce21e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs @@ -8421,7 +8421,7 @@ namespace SlaveMatrix 節1_吸盤4_表示 = false; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_節); Are.Draw(X0Y0_節1_紋柄1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs index f50f109..60dfc13 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs @@ -439,7 +439,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs index 6d00de2..de9e440 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs @@ -608,7 +608,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_爪2); Are.Draw(X0Y0_爪1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs index 8603006..e00a33b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs @@ -40,7 +40,7 @@ namespace SlaveMatrix } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { c = 0; for (y = 0; y < 10; y++) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs index 890fb96..0fef941 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix public void 振り() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.05), Sta.鞭振.GetVal(強さ_, 1.0), new Font("MS Gothic", 1f), Col.White, 0.2 + 0.2 * 強さ_, b: true); }); @@ -32,7 +32,7 @@ namespace SlaveMatrix public void 打ち(Vector2D p) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Sta.GetAreaPoint(ref p, 0.01), Sta.鞭打.GetVal(強さ_, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Color.Red.S(強さ_.Clamp(0.5, 1.0)), 0.2 + 0.1 * 強さ_, b: true); }); @@ -194,7 +194,7 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(鞭撃モーション.GetHashCode().ToString(), 鞭撃モーション); - 衝撃 = new 衝撃(Are.DisUnit, 配色指定.N0, null, Med, new 衝撃D + 衝撃 = new 衝撃(Are.DisplayUnitScale, 配色指定.N0, null, Med, new 衝撃D { 表示 = false }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs index bc557b3..2fab7c9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs @@ -3862,7 +3862,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { @@ -3940,7 +3940,7 @@ namespace SlaveMatrix } } - public void 底描画(Are Are) + public void 底描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -3963,7 +3963,7 @@ namespace SlaveMatrix Are.Draw(X0Y1_アーマ0_靴底); } - public void 靴描画(Are Are) + public void 靴描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs index df8d80f..c1c6b0a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs @@ -514,7 +514,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs index 6ecf52c..911bbb5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs @@ -710,7 +710,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs index 7726596..05e7c0f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs @@ -1516,7 +1516,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs index 59f6ed4..ebb593f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs @@ -418,7 +418,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs index 181dab3..ad146be 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs @@ -2185,7 +2185,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_足); Are.Draw(X0Y0_筋); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index a0239b6..144163f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -414,7 +414,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴1_鱗2); Are.Draw(X0Y0_胴1_鱗左2); @@ -430,7 +430,7 @@ namespace SlaveMatrix } } - public void 前描画(Are Are) + public void 前描画(RenderArea Are) { if (くぱぁ_ != 1.0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index ced6832..0e15867 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix 鎖2.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index e9f4dd1..da3d3da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -2374,7 +2374,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (Rパターン) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 344b9bf..a455159 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -1205,7 +1205,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴6_胴); Are.Draw(X0Y0_胴6_柄); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs index 4f4f2e6..50321d1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs @@ -887,7 +887,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_淫タトゥ_ハート_タトゥ左); Are.Draw(X0Y0_淫タトゥ_ハート_タトゥ右); @@ -920,7 +920,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_傷_傷I3); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_獣性_髭1); Are.Draw(X0Y0_獣性_髭2); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs index 8b1785d..941b90a 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs @@ -9,25 +9,25 @@ namespace SlaveMatrix { public class DE : Ele { - public Action 描画; + public Action 描画; - public DE(Ele src, Action 描画) + public DE(Ele src, Action 描画) { Par = src; 本体 = src.本体; this.描画 = 描画; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 描画(Are); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { } } @@ -694,7 +694,7 @@ namespace SlaveMatrix public bool Is腿犬; - private Action Draw = delegate + private Action Draw = delegate { }; @@ -2931,12 +2931,12 @@ namespace SlaveMatrix } } - public Bod(Med Med, Are Are, Cha Cha) + public Bod(Med Med, RenderArea Are, Cha Cha) { Bod bod = this; this.Med = Med; this.Cha = Cha; - double disUnit = Are.DisUnit; + double disUnit = Are.DisplayUnitScale; 腰 = (Waist)Cha.ChaD.body_tree.GetEle(disUnit, Med, Cha.配色); Elements = 腰.EnumEle().ToArray(); List<スタンプK> sk = new List<スタンプK>(); @@ -5475,7 +5475,7 @@ namespace SlaveMatrix { EI胸.AddRange(es2); } - EI胸.描画処理 = delegate(Are are) + EI胸.描画処理 = delegate(RenderArea are) { bod.背中接続.描画0(are); bod.背中接続.描画1(are); @@ -5525,7 +5525,7 @@ namespace SlaveMatrix { EI髪 = new EleI(Med); EI髪.AddRange(後髪接続); - EI髪.描画処理 = delegate(Are are) + EI髪.描画処理 = delegate(RenderArea are) { bod.後髪接続.描画0(are); bod.後髪接続.描画1(are); @@ -5538,7 +5538,7 @@ namespace SlaveMatrix EI腰 = new EleI(Med); EI腰.AddRange(腰後左接続); EI腰.AddRange(腰後右接続); - EI腰.描画処理 = delegate(Are are) + EI腰.描画処理 = delegate(RenderArea are) { bod.腰後左接続.描画0(are); bod.腰後左接続.描画1(are); @@ -5553,7 +5553,7 @@ namespace SlaveMatrix EI半後 = new EleI(Med); EI半後.AddRange(尾接続); EI半後.AddRange(半身後接続); - EI半後.描画処理 = delegate(Are are) + EI半後.描画処理 = delegate(RenderArea are) { bod.尾接続.描画0(are); bod.尾接続.描画1(are); @@ -5567,7 +5567,7 @@ namespace SlaveMatrix { EI半中1 = new EleI(Med); EI半中1.AddRange(半身中1接続); - EI半中1.描画処理 = delegate(Are are) + EI半中1.描画処理 = delegate(RenderArea are) { bod.半身中1接続.描画0(are); bod.半身中1接続.描画1(are); @@ -5579,7 +5579,7 @@ namespace SlaveMatrix { EI半中2 = new EleI(Med); EI半中2.AddRange(半身中2接続); - EI半中2.描画処理 = delegate(Are are) + EI半中2.描画処理 = delegate(RenderArea are) { bod.半身中2接続.描画0(are); bod.半身中2接続.描画1(are); @@ -5591,7 +5591,7 @@ namespace SlaveMatrix { EI半前 = new EleI(Med); EI半前.AddRange(半身前接続); - EI半前.描画処理 = delegate(Are are) + EI半前.描画処理 = delegate(RenderArea are) { bod.半身前接続.描画0(are); bod.半身前接続.描画1(are); @@ -5604,7 +5604,7 @@ namespace SlaveMatrix EI腕前 = new EleI(Med); EI腕前.AddRange(下腕以降左); EI腕前.AddRange(下腕以降右); - EI腕前.描画処理 = delegate(Are are) + EI腕前.描画処理 = delegate(RenderArea are) { if (bod.腕左右前後) { @@ -5641,7 +5641,7 @@ namespace SlaveMatrix EI腿 = new EleI(Med); EI腿.AddRange(腿左接続); EI腿.AddRange(腿右接続); - EI腿.描画処理 = delegate(Are are) + EI腿.描画処理 = delegate(RenderArea are) { if (bod.腿左右前後) { @@ -5673,7 +5673,7 @@ namespace SlaveMatrix Update(); if (Is海洋) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -6092,7 +6092,7 @@ namespace SlaveMatrix } if (Is長物) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { if (bod.Is蛇) { @@ -6523,7 +6523,7 @@ namespace SlaveMatrix } if (Is獣) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -6953,7 +6953,7 @@ namespace SlaveMatrix } if (Is蛸) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -7372,7 +7372,7 @@ namespace SlaveMatrix } if (Is多足) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { if (bod.Is蠍) { @@ -7800,7 +7800,7 @@ namespace SlaveMatrix } if (Is植) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -8236,7 +8236,7 @@ namespace SlaveMatrix } if (Is粘) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -8678,7 +8678,7 @@ namespace SlaveMatrix }; return; } - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.cb0 = bod.カーソル != null; bod.cb1 = bod.cb0 && !bod.カーソル.コキ; @@ -9572,7 +9572,7 @@ namespace SlaveMatrix } } - public void 描画(Are Are) + public void 描画(RenderArea Are) { cb0 = カーソル != null; cb1 = cb0 && !カーソル.コキ; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs index 2f8d914..ee52399 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs @@ -66,7 +66,7 @@ namespace SlaveMatrix bp = default(Vector2D); } - public void 描画0(Are Are) + public void 描画0(RenderArea Are) { if (Show && Under && 描画Show) { @@ -77,7 +77,7 @@ namespace SlaveMatrix } } - public void 描画1(Are Are) + public void 描画1(RenderArea Are) { if (Show && Under && 描画Show) { @@ -86,7 +86,7 @@ namespace SlaveMatrix } } - public void 描画0s(Are Are) + public void 描画0s(RenderArea Are) { if (Show && Under && 描画Show) { @@ -96,7 +96,7 @@ namespace SlaveMatrix } } - public void 描画1s(Are Are) + public void 描画1s(RenderArea Are) { if (Show && Under && 描画Show) { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public void 待機描画(Are Are) + public void 待機描画(RenderArea Are) { if (Show && !Under && StaShow) { @@ -115,7 +115,7 @@ namespace SlaveMatrix } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (Show && !Under && DraShow) { @@ -128,7 +128,7 @@ namespace SlaveMatrix } } - public void Draws(Are Are) + public void Draws(RenderArea Are) { if (Show && !Under && DraShow) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs index d2c37d0..f547b68 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs @@ -12,7 +12,7 @@ namespace SlaveMatrix { public Med Med; - public Are Are; + public RenderArea Are; public Bod Bod; @@ -244,14 +244,14 @@ namespace SlaveMatrix 放尿強制終了_(); } - public Cha(Med Med, Are Are, ChaD ChaD) + public Cha(Med Med, RenderArea Are, ChaD ChaD) { Cha cha = this; this.Med = Med; this.Are = Are; this.ChaD = ChaD; 配色 = new 体配色(ChaD.body_color); - _ = Are.DisUnit; + _ = Are.DisplayUnitScale; Bod = new Bod(Med, Are, this); 重髪 = Bod.Is髪 && Bod.EI髪.IsHeavy(); 重胸 = Bod.Is胸 && Bod.EI胸.IsHeavy(); @@ -1994,7 +1994,7 @@ namespace SlaveMatrix this.SetInitialAngle(); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { this.FPS = FPS.Value; Mots.Drive(FPS); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs index 503c33d..bc2ddc1 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs @@ -959,16 +959,16 @@ namespace SlaveMatrix 接続根.Set(接続元); } - public virtual void 描画0(Are Are) + public virtual void 描画0(RenderArea Are) { 本体.Draw(Are); } - public virtual void 描画1(Are Are) + public virtual void 描画1(RenderArea Are) { } - public virtual void 描画2(Are Are) + public virtual void 描画2(RenderArea Are) { } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs index 8311d0d..6b7d656 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs @@ -10,11 +10,11 @@ namespace SlaveMatrix public Vector2D PositionCont = Dat.Vec2DZero; - public Are Lay; + public RenderArea Lay; public bool Updatef = true; - public Action 描画処理; + public Action 描画処理; public HashSet ElesH; @@ -38,11 +38,11 @@ namespace SlaveMatrix public EleI(Med Med) { - Lay = new Are(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size + 0.0025, Med.DisQuality, Med.HitAccuracy); + Lay = new RenderArea(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size + 0.0025, Med.DisQuality, Med.HitAccuracy); ElesH = new HashSet(); } - public void 描画(Are Are) + public void 描画(RenderArea Are) { Vec.Add(ref Position, ref PositionCont, out Lay.Position); Are.Draw(Lay); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs b/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs index 45b0fec..6157def 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix //list of buttons public class ListView { - private Are Are; + private RenderArea Are; private ParT[] pt; @@ -70,7 +70,7 @@ namespace SlaveMatrix } } - public ListView(Are Are, Vector2D Position, double Space, Font Font, double TextSize, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, params TA[] acts) + public ListView(RenderArea Are, Vector2D Position, double Space, Font Font, double TextSize, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, params TA[] acts) { this.Are = Are; this.Space = Space; @@ -84,7 +84,7 @@ namespace SlaveMatrix pt[i].Font = Font; pt[i].FontSize = TextSize; pt[i].RectSize = new Vector2D(100.0, 100.0); - pt[i].SetStringRectOutline(Are.Unit, Are.GD); + pt[i].SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); pt[i].Closed = true; pt[i].TextColor = TextColor; if (!ShadColor.IsEmpty) @@ -129,7 +129,7 @@ namespace SlaveMatrix bs.Up(ref HitColor); } - public void Draw(Are Are) + public void Draw(RenderArea Are) { bs.Draw(Are); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index e95b0ee..c8a8012 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix public static class MyUI { //normal rectangular buttons - public static But1 Button(Med med, Are buffer, string text, Vector2D pos, Action on_click) { + public static But1 Button(Med med, RenderArea buffer, string text, Vector2D pos, Action on_click) { ParT parT = new ParT(); parT.Font = new Font("MS Gothic", 0.1f); @@ -75,7 +75,7 @@ namespace SlaveMatrix } //rhombus shaped buttons - public static But1 Button2(Med med, Are buffer, string text, Vector2D pos, Action on_click) { + public static But1 Button2(Med med, RenderArea buffer, string text, Vector2D pos, Action on_click) { ParT parT = new ParT(); parT.Font = new Font("MS Gothic", 0.1f); parT.PositionBase = buffer.GetPosition(pos); @@ -96,7 +96,7 @@ namespace SlaveMatrix return new But1(parT, on_click); } - public static ListView Select(Are buffer, Vector2D pos, params TA[] acts) { + public static ListView Select(RenderArea buffer, Vector2D pos, params TA[] acts) { return new ListView( buffer, buffer.GetPosition(pos), @@ -111,7 +111,7 @@ namespace SlaveMatrix ); } - public static Lab Label(Med med, Are buffer, string text, Vector2D pos) { + public static Lab Label(Med med, RenderArea buffer, string text, Vector2D pos) { return new Lab( buffer, "", @@ -151,30 +151,30 @@ namespace SlaveMatrix //buffers - public static Are DrawBuffer; - public static Are BlackBackground; - public static Are BasementBackground; - public static Are OfficeBackground; - public static Are drawArea; + public static RenderArea DrawBuffer; + public static RenderArea BlackBackground; + public static RenderArea BasementBackground; + public static RenderArea OfficeBackground; + public static RenderArea drawArea; - private static Action メインフォーム描画; - private static Action 調教描画; - public static Action 撮影描画; - private static Action 対象描画; - private static Action DrawBlessing; - private static Action DrawOffice; - private static Action DrawDebt; - private static Action DrawSlaveShop; - private static Action DrawToolShop; - private static Action 中継描画; - private static Action DrawOP0; - private static Action DrawOP1; - private static Action 説明描画; - private static Action 初事務所描画; - private static Action 返済イベント描画; - private static Action 日数進行描画; - private static Action PlayerInformationSliders; + private static Action メインフォーム描画; + private static Action 調教描画; + public static Action 撮影描画; + private static Action 対象描画; + private static Action DrawBlessing; + private static Action DrawOffice; + private static Action DrawDebt; + private static Action DrawSlaveShop; + private static Action DrawToolShop; + private static Action 中継描画; + private static Action DrawOP0; + private static Action DrawOP1; + private static Action 説明描画; + private static Action 初事務所描画; + private static Action 返済イベント描画; + private static Action 日数進行描画; + private static Action PlayerInformationSliders; private static Action 対象UI初期化; private static Action 奴隷UI初期化; @@ -209,17 +209,17 @@ namespace SlaveMatrix Sta.Set喘ぎ(); //setup buffers - drawArea = new Are(Med, Hit: false); - DrawBuffer = new Are(Med, Hit: true); + drawArea = new RenderArea(Med, Hit: false); + DrawBuffer = new RenderArea(Med, Hit: true); - BlackBackground = new Are(Med, Hit: true); + BlackBackground = new RenderArea(Med, Hit: true); BlackBackground.Clear(Col.Black); - BasementBackground = new Are(Med, Hit: true); - BasementBackground.GD.DrawImage(new Bitmap(new MemoryStream(Resources.dangeon01_ex2)), BasementBackground.Dis.GetRect()); + BasementBackground = new RenderArea(Med, Hit: true); + BasementBackground.DisplayGraphics.DrawImage(new Bitmap(new MemoryStream(Resources.dangeon01_ex2)), BasementBackground.DisplayLayer.GetRect()); - OfficeBackground = new Are(Med, Hit: true); - OfficeBackground.GD.DrawImage(new Bitmap(new MemoryStream(Resources.li_room10a_c_ex2)), OfficeBackground.Dis.GetRect()); + OfficeBackground = new RenderArea(Med, Hit: true); + OfficeBackground.DisplayGraphics.DrawImage(new Bitmap(new MemoryStream(Resources.li_room10a_c_ex2)), OfficeBackground.DisplayLayer.GetRect()); SaveData = new ListView( DrawBuffer, @@ -526,7 +526,7 @@ namespace SlaveMatrix }; static double v = 0.0; - private static void SwitchMode(Med Med, Are Are, FPS FPS, Action 描画) + private static void SwitchMode(Med Med, RenderArea Are, FPS FPS, Action 描画) { if (fade_in) { @@ -552,7 +552,7 @@ namespace SlaveMatrix } } - public static void SwitchMode(this Med Med, string Mode, Are Are, Action 描画) + public static void SwitchMode(this Med Med, string Mode, RenderArea Are, Action 描画) { Med.Mode = Mode; 描画(drawArea, Med.FPSF); @@ -1470,12 +1470,12 @@ namespace SlaveMatrix } })); - メインフォーム描画 = delegate (Are a, FPS FPS) + メインフォーム描画 = delegate (RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (TrainingTarget != null) @@ -1636,8 +1636,8 @@ namespace SlaveMatrix public static Module Training(Med Med) { 調教背景 BackgroundDrawing = new 調教背景(); - Are TrainingBackground = new Are(Med, Hit: false); - TrainingBackground.GD.Clear(Color.Gray); + RenderArea TrainingBackground = new RenderArea(Med, Hit: false); + TrainingBackground.DisplayGraphics.Clear(Color.Gray); Player.UI = new TrainingUI(Med, DrawBuffer, ip); Player.UI.調教終了.Action = delegate @@ -1691,13 +1691,13 @@ namespace SlaveMatrix ContactD cd = default(ContactD); Vector2D op = Dat.Vec2DZero; - 調教描画 = delegate (Are a, FPS FPS) + 調教描画 = delegate (RenderArea a, FPS FPS) { Player.UI.Mots.Drive(FPS); Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(TrainingBackground); TrainingTarget.Draw(a, FPS); @@ -1724,7 +1724,7 @@ namespace SlaveMatrix 調教済みチェック = false; } }; - 撮影描画 = delegate (Are a, FPS FPS) + 撮影描画 = delegate (RenderArea a, FPS FPS) { a.Draw(TrainingBackground); TrainingTarget.Draw(a, FPS); @@ -1733,7 +1733,7 @@ namespace SlaveMatrix return new Module { Setting = delegate { - TrainingBackground.GD.Clear(Color.Gray); + TrainingBackground.DisplayGraphics.Clear(Color.Gray); BackgroundDrawing.Reset(); BackgroundDrawing.Draw(TrainingBackground); ip.MaiShow = false; @@ -1821,12 +1821,12 @@ namespace SlaveMatrix public static Module 調教中継行(Med Med) { - 中継描画 = delegate(Are a, FPS FPS) + 中継描画 = delegate(RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ip.Draw(a, FPS); @@ -3277,12 +3277,12 @@ namespace SlaveMatrix bs.SetHitColor(Med); - 対象描画 = delegate (Are a, FPS FPS) + 対象描画 = delegate (RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (TrainingTarget != null) @@ -3496,12 +3496,12 @@ namespace SlaveMatrix } }; - DrawBlessing = delegate (Are a, FPS FPS) + DrawBlessing = delegate (RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (祝福 != null) @@ -3883,11 +3883,11 @@ namespace SlaveMatrix } } }; - DrawOffice = delegate(Are a, FPS FPS) + DrawOffice = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -4391,12 +4391,12 @@ namespace SlaveMatrix bs["nr"].Dra = Sta.GameData.借金 != 0; } }; - DrawDebt = delegate(Are a, FPS FPS) + DrawDebt = delegate(RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -5070,12 +5070,12 @@ namespace SlaveMatrix si.Set(bre: false); } }; - DrawSlaveShop = delegate(Are a, FPS FPS) + DrawSlaveShop = delegate(RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); if (u != null) @@ -5437,12 +5437,12 @@ namespace SlaveMatrix subinfo(); } }; - DrawToolShop = delegate(Are a, FPS FPS) + DrawToolShop = delegate(RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); lv.Draw(a); @@ -5526,16 +5526,16 @@ namespace SlaveMatrix si.Set(bre: false); } }; - 日数進行描画 = delegate(Are a, FPS FPS) + 日数進行描画 = delegate(RenderArea a, FPS FPS) { if (TrainingTarget != null) { TrainingTarget.Mots.Drive(FPS); } Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ip.Draw(a, FPS); @@ -5616,57 +5616,57 @@ namespace SlaveMatrix ls.Add("ラベル13", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.005)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, GameText.体格, Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル14", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.045)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "H:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル15", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.086)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "W:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); - Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H肌.Gauge.PenColor = Col.White; H肌.Frame1.PenColor = Col.White; H肌.Knob.PenColor = Col.White; H肌.Knob.HitColor = Med.GetUniqueColor(); - Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S肌.Gauge.PenColor = Col.White; S肌.Frame1.PenColor = Col.White; S肌.Knob.PenColor = Col.White; S肌.Knob.HitColor = Med.GetUniqueColor(); - Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V肌.Gauge.PenColor = Col.White; V肌.Frame1.PenColor = Col.White; V肌.Knob.PenColor = Col.White; V肌.Knob.HitColor = Med.GetUniqueColor(); - Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H髪.Gauge.PenColor = Col.White; H髪.Frame1.PenColor = Col.White; H髪.Knob.PenColor = Col.White; H髪.Knob.HitColor = Med.GetUniqueColor(); - Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S髪.Gauge.PenColor = Col.White; S髪.Frame1.PenColor = Col.White; S髪.Knob.PenColor = Col.White; S髪.Knob.HitColor = Med.GetUniqueColor(); - Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V髪.Gauge.PenColor = Col.White; V髪.Frame1.PenColor = Col.White; V髪.Knob.PenColor = Col.White; V髪.Knob.HitColor = Med.GetUniqueColor(); - Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H瞳.Gauge.PenColor = Col.White; H瞳.Frame1.PenColor = Col.White; H瞳.Knob.PenColor = Col.White; H瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S瞳.Gauge.PenColor = Col.White; S瞳.Frame1.PenColor = Col.White; S瞳.Knob.PenColor = Col.White; S瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V瞳.Gauge.PenColor = Col.White; V瞳.Frame1.PenColor = Col.White; V瞳.Knob.PenColor = Col.White; V瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 身長.Gauge.PenColor = Col.White; 身長.Frame1.PenColor = Col.White; 身長.Knob.PenColor = Col.White; 身長.Knob.HitColor = Med.GetUniqueColor(); - Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 体重.Gauge.PenColor = Col.White; 体重.Frame1.PenColor = Col.White; 体重.Knob.PenColor = Col.White; @@ -5850,12 +5850,12 @@ namespace SlaveMatrix ls["ラベル14"].Text = "H:" + $"{身長.Value:0.00}"; ls["ラベル15"].Text = "W:" + $"{体重.Value:0.00}"; }; - PlayerInformationSliders = delegate(Are a, FPS FPS) + PlayerInformationSliders = delegate(RenderArea a, FPS FPS) { Med.GH.Clear(Col.Transparent); - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ls.Draw(a); @@ -5947,11 +5947,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - DrawOP0 = delegate(Are a, FPS FPS) + DrawOP0 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); dbs.Draw(a); @@ -6212,7 +6212,7 @@ namespace SlaveMatrix Viola.両目_見つめ(); Viola.Set基本姿勢(); }; - DrawOP1 = delegate(Are a, FPS FPS) + DrawOP1 = delegate(RenderArea a, FPS FPS) { a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -6365,11 +6365,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 説明描画 = delegate(Are a, FPS FPS) + 説明描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); Viola.Draw(a, FPS); @@ -6672,11 +6672,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 初事務所描画 = delegate(Are a, FPS FPS) + 初事務所描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -6780,11 +6780,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 返済イベント描画 = delegate(Are a, FPS FPS) + 返済イベント描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs index dcb60fe..1b160d8 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs @@ -11,7 +11,7 @@ namespace SlaveMatrix private List del = new List(); - public void Sound(Are Are, Vector2D p, string s, Font f, Color c, double d, bool b) + public void Sound(RenderArea Are, Vector2D p, string s, Font f, Color c, double d, bool b) { ParT pt = new ParT { @@ -26,11 +26,11 @@ namespace SlaveMatrix Brush = null, Hit = false }; - pt.SetStringRectOutline(Are.Unit, Are.GD); + pt.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); pt.BasePointBase = pt.OP.GetCenter(); Mot mot = new Mot(0.0, 1.0); string n = mot.GetHashCode().ToString(); - TextRenderingHint tr = Are.GD.TextRenderingHint; + TextRenderingHint tr = Are.DisplayGraphics.TextRenderingHint; mot.BaseSpeed = 0.1; mot.Runing = delegate(Mot m) { @@ -39,9 +39,9 @@ namespace SlaveMatrix pt.PositionCont = Oth.GetRandomVector() * 0.0025 * d; } pt.TextColor = Color.FromArgb((int)((double)(int)pt.TextColor.A * m.Value.Inverse()), pt.TextColor); - Are.GD.TextRenderingHint = TextRenderingHint.AntiAlias; + Are.DisplayGraphics.TextRenderingHint = TextRenderingHint.AntiAlias; Are.Draw(pt); - Are.GD.TextRenderingHint = tr; + Are.DisplayGraphics.TextRenderingHint = tr; }; mot.Reaing = delegate(Mot m) { @@ -49,7 +49,7 @@ namespace SlaveMatrix }; mot.Ending = delegate { - Are.GD.TextRenderingHint = tr; + Are.DisplayGraphics.TextRenderingHint = tr; pt.Dispose(); del.Add(n); }; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index c1ee381..cfd323b 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -759,7 +759,7 @@ namespace SlaveMatrix } } - public static void 描画0(this IEnumerable es, Are Are) + public static void 描画0(this IEnumerable es, RenderArea Are) { foreach (Ele e in es) { @@ -767,7 +767,7 @@ namespace SlaveMatrix } } - public static void 描画1(this IEnumerable es, Are Are) + public static void 描画1(this IEnumerable es, RenderArea Are) { foreach (Ele e in es) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index c481fc3..29f0eda 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -17,8 +17,8 @@ namespace SlaveMatrix public Med Med; - public Are Are; - private Are Film; + public RenderArea Are; + private RenderArea Film; public Cha Cha; @@ -146,7 +146,7 @@ namespace SlaveMatrix //moan queue :skull: public Onomatopoeia 擬音; - public Queue> 擬音キュー = new Queue>(); + public Queue> 擬音キュー = new Queue>(); //animation queue? public List<挿入処理> SubFocus = new List<挿入処理>(); @@ -391,7 +391,7 @@ namespace SlaveMatrix public void 発音(Vector2D p, string s, Color c, double d, bool b) { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, p, s, new Font("MS Gothic", 1f), c, d, b); }); @@ -399,7 +399,7 @@ namespace SlaveMatrix public void 潮吹() { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, Bod.尿道位置.GetAreaPoint(0.04), Sta.潮吹.GetVal(Player.変化V_潮吹, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Azure, 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_潮吹, b: true); }); @@ -409,7 +409,7 @@ namespace SlaveMatrix { if (CP.GetFlag(0.1 + 0.1 * Player.変化V_放尿 * 0.8)) { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, Bod.尿道位置.GetAreaPoint(0.04), Sta.放尿.GetVal(Player.変化V_放尿, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Col.Black, 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_放尿, b: true); }); @@ -2038,14 +2038,14 @@ namespace SlaveMatrix PlayerStamina.Leave(); } - public TrainingUI(Med Med, Are Are, InfoPanel ip) + public TrainingUI(Med Med, RenderArea Are, InfoPanel ip) { TrainingUI 調教UI2 = this; try { this.Med = Med; this.Are = Are; - double disUnit = Are.DisUnit; + double disUnit = Are.DisplayUnitScale; this.ip = ip; ペニスCM = new CM(Med, this, ペニス = new ペニス(disUnit, 配色指定.N0, Sta.GameData.配色, Med, new ペニスD { @@ -2164,7 +2164,7 @@ namespace SlaveMatrix parT.SizeBase = 0.095; parT.Font = new Font("MS Gothic", 1f); parT.FontSize = 0.07; - parT.SetStringRectOutline(Are.Unit, Are.GD); + parT.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT.RectSize = new Vector2D(parT.OP[0].ps[1].X, parT.OP[0].ps[2].Y); parT.OP.ScalingY(parT.BasePointBase, 0.9); parT.Closed = true; @@ -2182,7 +2182,7 @@ namespace SlaveMatrix parT2.SizeBase = 0.095; parT2.Font = new Font("MS Gothic", 1f); parT2.FontSize = 0.07; - parT2.SetStringRectOutline(Are.Unit, Are.GD); + parT2.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT2.RectSize = new Vector2D(parT2.OP[0].ps[1].X, parT2.OP[0].ps[2].Y); parT2.OP.ScalingY(parT2.BasePointBase, 0.9); parT2.Closed = true; @@ -2214,7 +2214,7 @@ namespace SlaveMatrix parT3.SizeBase = 0.095; parT3.Font = new Font("MS Gothic", 1f); parT3.FontSize = 0.07; - parT3.SetStringRectOutline(Are.Unit, Are.GD); + parT3.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT3.RectSize = new Vector2D(parT3.OP[0].ps[1].X, parT3.OP[0].ps[2].Y); parT3.OP.ScalingY(parT3.BasePointBase, 0.9); parT3.Closed = true; @@ -2237,7 +2237,7 @@ namespace SlaveMatrix parT4.SizeBase = 0.095; parT4.Font = new Font("MS Gothic", 1f); parT4.FontSize = 0.07; - parT4.SetStringRectOutline(Are.Unit, Are.GD); + parT4.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT4.RectSize = new Vector2D(parT4.OP[0].ps[1].X, parT4.OP[0].ps[2].Y); parT4.OP.ScalingY(parT4.BasePointBase, 0.9); parT4.Closed = true; @@ -2260,7 +2260,7 @@ namespace SlaveMatrix parT5.SizeBase = 0.095; parT5.Font = new Font("MS Gothic", 1f); parT5.FontSize = 0.07; - parT5.SetStringRectOutline(Are.Unit, Are.GD); + parT5.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT5.RectSize = new Vector2D(parT5.OP[0].ps[1].X, parT5.OP[0].ps[2].Y); parT5.OP.ScalingY(parT5.BasePointBase, 0.9); parT5.Closed = true; @@ -2366,7 +2366,7 @@ namespace SlaveMatrix parT6.SizeBase = 0.095; parT6.Font = new Font("MS Gothic", 1f); parT6.FontSize = 0.07; - parT6.SetStringRectOutline(Are.Unit, Are.GD); + parT6.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT6.RectSize = new Vector2D(parT6.OP[0].ps[1].X, parT6.OP[0].ps[2].Y); parT6.OP.ScalingY(parT6.BasePointBase, 0.9); parT6.Closed = true; @@ -2401,7 +2401,7 @@ namespace SlaveMatrix parT7.SizeBase = 0.095; parT7.Font = new Font("MS Gothic", 1f); parT7.FontSize = 0.07; - parT7.SetStringRectOutline(Are.Unit, Are.GD); + parT7.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT7.RectSize = new Vector2D(parT7.OP[0].ps[1].X, parT7.OP[0].ps[2].Y); parT7.OP.ScalingY(parT7.BasePointBase, 0.9); parT7.Closed = true; @@ -2413,7 +2413,7 @@ namespace SlaveMatrix parT7.StringFormat.LineAlignment = StringAlignment.Center; parT7.PositionBase = parT6.PositionBase.AddY(0.015); string Path = "Photo"; - Film = new Are(Med, Hit: false); + Film = new RenderArea(Med, Hit: false); 撮影 = new But1(parT7, delegate { //Sounds.撮影.Play(); @@ -2434,13 +2434,13 @@ namespace SlaveMatrix } try { - 調教UI2.Film.GD.DrawString("Slave Matrix " + now.ToShortDateString().Replace("/", "."), font, Brushes.Coral, x, y); + 調教UI2.Film.DisplayGraphics.DrawString("Slave Matrix " + now.ToShortDateString().Replace("/", "."), font, Brushes.Coral, x, y); } finally { ((IDisposable)font)?.Dispose(); } - 調教UI2.Film.Dis.Save(Path + "\\" + now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png", ImageFormat.Png); + 調教UI2.Film.DisplayLayer.Save(Path + "\\" + now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png", ImageFormat.Png); ip.SubInfoIm = GameText.撮影しました + "\r\n" + GameText.写真はPhotoフォルダに保存されます; if (Sta.GameData.TrainingTarget.Trained && !調教UI2.Cha.Bod.Is拘束 && 調教UI2.Cha.Bod.Is腕人 && !Sta.GameData.TrainingTarget.ChaD.撮影ピース経験) { @@ -2782,7 +2782,7 @@ namespace SlaveMatrix 擬音.Clear(); } - public void 描画糸(Are Are) + public void 描画糸(RenderArea Are) { foreach (挿入処理 item in SubFocus) { @@ -2793,7 +2793,7 @@ namespace SlaveMatrix } } - public void 描画肛(Are Are) + public void 描画肛(RenderArea Are) { if (膣i肛f) { @@ -2829,7 +2829,7 @@ namespace SlaveMatrix } } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { foreach (挿入処理 item in SubFocus) { @@ -2848,7 +2848,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { if (ハンド挿入.Is膣) { @@ -2867,7 +2867,7 @@ namespace SlaveMatrix } } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { if (射精.表示) { @@ -2915,7 +2915,7 @@ namespace SlaveMatrix } } - public void StaDraw(Are Are, FPS FPS) + public void StaDraw(RenderArea Are, FPS FPS) { Player.表示ステート更新(); Player.ModBox(); @@ -2975,7 +2975,7 @@ namespace SlaveMatrix } } - public void DrawState(Are Are) + public void DrawState(RenderArea Are) { Player.表示ステート更新(); Player.ModBox(); @@ -3058,7 +3058,7 @@ namespace SlaveMatrix SensitivityBox = new Tex("Sens", new Vector2D(num + 0.02, 0.08), 0.1, 0.6, 1.99, new Font("MS Gothic", 1f), 0.057, 0, "", Col.White, Col.Transparent, Color.FromArgb(5, Col.DarkMagenta), 100.0); } - public void StaminaButtons(Are Are, Med Med, InfoPanel ip) + public void StaminaButtons(RenderArea Are, Med Med, InfoPanel ip) { double x = 0.08; double y = 0.1; @@ -3072,7 +3072,7 @@ namespace SlaveMatrix parT.SizeBase = 0.095; parT.Font = new Font("MS Gothic", 1f); parT.FontSize = 0.07; - parT.SetStringRectOutline(Are.Unit, Are.GD); + parT.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT.RectSize = new Vector2D(parT.OP[0].ps[1].X, parT.OP[0].ps[2].Y); parT.OP.ScalingY(parT.BasePointBase, 0.9); parT.Closed = true; @@ -3094,7 +3094,7 @@ namespace SlaveMatrix parT2.SizeBase = 0.095; parT2.Font = new Font("MS Gothic", 1f); parT2.FontSize = 0.07; - parT2.SetStringRectOutline(Are.Unit, Are.GD); + parT2.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT2.RectSize = new Vector2D(parT2.OP[0].ps[1].X, parT2.OP[0].ps[2].Y); parT2.OP.ScalingY(parT2.BasePointBase, 0.9); parT2.Closed = true; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs index fa35748..0d9a556 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs @@ -563,7 +563,7 @@ namespace SlaveMatrix Muscular = ChaD.body_tree.筋肉; } - public void SetViola(Med Med, Are Are) + public void SetViola(Med Med, RenderArea Are) { 階層位置 = 0; RoomNumber = 0;