diff --git a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs index eac58cc..74165c0 100644 --- a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs +++ b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs @@ -29,7 +29,7 @@ namespace _2DGAMELIB public Bitmap Hit; public Graphics HitGraphics; - public Sce Sce; + public SceneFader SceneFader; public FPS FPSF = new FPS(60.0); private Size BaseSize = Size.Empty; @@ -84,12 +84,12 @@ namespace _2DGAMELIB public void FadeIn(double Rate) { - Sce.TransformAlpha(DisplayGraphics, Rate); + SceneFader.TransformAlpha(DisplayGraphics, Rate); } public void FadeOut(double Rate) { - Sce.TransD(DisplayGraphics, Rate); + SceneFader.TransD(DisplayGraphics, Rate); } public void InitializeModes(string Mode, Func> GetModes) @@ -121,7 +121,7 @@ namespace _2DGAMELIB WidthM = Hit.Width - 1; HeightM = Hit.Height - 1; - Sce = new Sce(BaseSize.Width, BaseSize.Height); + SceneFader = new SceneFader(BaseSize.Width, BaseSize.Height); Modes = GetModes(this); diff --git a/2DGAMELIB/_2DGAMELIB/Sce.cs b/2DGAMELIB/_2DGAMELIB/SceneFader.cs similarity index 95% rename from 2DGAMELIB/_2DGAMELIB/Sce.cs rename to 2DGAMELIB/_2DGAMELIB/SceneFader.cs index 58eb2bd..4fe0bb8 100644 --- a/2DGAMELIB/_2DGAMELIB/Sce.cs +++ b/2DGAMELIB/_2DGAMELIB/SceneFader.cs @@ -5,7 +5,7 @@ namespace _2DGAMELIB { //Basically used to animate switching between two static images - public class Sce + public class SceneFader { private Bitmap Start; private Graphics GS; @@ -23,7 +23,7 @@ namespace _2DGAMELIB private ImageAttributes ia = new ImageAttributes(); - public Sce(int Width, int Height) + public SceneFader(int Width, int Height) { w = Width; h = Height; diff --git a/2DGAMELIB/_2DGAMELIB/Ser.cs b/2DGAMELIB/_2DGAMELIB/Ser.cs index 9ebdb7b..c152f03 100644 --- a/2DGAMELIB/_2DGAMELIB/Ser.cs +++ b/2DGAMELIB/_2DGAMELIB/Ser.cs @@ -22,7 +22,8 @@ namespace _2DGAMELIB .Add("_2DGAMELIB.Joi", typeof(JointPoint)) .Add("_2DGAMELIB.Dif", typeof(MorphVariant)) .Add("_2DGAMELIB.Difs", typeof(VariantGrid)) - .Add("_2DGAMELIB.Obj", typeof(BodyTemplate)); + .Add("_2DGAMELIB.Obj", typeof(BodyTemplate)) + .Add("_2DGAMELIB.Sce", typeof(SceneFader)); private static BinaryFormatter NewFormatter() { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index 9e6eb9b..39378e0 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -556,8 +556,8 @@ namespace SlaveMatrix { Med.Mode = Mode; 描画(drawArea, Med.FPSF); - Med.Sce.DrawStart(Are); - Med.Sce.DrawEnd(drawArea); + Med.SceneFader.DrawStart(Are); + Med.SceneFader.DrawEnd(drawArea); fade_in = true; } @@ -565,8 +565,8 @@ namespace SlaveMatrix { 調教描画(drawArea, Med.FPSF); Color col = Color.FromArgb(128, Color.White); - Med.Sce.ClearStart(ref col); - Med.Sce.DrawEnd(drawArea); + Med.SceneFader.ClearStart(ref col); + Med.SceneFader.DrawEnd(drawArea); fade_in = true; } @@ -1172,8 +1172,8 @@ namespace SlaveMatrix { DrawBuffer.Clear(Col.Black); DrawBuffer.Draw(label.ShapePartT); - Med.Sce.DrawStart(BlackBackground); - Med.Sce.DrawEnd(DrawBuffer); + Med.SceneFader.DrawStart(BlackBackground); + Med.SceneFader.DrawEnd(DrawBuffer); v = 0.0; fadeIn = true; fadeOut = false; @@ -1218,8 +1218,8 @@ namespace SlaveMatrix mv.ResetValue(); Med.Draw(DrawBuffer); fadeOut = true; - Med.Sce.DrawStart(DrawBuffer); - Med.Sce.DrawEnd(BlackBackground); + Med.SceneFader.DrawStart(DrawBuffer); + Med.SceneFader.DrawEnd(BlackBackground); } } } @@ -1292,8 +1292,8 @@ namespace SlaveMatrix ll = false; DrawBuffer.Clear(Col.Black); DrawBuffer.Draw(label.ShapePartT); - Med.Sce.DrawStart(BlackBackground); - Med.Sce.DrawEnd(DrawBuffer); + Med.SceneFader.DrawStart(BlackBackground); + Med.SceneFader.DrawEnd(DrawBuffer); v = 0.0; b1 = true; mv.ResetValue();