diff --git a/2DGAMELIB/_2DGAMELIB/Dat.cs b/2DGAMELIB/_2DGAMELIB/DataConsts.cs similarity index 95% rename from 2DGAMELIB/_2DGAMELIB/Dat.cs rename to 2DGAMELIB/_2DGAMELIB/DataConsts.cs index b46fcd9..63d4e35 100644 --- a/2DGAMELIB/_2DGAMELIB/Dat.cs +++ b/2DGAMELIB/_2DGAMELIB/DataConsts.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; namespace _2DGAMELIB { [StructLayout(LayoutKind.Sequential, Size = 1)] - public struct Dat + public struct DataConsts { public static MatrixD MatDZero = new MatrixD(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); diff --git a/2DGAMELIB/_2DGAMELIB/Gau.cs b/2DGAMELIB/_2DGAMELIB/Gau.cs index e23a8a0..c42242c 100644 --- a/2DGAMELIB/_2DGAMELIB/Gau.cs +++ b/2DGAMELIB/_2DGAMELIB/Gau.cs @@ -264,7 +264,7 @@ namespace _2DGAMELIB Open.Bot => frame1.ToGlobal((TL1 + TR1) * 0.5), Open.Rig => frame1.ToGlobal((TL1 + BL1) * 0.5), Open.Lef => frame1.ToGlobal((TR1 + BR1) * 0.5), - _ => Dat.Vec2DZero, + _ => DataConsts.Vec2DZero, }; } @@ -276,7 +276,7 @@ namespace _2DGAMELIB Open.Bot => gauge.ToGlobal((BLG + BRG) * 0.5), Open.Rig => gauge.ToGlobal((TRG + BRG) * 0.5), Open.Lef => gauge.ToGlobal((TLG + BLG) * 0.5), - _ => Dat.Vec2DZero, + _ => DataConsts.Vec2DZero, }; } diff --git a/2DGAMELIB/_2DGAMELIB/Joi.cs b/2DGAMELIB/_2DGAMELIB/Joi.cs index 3ffdbe7..8f88ecb 100644 --- a/2DGAMELIB/_2DGAMELIB/Joi.cs +++ b/2DGAMELIB/_2DGAMELIB/Joi.cs @@ -8,7 +8,7 @@ namespace _2DGAMELIB [Serializable] public class Joi { - public Vector2D Joint = Dat.Vec2DZero; + public Vector2D Joint = DataConsts.Vec2DZero; public Joi(Joi Joi) { diff --git a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs index 2f13b24..60053de 100644 --- a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs +++ b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs @@ -33,7 +33,7 @@ namespace _2DGAMELIB public FPS FPSF = new FPS(60.0); private Size BaseSize = Size.Empty; - private Vector2D resVector = Dat.Vec2DZero; + private Vector2D resVector = DataConsts.Vec2DZero; public string UITitle; @@ -60,11 +60,11 @@ namespace _2DGAMELIB } set { - Modes[mode].Up(MouseButtons.None, Dat.Vec2DZero, Color.Empty); - Modes[mode].Move(MouseButtons.None, Dat.Vec2DZero, Color.Empty); + Modes[mode].Up(MouseButtons.None, DataConsts.Vec2DZero, Color.Empty); + Modes[mode].Move(MouseButtons.None, DataConsts.Vec2DZero, Color.Empty); Modeb = mode; mode = value; - Modes[mode].Move(MouseButtons.None, Dat.Vec2DZero, Color.Empty); + Modes[mode].Move(MouseButtons.None, DataConsts.Vec2DZero, Color.Empty); Modes[mode].Setting(); } } diff --git a/2DGAMELIB/_2DGAMELIB/Par.cs b/2DGAMELIB/_2DGAMELIB/Par.cs index b4b7739..01ddf07 100644 --- a/2DGAMELIB/_2DGAMELIB/Par.cs +++ b/2DGAMELIB/_2DGAMELIB/Par.cs @@ -33,20 +33,20 @@ namespace _2DGAMELIB protected List jp = new List(); - protected Vector2D basePointBase = Dat.Vec2DZero; + protected Vector2D basePointBase = DataConsts.Vec2DZero; //cont short for contract? - protected Vector2D basePointCont = Dat.Vec2DZero; + protected Vector2D basePointCont = DataConsts.Vec2DZero; - protected Vector2D positionBase = Dat.Vec2DZero; + protected Vector2D positionBase = DataConsts.Vec2DZero; - protected Vector2D positionContO = Dat.Vec2DZero; + protected Vector2D positionContO = DataConsts.Vec2DZero; - protected Vector2D positionCont = Dat.Vec2DZero; + protected Vector2D positionCont = DataConsts.Vec2DZero; protected double positionSize = 1.0; - protected Vector2D positionVector = Dat.Vec2DZero; + protected Vector2D positionVector = DataConsts.Vec2DZero; protected double anglePare; diff --git a/2DGAMELIB/_2DGAMELIB/ParT.cs b/2DGAMELIB/_2DGAMELIB/ParT.cs index e3e4464..f924c4b 100644 --- a/2DGAMELIB/_2DGAMELIB/ParT.cs +++ b/2DGAMELIB/_2DGAMELIB/ParT.cs @@ -28,9 +28,9 @@ namespace _2DGAMELIB [NonSerialized, JsonIgnore] private StringFormat stringformat = new StringFormat(); - private Vector2D positionT = Dat.Vec2DZero; + private Vector2D positionT = DataConsts.Vec2DZero; - private Vector2D rectSize = Dat.Vec2DOne; + private Vector2D rectSize = DataConsts.Vec2DOne; public string Text = ""; @@ -366,7 +366,7 @@ namespace _2DGAMELIB Vector2D[] stringRectPoints = GetStringRectPoints(Unit, Graphics); Out @out = new Out { Tension = 0f }; - Vector2D vector2D = Dat.Vec2DZero - stringRectPoints[0]; + Vector2D vector2D = DataConsts.Vec2DZero - stringRectPoints[0]; double x = 0.05; double num = 0.025; diff --git a/2DGAMELIB/_2DGAMELIB/RenderArea.cs b/2DGAMELIB/_2DGAMELIB/RenderArea.cs index fab287d..8c93079 100644 --- a/2DGAMELIB/_2DGAMELIB/RenderArea.cs +++ b/2DGAMELIB/_2DGAMELIB/RenderArea.cs @@ -23,8 +23,8 @@ namespace _2DGAMELIB protected Size hitBufferSize = System.Drawing.Size.Empty; protected Size displayBufferSize = System.Drawing.Size.Empty; - public Vector2D BasePoint = Dat.Vec2DZero; - public Vector2D Position = Dat.Vec2DZero; + public Vector2D BasePoint = DataConsts.Vec2DZero; + public Vector2D Position = DataConsts.Vec2DZero; public Graphics DisplayGraphics => displayGraphics; public Graphics HitGraphics => hitGraphics; diff --git a/2DGAMELIB/_2DGAMELIB/Shas.cs b/2DGAMELIB/_2DGAMELIB/Shas.cs index 9b067e9..4737d3f 100644 --- a/2DGAMELIB/_2DGAMELIB/Shas.cs +++ b/2DGAMELIB/_2DGAMELIB/Shas.cs @@ -57,7 +57,7 @@ namespace _2DGAMELIB public static Vector2D GetCenter(this IEnumerable Out) { double num = 0.0; - Vector2D vec2DZero = Dat.Vec2DZero; + Vector2D vec2DZero = DataConsts.Vec2DZero; foreach (Out item in Out) { foreach (Vector2D p in item.ps) @@ -72,7 +72,7 @@ namespace _2DGAMELIB public static Vector2D GetCenter(this IEnumerable Joi) { double num = 0.0; - Vector2D vec2DZero = Dat.Vec2DZero; + Vector2D vec2DZero = DataConsts.Vec2DZero; foreach (Joi item in Joi) { vec2DZero += item.Joint; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs index ede0115..c8853e6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs @@ -152,7 +152,7 @@ namespace SlaveMatrix Vector2D vector2D = Are.GetPosition(0.2, 1.0 - num4 * num2 / Are.LocalHeight).AddY(0.0 - num); double y = 1.01; MaiB = new Par(); - MaiB.BasePointBase = Dat.Vec2DZero; + MaiB.BasePointBase = DataConsts.Vec2DZero; MaiB.PositionBase = vector2D; MaiB.SizeBase = num2; MaiB.OP.AddRange(new Out[1] { Shas.GetSquare() }); @@ -171,7 +171,7 @@ namespace SlaveMatrix Mai.Feed.OP.OutlineFalse(); double num5 = num4 * 4.53; Mai2B = new Par(); - Mai2B.BasePointBase = Dat.Vec2DZero; + Mai2B.BasePointBase = DataConsts.Vec2DZero; Mai2B.PositionBase = new Vector2D(vector2D.X, 0.01); Mai2B.SizeBase = num2; Mai2B.OP.AddRange(new Out[1] { Shas.GetSquare() }); @@ -191,7 +191,7 @@ namespace SlaveMatrix num3 = Are.LocalWidth * 0.19 / num2; vector2D = Are.GetPosition(1.0 - (num3 * num2 / Are.LocalWidth + 0.005), 1.0 - num4 * num2 / Are.LocalHeight).AddY(0.0 - num); SubB = new Par(); - SubB.BasePointBase = Dat.Vec2DZero; + SubB.BasePointBase = DataConsts.Vec2DZero; SubB.PositionBase = vector2D; SubB.SizeBase = num2; SubB.OP.AddRange(new Out[1] { Shas.GetSquare() }); @@ -207,7 +207,7 @@ namespace SlaveMatrix SubInnfo_l = new Lab(Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", Col.White, Col.Black, Color.FromArgb(160, Col.Black), Col.Empty); SubInnfo_l.ParT.PositionBase = SubInnfo_l.ParT.PositionBase.AddY((0.0 - SubInnfo_l.ParT.OP[0].ps[3].Y) * SubInnfo_l.ParT.SizeBase); Sub2B = new Par(); - Sub2B.BasePointBase = Dat.Vec2DZero; + Sub2B.BasePointBase = DataConsts.Vec2DZero; Sub2B.PositionBase = new Vector2D(0.0025, vector2D.Y); Sub2B.SizeBase = num2; Sub2B.OP.AddRange(new Out[1] { Shas.GetSquare() }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs index 4029916..8a3dab9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs @@ -50,10 +50,10 @@ namespace SlaveMatrix 吹出し.X0Y0_吹出しCP.Setting(); double num = 1.35; double num2 = 0.75; - 吹出し.位置C = Dat.Vec2DUnitY * 0.005; + 吹出し.位置C = DataConsts.Vec2DUnitY * 0.005; 吹出し.尺度B = num * 1.1; 吹出し.尺度YB = num2; - Tex = new Tex("Tex", Dat.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed, FeedColor, Action); + Tex = new Tex("Tex", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed, FeedColor, Action); Tex.Feed.OP.OutlineFalse(); Tex.ParT.BasePointBase = Tex.ParT.OP.GetCenter().AddY(0.04); this.Dis = Dis; @@ -110,10 +110,10 @@ namespace SlaveMatrix 吹出し.X0Y0_吹出しCP.Setting(); double num = 1.35; double num2 = 0.75; - 吹出し.位置C = Dat.Vec2DUnitY * 0.005; + 吹出し.位置C = DataConsts.Vec2DUnitY * 0.005; 吹出し.尺度B = num * 1.1; 吹出し.尺度YB = num2; - Tex = new Tex("Tex", Dat.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed); + Tex = new Tex("Tex", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed); Tex.ParT.BasePointBase = Tex.ParT.OP.GetCenter().AddY(0.04); this.Dis = Dis; if (Dis) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index e9abad3..edbce91 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix キャップ中_ = value; if (!キャップ中_) { - Bod.キャップ1.位置C = Dat.Vec2DZero; + Bod.キャップ1.位置C = DataConsts.Vec2DZero; } if (キャップ中_ || キャップ左_ || キャップ右_) { @@ -91,7 +91,7 @@ namespace SlaveMatrix キャップ左_ = value; if (!キャップ左_) { - Bod.キャップ1.位置C = Dat.Vec2DZero; + Bod.キャップ1.位置C = DataConsts.Vec2DZero; } if (キャップ中_ || キャップ左_ || キャップ右_) { @@ -115,7 +115,7 @@ namespace SlaveMatrix キャップ右_ = value; if (!キャップ右_) { - Bod.キャップ1.位置C = Dat.Vec2DZero; + Bod.キャップ1.位置C = DataConsts.Vec2DZero; } if (キャップ中_ || キャップ左_ || キャップ右_) { @@ -604,7 +604,7 @@ namespace SlaveMatrix 調教UI.キャップ2CM = キャップ2; 調教UI.キャップ3CM = キャップ3; double d = 0.0005; - Vector2D p = Dat.Vec2DZero; + Vector2D p = DataConsts.Vec2DZero; キャップ振動 = new Motion(-1.0, 1.0) { BaseSpeed = double.MaxValue, @@ -650,9 +650,9 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - キャップ処理2.Bod.キャップ2左.位置C = Dat.Vec2DZero; - キャップ処理2.Bod.キャップ2右.位置C = Dat.Vec2DZero; - キャップ処理2.Bod.キャップ1.位置C = Dat.Vec2DZero; + キャップ処理2.Bod.キャップ2左.位置C = DataConsts.Vec2DZero; + キャップ処理2.Bod.キャップ2右.位置C = DataConsts.Vec2DZero; + キャップ処理2.Bod.キャップ1.位置C = DataConsts.Vec2DZero; } }; 調教UI.Mots.Add(キャップ振動.GetHashCode().ToString(), キャップ振動); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index d52fddf..85aef65 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs @@ -202,7 +202,7 @@ namespace SlaveMatrix Is核捏ね = true; 箇所 = cd.c; Vector2D 陰核位置 = Bod.陰核位置; - Vector2D 位置B = 陰核位置 + Dat.Vec2DUnitY * 0.0015; + Vector2D 位置B = 陰核位置 + DataConsts.Vec2DUnitY * 0.0015; 調教UI.ハンド右.位置B = 位置B; Addvl(ref 陰核位置); 核捏ね初 = true; @@ -220,7 +220,7 @@ namespace SlaveMatrix vl.Clear(); 調教UI.ハンド右.Yi = 0; 調教UI.ハンド右.角度C = 0.0; - Bod.ピアス.位置C = Dat.Vec2DZero; + Bod.ピアス.位置C = DataConsts.Vec2DZero; if (Med.Mode == "Training") { //~~TODO~~ fix? @@ -339,7 +339,7 @@ namespace SlaveMatrix private void 乳捏ね(ref Vector2D cp) { - double num = (調教UI.ハンド右.位置B - GetCenter()).Angle02π(Dat.Vec2DUnitY).ToDegree(); + double num = (調教UI.ハンド右.位置B - GetCenter()).Angle02π(DataConsts.Vec2DUnitY).ToDegree(); if (!double.IsNaN(num)) { Bod.乳房右.Yi = (int)((360.0 - num) / u); @@ -361,8 +361,8 @@ namespace SlaveMatrix { double num = (o.X - v.X) * 0.008; Vector2D 陰核位置 = Bod.陰核位置; - Vector2D coord = 陰核位置 + Dat.Vec2DUnitY * 0.0015; - double num2 = Dat.Vec2DUnitY.Angle02π(調教UI.ハンド右.位置B - GetCenter()); + Vector2D coord = 陰核位置 + DataConsts.Vec2DUnitY * 0.0015; + double num2 = DataConsts.Vec2DUnitY.Angle02π(調教UI.ハンド右.位置B - GetCenter()); if (!double.IsNaN(num2)) { 調教UI.ハンド右.位置B = coord.TransformCoordinateBP(陰核位置, num2.RotationZ()); @@ -400,7 +400,7 @@ namespace SlaveMatrix private Vector2D GetCenter() { - vs = Dat.Vec2DZero; + vs = DataConsts.Vec2DZero; foreach (Vector2D item in vl) { vs += item; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 76e64c8..4ad3352 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix private Vector2D o; - private Vector2D vc = Dat.Vec2DZero; + private Vector2D vc = DataConsts.Vec2DZero; private ContactType 挿入箇所; @@ -130,7 +130,7 @@ namespace SlaveMatrix 調教UI.Set持ち手(); 調教UI.ハンド右.位置B = 調教UI.ハンド右CM.bp; 調教UI.ハンド右.Intensity = 0.5; - 調教UI.ハンド右.位置C = Dat.Vec2DZero; + 調教UI.ハンド右.位置C = DataConsts.Vec2DZero; 調教UI.放し(); } 調教UI.ハンド右.Intensity = 1.0; @@ -489,11 +489,11 @@ namespace SlaveMatrix 調教UI.ハンド処理.バスト初期化.Start(); - vc = Dat.Vec2DZero; + vc = DataConsts.Vec2DZero; Bod.胸毛_人.位置C = vc; 調教UI.ハンド左表示 = false; - 調教UI.ハンド右.位置C = Dat.Vec2DZero; - 調教UI.ハンド左.位置C = Dat.Vec2DZero; + 調教UI.ハンド右.位置C = DataConsts.Vec2DZero; + 調教UI.ハンド左.位置C = DataConsts.Vec2DZero; 対象.Ele.角度C = 0.0; 持ち手 = false; Isパイズリ = false; @@ -573,7 +573,7 @@ namespace SlaveMatrix { m.ResetValue(); ペニス処理2.対象.Ele.Yi = 0; - ペニス処理2.対象.Ele.位置C = Dat.Vec2DZero; + ペニス処理2.対象.Ele.位置C = DataConsts.Vec2DZero; } }; 調教UI.Mots.Add(チンピク.GetHashCode().ToString(), チンピク); @@ -640,8 +640,8 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { ペニス処理2.対象.Ele.尺度XC = 1.0; - 調教UI.ペニス.位置C = Dat.Vec2DZero; - 調教UI.射精.位置C = Dat.Vec2DZero; + 調教UI.ペニス.位置C = DataConsts.Vec2DZero; + 調教UI.射精.位置C = DataConsts.Vec2DZero; m.ResetValue(); } }; @@ -816,7 +816,7 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(手コキ.GetHashCode().ToString(), 手コキ); - _ = Dat.Vec2DZero; + _ = DataConsts.Vec2DZero; s = 0.0; double t; double d1; @@ -868,7 +868,7 @@ namespace SlaveMatrix 調教UI.Mots.Add(フェラ.GetHashCode().ToString(), フェラ); s = 0.0; LowerArmXC = 0.0; - Vector2D vc = Dat.Vec2DZero; + Vector2D vc = DataConsts.Vec2DZero; bool sb = false; double vl; double vr; @@ -883,7 +883,7 @@ namespace SlaveMatrix { LowerArmXC = ペニス処理2.LowerArm左.尺度XC; } - vc = Dat.Vec2DZero; + vc = DataConsts.Vec2DZero; sb = RNG.XS.NextBool(); s = (sb ? (-1.0) : 1.0); 調教UI.Action(ContactType.Chest, ActionType.パイ, CurrentState.Start, ToolType.Penis, 0, 1, 機械: false, 射精: false); @@ -969,7 +969,7 @@ namespace SlaveMatrix ペニス処理2.手固定 = false; 調教UI.ハンド処理.バスト初期化.Start(); ペニス処理2.Bod.胸毛_人.角度C = 0.0; - ペニス処理2.Bod.胸毛_人.位置C = Dat.Vec2DZero; + ペニス処理2.Bod.胸毛_人.位置C = DataConsts.Vec2DZero; if (ペニス処理2.肩左 != null) { ペニス処理2.肩左.角度C = 0.0; @@ -1156,7 +1156,7 @@ namespace SlaveMatrix d = 0.0; v = default(Vector2D); o = default(Vector2D); - vc = Dat.Vec2DZero; + vc = DataConsts.Vec2DZero; 挿入箇所 = ContactType.none; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index 6d7535a..91cd5ad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -412,8 +412,8 @@ namespace SlaveMatrix { m.ResetValue(); マウス処理2.対象.Ele.尺度C = 1.0; - マウス処理2.対象.Ele.位置C = Dat.Vec2DZero; - 調教UI.マウス.X2Y0_舌.PositionCont = Dat.Vec2DZero; + マウス処理2.対象.Ele.位置C = DataConsts.Vec2DZero; + 調教UI.マウス.X2Y0_舌.PositionCont = DataConsts.Vec2DZero; } }; 調教UI.Mots.Add(キスモーション.GetHashCode().ToString(), キスモーション); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index f95bdb4..5341dd5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -785,7 +785,7 @@ namespace SlaveMatrix } else { - 位置C = Dat.Vec2DZero; + 位置C = DataConsts.Vec2DZero; } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index 564c73a..5832722 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix { 調教UI.押し(ref cd); v = op - cp; - a = 0.0 - v.Angle02π(-Dat.Vec2DUnitY).ToDegree(); + a = 0.0 - v.Angle02π(-DataConsts.Vec2DUnitY).ToDegree(); if (!double.IsNaN(a)) { 対象.Ele.角度C = a; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs index f27a663..cb6ac22 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs @@ -297,7 +297,7 @@ namespace SlaveMatrix return; } int num = 0; - Vector2D vec2DZero = Dat.Vec2DZero; + Vector2D vec2DZero = DataConsts.Vec2DZero; foreach (Out item in par.OP) { foreach (Vector2D item2 in item.ps.Skip(1).Take(item.ps.Count - 2)) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index a89a7e9..08ae098 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -1502,7 +1502,7 @@ namespace SlaveMatrix { d *= 1.5; } - Vector2D p = Dat.Vec2DZero; + Vector2D p = DataConsts.Vec2DZero; bool f = !(対象.Ele is ロータ); bool v = 対象.Ele is バイブ_ディル || 対象.Ele is バイブ_コモン || 対象.Ele is バイブ_ドリル || 対象.Ele is バイブ_アナル || 対象.Ele is バイブ_デンマ; 振動モーション = new Motion(-1.0, 1.0) @@ -1559,9 +1559,9 @@ namespace SlaveMatrix m.ResetValue(); foreach (Par item in 対象.Ele.Body.EnumAllPar()) { - item.PositionCont = Dat.Vec2DZero; + item.PositionCont = DataConsts.Vec2DZero; } - 挿入処理2.Bod.断面.位置C = Dat.Vec2DZero; + 挿入処理2.Bod.断面.位置C = DataConsts.Vec2DZero; } }; 調教UI.Mots.Add(振動モーション.GetHashCode().ToString(), 振動モーション); @@ -1641,7 +1641,7 @@ namespace SlaveMatrix 対象.使用状態 = UsageStatus.Standby; 対象.Ele.右 = false; 対象.Ele.位置B = 対象.bp; - 対象.Ele.位置C = Dat.Vec2DZero; + 対象.Ele.位置C = DataConsts.Vec2DZero; 対象.Ele.角度B = 0.0; 対象.Ele.角度C = 0.0; 対象.Ele.Xi = 0; @@ -1748,7 +1748,7 @@ namespace SlaveMatrix 対象.使用状態 = UsageStatus.Standby; 対象.Ele.右 = false; 対象.Ele.位置B = 対象.bp; - 対象.Ele.位置C = Dat.Vec2DZero; + 対象.Ele.位置C = DataConsts.Vec2DZero; 対象.Ele.角度B = 0.0; 対象.Ele.角度C = 0.0; 対象.Ele.Xi = 0; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs index 182ba47..54e14b4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs @@ -401,7 +401,7 @@ namespace SlaveMatrix double num2 = X0Y1_飛膜.OP[4].ps[0].DistanceSquared(X0Y1_飛膜.OP[19].ps[2]); Vector2D v = X0Y1_飛膜.OP[11].ps[2] - vector2D9; Vector2D v2 = X0Y1_飛膜.ToLocal(手.X0Y0_人指_指2.Position) - vector2D8; - double num3 = v.Angle02π(Dat.Vec2DUnitY); + double num3 = v.Angle02π(DataConsts.Vec2DUnitY); MatrixD transform = num3.RotationZ(); MatrixD transform2 = (v.Angle02π(v2) - num3).RotationZ(); Vector2D vector2D10 = vector2D8 - vector2D9; @@ -427,7 +427,7 @@ namespace SlaveMatrix num2 = X0Y1_飛膜.OP[20].ps[0].DistanceSquared(X0Y1_飛膜.OP[39].ps[2]); Vector2D v3 = X0Y1_飛膜.OP[29].ps[2] - vector2D9; v2 = X0Y1_飛膜.ToLocal(手.X0Y0_中指_指2.Position) - vector2D8; - num3 = v3.Angle02π(Dat.Vec2DUnitY); + num3 = v3.Angle02π(DataConsts.Vec2DUnitY); transform = num3.RotationZ(); transform2 = (v3.Angle02π(v2) - num3).RotationZ(); vector2D10 = vector2D8 - vector2D9; @@ -535,7 +535,7 @@ namespace SlaveMatrix double num2 = X0Y1_飛膜.OP[38].ps[2].DistanceSquared(X0Y1_飛膜.OP[23].ps[0]); Vector2D v = X0Y1_飛膜.OP[31].ps[0] - vector2D9; Vector2D v2 = X0Y1_飛膜.ToLocal(手.X0Y0_人指_指2.Position) - vector2D8; - double num3 = v.Angle02π(Dat.Vec2DUnitY); + double num3 = v.Angle02π(DataConsts.Vec2DUnitY); MatrixD transform = num3.RotationZ(); MatrixD transform2 = (v.Angle02π(v2) - num3).RotationZ(); Vector2D vector2D10 = vector2D8 - vector2D9; @@ -561,7 +561,7 @@ namespace SlaveMatrix num2 = X0Y1_飛膜.OP[22].ps[2].DistanceSquared(X0Y1_飛膜.OP[3].ps[0]); Vector2D v3 = X0Y1_飛膜.OP[13].ps[0] - vector2D9; v2 = X0Y1_飛膜.ToLocal(手.X0Y0_中指_指2.Position) - vector2D8; - num3 = v3.Angle02π(Dat.Vec2DUnitY); + num3 = v3.Angle02π(DataConsts.Vec2DUnitY); transform = num3.RotationZ(); transform2 = (v3.Angle02π(v2) - num3).RotationZ(); vector2D10 = vector2D8 - vector2D9; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs index be1732b..c42f788 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs @@ -247,7 +247,7 @@ namespace SlaveMatrix Vector2D vector2D5 = (X0Y1_飛膜.OP[2].ps[0] + X0Y1_飛膜.OP[9].ps[2]) * 0.5; Vector2D v2 = X0Y1_飛膜.OP[2].ps[0] - X0Y1_飛膜.OP[9].ps[2]; double num2 = v2.LengthSquared(); - double num3 = v2.Angle02π(Dat.Vec2DUnitX); + double num3 = v2.Angle02π(DataConsts.Vec2DUnitX); QuaternionD rotation = num3.RotationZQ(); QuaternionD rotation2 = (v2.Angle02π(v) - num3).RotationZQ(); double num4 = num / num2; @@ -295,7 +295,7 @@ namespace SlaveMatrix Vector2D vector2D5 = (X0Y1_飛膜.OP[8].ps[2] + X0Y1_飛膜.OP[1].ps[0]) * 0.5; Vector2D v2 = X0Y1_飛膜.OP[8].ps[2] - X0Y1_飛膜.OP[1].ps[0]; double num2 = v2.LengthSquared(); - double num3 = v2.Angle02π(-Dat.Vec2DUnitX); + double num3 = v2.Angle02π(-DataConsts.Vec2DUnitX); QuaternionD rotation = num3.RotationZQ(); QuaternionD rotation2 = (v2.Angle02π(v) - num3).RotationZQ(); double num4 = num / num2; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs index ebe29ba..cece740 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs @@ -1400,19 +1400,19 @@ namespace SlaveMatrix double num = -0.003; if (Is獣) { - 断面_獣.X0Y0_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_獣.X0Y1_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_獣.X0Y2_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_獣.X0Y3_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_獣.X0Y4_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; + 断面_獣.X0Y0_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_獣.X0Y1_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_獣.X0Y2_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_獣.X0Y3_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_獣.X0Y4_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; } else { - 断面_人.X0Y0_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_人.X0Y1_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_人.X0Y2_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_人.X0Y3_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; - 断面_人.X0Y4_子宮.BasePointCont = Dat.Vec2DUnitY * num * 子宮下がり_; + 断面_人.X0Y0_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_人.X0Y1_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_人.X0Y2_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_人.X0Y3_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; + 断面_人.X0Y4_子宮.BasePointCont = DataConsts.Vec2DUnitY * num * 子宮下がり_; } } } @@ -1597,16 +1597,16 @@ namespace SlaveMatrix 性器_人.Body.SizeYCont = 0.65 + Waist.Yv * 0.35; foreach (Par item in 性器_人.Body.EnumJoinRoot) { - item.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.001 + 0.001); + item.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.001 + 0.001); } 肛門_人.Body.SizeYCont = 0.65 + Waist.Yv * 0.35; foreach (Par item2 in 上着B_クロス.Body.EnumJoinRoot) { - item2.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.003); + item2.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.003); } foreach (Par item3 in 上着B_前掛け.Body.EnumJoinRoot) { - item3.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.003); + item3.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.003); } 腰振り_人(); } @@ -1627,16 +1627,16 @@ namespace SlaveMatrix 性器_人.Body.SizeYCont = 0.65 + Waist.Yv * 0.35; foreach (Par item in 性器_人.Body.EnumJoinRoot) { - item.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.001 + 0.001); + item.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.001 + 0.001); } 肛門_人.Body.SizeYCont = 0.65 + Waist.Yv * 0.35; foreach (Par item2 in 上着B_クロス.Body.EnumJoinRoot) { - item2.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.003); + item2.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.003); } foreach (Par item3 in 上着B_前掛け.Body.EnumJoinRoot) { - item3.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * 0.003); + item3.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * 0.003); } 腰振り_人(); } @@ -1655,7 +1655,7 @@ namespace SlaveMatrix 性器_獣.Body.SizeYCont = 0.65 + Waist_獣.Yv * 0.35; foreach (Par item in 性器_獣.Body.EnumJoinRoot) { - item.PositionCont = Dat.Vec2DUnitY * (Waist_獣.Yv * 0.001 + 0.001); + item.PositionCont = DataConsts.Vec2DUnitY * (Waist_獣.Yv * 0.001 + 0.001); } 肛門_獣.Body.SizeYCont = 0.65 + Waist_獣.Yv * 0.35; 腰振り_獣(); @@ -1675,7 +1675,7 @@ namespace SlaveMatrix 性器_獣.Body.SizeYCont = 0.65 + Waist_獣.Yv * 0.35; foreach (Par item in 性器_獣.Body.EnumJoinRoot) { - item.PositionCont = Dat.Vec2DUnitY * (Waist_獣.Yv * 0.001 + 0.001); + item.PositionCont = DataConsts.Vec2DUnitY * (Waist_獣.Yv * 0.001 + 0.001); } 肛門_獣.Body.SizeYCont = 0.65 + Waist_獣.Yv * 0.35; 腰振り_獣(); @@ -5279,8 +5279,8 @@ namespace SlaveMatrix 染み_人 = new 染み_人(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 染み_人D()); 染み_人.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; 染み_人.Intensity = 0.0; - Vector2D positionCont = Dat.Vec2DUnitY * -0.03; - Vector2D positionCont2 = Dat.Vec2DUnitY * 0.03; + Vector2D positionCont = DataConsts.Vec2DUnitY * -0.03; + Vector2D positionCont2 = DataConsts.Vec2DUnitY * 0.03; 染み_人.X0Y0_汗.PositionCont = positionCont; 染み_人.X0Y0_潮1.PositionCont = positionCont2; if (Is獣) @@ -9793,16 +9793,16 @@ namespace SlaveMatrix private void 腰振り_人() { - Torso.X0Y0_筋肉_筋肉左.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * -0.004); - Torso.X0Y0_筋肉_筋肉右.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * -0.004); - 胴腹板_人.X0Y0_虫性_腹板.PositionCont = Dat.Vec2DUnitY * (Waist.Yv * -0.002); + Torso.X0Y0_筋肉_筋肉左.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * -0.004); + Torso.X0Y0_筋肉_筋肉右.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * -0.004); + 胴腹板_人.X0Y0_虫性_腹板.PositionCont = DataConsts.Vec2DUnitY * (Waist.Yv * -0.002); 胴肌_人.Body.SizeYCont = 0.85 + (1.0 - Waist.Yv) * 0.15; } private void 腰振り_獣() { - Torso_獣.X0Y0_筋肉_筋肉左.PositionCont = Dat.Vec2DUnitY * (Waist_獣.Yv * -0.004); - Torso_獣.X0Y0_筋肉_筋肉右.PositionCont = Dat.Vec2DUnitY * (Waist_獣.Yv * -0.004); + Torso_獣.X0Y0_筋肉_筋肉左.PositionCont = DataConsts.Vec2DUnitY * (Waist_獣.Yv * -0.004); + Torso_獣.X0Y0_筋肉_筋肉右.PositionCont = DataConsts.Vec2DUnitY * (Waist_獣.Yv * -0.004); 胴肌_獣.Body.SizeYCont = 0.85 + (1.0 - Waist_獣.Yv) * 0.15; if (EI半中1 != null) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs index 87ce60f..cedf0ac 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs @@ -158,7 +158,7 @@ namespace SlaveMatrix private bool 重腿; - private Vector2D p = Dat.Vec2DZero; + private Vector2D p = DataConsts.Vec2DZero; private delegate void MorphMotion(double value); @@ -350,7 +350,7 @@ namespace SlaveMatrix private void ResetMoveParts() { for (int i = 0; i < _moveParts.Count; i++) - _moveParts[i].EI.Position = Dat.Vec2DZero; + _moveParts[i].EI.Position = DataConsts.Vec2DZero; } private void ApplyContParts(Vector2D offset) { @@ -367,7 +367,7 @@ namespace SlaveMatrix private void ResetContParts() { for (int i = 0; i < _moveParts.Count; i++) - _moveParts[i].EI.PositionCont = Dat.Vec2DZero; + _moveParts[i].EI.PositionCont = DataConsts.Vec2DZero; } public double BreathingSpeed { @@ -1335,7 +1335,7 @@ namespace SlaveMatrix double savedHipValue = 0.0; Par pa = Body.Waist.Body.CurJoinRoot; Par pb = null; - Vector2D vec = Dat.Vec2DZero; + Vector2D vec = DataConsts.Vec2DZero; Action 腰接続 = delegate { pb = cha.Body.Waist.Body.CurJoinRoot; @@ -1382,11 +1382,11 @@ namespace SlaveMatrix OnEnd = delegate { cha.Body.HipMotion_人v = savedHipValue; - cha.Body.Waist.位置C = Dat.Vec2DZero; + cha.Body.Waist.位置C = DataConsts.Vec2DZero; if (!cha.Body.乳房左.着衣) { - cha.Body.乳房左.位置C = Dat.Vec2DZero; - cha.Body.乳房右.位置C = Dat.Vec2DZero; + cha.Body.乳房左.位置C = DataConsts.Vec2DZero; + cha.Body.乳房右.位置C = DataConsts.Vec2DZero; } ResetContParts(); @@ -1541,7 +1541,7 @@ namespace SlaveMatrix } }; Motions.Add(顔面展開.GetHashCode().ToString(), 顔面展開); - Vector2D p_ = Dat.Vec2DZero; + Vector2D p_ = DataConsts.Vec2DZero; double d_; BodySway = new Motion(0.0, 1.0) { @@ -1571,11 +1571,11 @@ namespace SlaveMatrix }, OnEnd = delegate { - cha.Body.Waist.位置C = Dat.Vec2DZero; + cha.Body.Waist.位置C = DataConsts.Vec2DZero; if (!cha.Body.乳房左.着衣) { - cha.Body.乳房左.位置C = Dat.Vec2DZero; - cha.Body.乳房右.位置C = Dat.Vec2DZero; + cha.Body.乳房左.位置C = DataConsts.Vec2DZero; + cha.Body.乳房右.位置C = DataConsts.Vec2DZero; } ResetMoveParts(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs index ca709bf..8fb36ae 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs @@ -20,13 +20,13 @@ namespace SlaveMatrix public bool 拘束; - public Vector2D 基準B = Dat.Vec2DZero; + public Vector2D 基準B = DataConsts.Vec2DZero; - public Vector2D 基準C = Dat.Vec2DZero; + public Vector2D 基準C = DataConsts.Vec2DZero; - public Vector2D 位置B = Dat.Vec2DZero; + public Vector2D 位置B = DataConsts.Vec2DZero; - public Vector2D 位置C = Dat.Vec2DZero; + public Vector2D 位置C = DataConsts.Vec2DZero; public double 角度B; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs index 791a3eb..129306e 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs @@ -6,9 +6,9 @@ namespace SlaveMatrix { public class EleI : IDisposable { - public Vector2D Position = Dat.Vec2DZero; + public Vector2D Position = DataConsts.Vec2DZero; - public Vector2D PositionCont = Dat.Vec2DZero; + public Vector2D PositionCont = DataConsts.Vec2DZero; public RenderArea Lay; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index ad91803..3a845b3 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -223,7 +223,7 @@ namespace SlaveMatrix SaveData = new ListView( DrawBuffer, - Dat.Vec2DZero.AddY(0.0025), + DataConsts.Vec2DZero.AddY(0.0025), 0.25, new Font("MS Gothic", 1f), 0.11, @@ -1676,7 +1676,7 @@ namespace SlaveMatrix }; ContactD cd = default(ContactD); - Vector2D op = Dat.Vec2DZero; + Vector2D op = DataConsts.Vec2DZero; 調教描画 = delegate (RenderArea a, FPS FPS) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs index db13ac7..ce3c8a3 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs @@ -3088,22 +3088,22 @@ namespace SlaveMatrix public static void 眉_下左(this Character Cha) { - Cha.Body.眉左.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.眉左.Body.CurJoinRoot.PositionCont = DataConsts.Vec2DZero; } public static void 眉_下右(this Character Cha) { - Cha.Body.眉右.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.眉右.Body.CurJoinRoot.PositionCont = DataConsts.Vec2DZero; } public static void 眉_上左(this Character Cha) { - Cha.Body.眉左.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.眉左.Body.CurJoinRoot.PositionCont = -DataConsts.Vec2DUnitY * 0.003; } public static void 眉_上右(this Character Cha) { - Cha.Body.眉右.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.眉右.Body.CurJoinRoot.PositionCont = -DataConsts.Vec2DUnitY * 0.003; } public static void 両眉_下(this Character Cha) @@ -3183,12 +3183,12 @@ namespace SlaveMatrix public static void 単眉_下(this Character Cha) { - Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = DataConsts.Vec2DZero; } public static void 単眉_上(this Character Cha) { - Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = -DataConsts.Vec2DUnitY * 0.003; } public static void 単眉_1(this Character c, int i) diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index a8bf0ad..683a78f 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -967,7 +967,7 @@ namespace SlaveMatrix 4 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num5, num5 + num7)), 5 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num4, num5)), 6 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num4, num5)), - _ => Dat.Vec2DZero, + _ => DataConsts.Vec2DZero, }; } @@ -989,7 +989,7 @@ namespace SlaveMatrix 4 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num5, num5 + num7)), 5 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num4, num5)), 6 => new Vector2D(RNG.XS.NextDouble(num3, num3 + num6), RNG.XS.NextDouble(num4, num5)), - _ => Dat.Vec2DZero, + _ => DataConsts.Vec2DZero, }; } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index e4ee289..d13e3f1 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -1057,7 +1057,7 @@ namespace SlaveMatrix focus.Ele.Xi = 0; focus.Ele.Yi = 0; focus.Ele.位置B = focus.bp; - focus.Ele.位置C = Dat.Vec2DZero; + focus.Ele.位置C = DataConsts.Vec2DZero; focus.Ele.角度B = 0.0; focus.Ele.角度C = 0.0; focus.Ele.右 = false; @@ -1074,7 +1074,7 @@ namespace SlaveMatrix if (focus == ペニスCM || focus == マウスCM || focus == ハンド右CM) { 持ち手 = false; - ハンド右.位置C = Dat.Vec2DZero; + ハンド右.位置C = DataConsts.Vec2DZero; ハンド右.角度B = 0.0; ハンド右.角度C = 0.0; ハンド右.Xi = 0; @@ -1083,7 +1083,7 @@ namespace SlaveMatrix return; } 持ち手 = true; - ハンド右.位置C = Dat.Vec2DZero; + ハンド右.位置C = DataConsts.Vec2DZero; ハンド右.角度B = 0.0; ハンド右.角度C = 0.0; if (focus == コモンCM || focus == ディルCM || focus == アナルCM || focus == デンマCM || focus == ドリルCM)