REDCODE/SlaveMatrix-SDL
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/rename-torso-class' of https://github.com/Avebluha/SlaveMatrixDecomp into dev

Browse Source
This commit is contained in:
AbdulmanovAI
2025-11-06 09:04:47 +04:00
parent 997b3caafa 8e015aa5c9
commit ac9201328e
675 changed files with 2802 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
2DGAMELIB/_2DGAMELIB/But.cs
View File

@@ -117,7 +117,7 @@ namespace _2DGAMELIB
}
}
public void SetHitColor(Med Med)
public void SetHitColor(ModeEventDispatcher Med)
{
foreach (Par item in pars.EnumAllPar())
{

2
2DGAMELIB/_2DGAMELIB/Buts.cs
View File

@@ -49,7 +49,7 @@ namespace _2DGAMELIB
}
}
public void SetHitColor(Med Med)
public void SetHitColor(ModeEventDispatcher Med)
{
foreach (But item in EnumBut)
{

2
2DGAMELIB/_2DGAMELIB/Lab.cs
View File

@@ -84,7 +84,7 @@ namespace _2DGAMELIB
SetText(Text);
}
public void SetHitColor(Med Med)
public void SetHitColor(ModeEventDispatcher Med)
{
if (parT.HitColor != Color.Transparent)
{

4
2DGAMELIB/_2DGAMELIB/Labs.cs
View File

@@ -7,13 +7,13 @@ namespace _2DGAMELIB
{
private OrderedDictionary<string, Lab> labs = new OrderedDictionary<string, Lab>();
private Med Med;
private ModeEventDispatcher Med;
private RenderArea Are;
public Lab this[string Name] => labs[Name];
public Labs(Med Med, RenderArea Are)
public Labs(ModeEventDispatcher Med, RenderArea Are)
{
this.Med = Med;
this.Are = Are;

77
2DGAMELIB/_2DGAMELIB/Med.cs → 2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs
View File

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
namespace _2DGAMELIB
{
public class Med
public class ModeEventDispatcher
{
private GlImage baseControl;
@@ -23,11 +23,11 @@ namespace _2DGAMELIB
public Rectangle Base = new Rectangle(4.0, 3.0, 0.4);
public Bitmap Dis;
public Graphics GD;
public Bitmap Display;
public Graphics DisplayGraphics;
public Bitmap Hit;
public Graphics GH;
public Graphics HitGraphics;
public Sce Sce;
public FPS FPSF = new FPS(60.0);
@@ -41,7 +41,7 @@ namespace _2DGAMELIB
public string Modeb;
private Dictionary<string, Module> Modes;
private Func<Med, Dictionary<string, Module>> GetModes;
private Func<ModeEventDispatcher, Dictionary<string, Module>> GetModes;
public HashSet<Color> HitColors = new HashSet<Color>
{
@@ -78,31 +78,21 @@ namespace _2DGAMELIB
baseControl.SetCursorPoint(FromBasePosition(value));
}
}
public Med()
public ModeEventDispatcher()
{
}
public void FadeIn(double Rate)
{
Sce.TransformAlpha(GD, Rate);
Sce.TransformAlpha(DisplayGraphics, Rate);
}
public void FadeOut(double Rate)
{
Sce.TransD(GD, Rate);
Sce.TransD(DisplayGraphics, Rate);
}
public void InitializeModes(string Mode, Func<Med, Dictionary<string, Module>> GetModes)
public void InitializeModes(string Mode, Func<ModeEventDispatcher, Dictionary<string, Module>> GetModes)
{
mode = Mode;
this.GetModes = GetModes;
@@ -112,22 +102,22 @@ namespace _2DGAMELIB
{
baseControl = BaseControl;
BaseSize = new Size((int)(Base.LocalWidth * Unit), (int)(Base.LocalHeight * Unit));
Dis = new Bitmap(BaseSize.Width, BaseSize.Height);
GD = Graphics.FromImage(Dis);
Display = new Bitmap(BaseSize.Width, BaseSize.Height);
DisplayGraphics = Graphics.FromImage(Display);
//GD.InterpolationMode = InterpolationMode.HighQualityBilinear;
GD.SmoothingMode = SmoothingMode.None;
GD.PixelOffsetMode = PixelOffsetMode.HighSpeed;
GD.InterpolationMode = InterpolationMode.NearestNeighbor;
DisplayGraphics.SmoothingMode = SmoothingMode.None;
DisplayGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed;
DisplayGraphics.InterpolationMode = InterpolationMode.NearestNeighbor;
//needed for text or smthn
GD.CompositingMode = CompositingMode.SourceOver;
DisplayGraphics.CompositingMode = CompositingMode.SourceOver;
Hit = new Bitmap((int)((double)BaseSize.Width * HitAccuracy), (int)((double)BaseSize.Height * HitAccuracy));
GH = Graphics.FromImage(Hit);
Hit = new Bitmap((int)(BaseSize.Width * HitAccuracy), (int)(BaseSize.Height * HitAccuracy));
HitGraphics = Graphics.FromImage(Hit);
//GH.InterpolationMode = InterpolationMode.Bilinear;
GH.SmoothingMode = SmoothingMode.None;
GH.PixelOffsetMode = PixelOffsetMode.HighSpeed;
GH.InterpolationMode = InterpolationMode.NearestNeighbor;
GH.CompositingMode = CompositingMode.SourceOver;
HitGraphics.SmoothingMode = SmoothingMode.None;
HitGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed;
HitGraphics.InterpolationMode = InterpolationMode.NearestNeighbor;
HitGraphics.CompositingMode = CompositingMode.SourceOver;
WidthM = Hit.Width - 1;
HeightM = Hit.Height - 1;
@@ -230,8 +220,6 @@ namespace _2DGAMELIB
return BaseSize;
}
public Vector2D ToBasePosition(Vector2D Position)
{
return new Vector2D(((double)Position.X - resVector.X) / Unit * resMag, ((double)Position.Y - resVector.Y) / Unit * resMag);
@@ -288,12 +276,9 @@ namespace _2DGAMELIB
return Hit.GetPixel(point.X, point.Y);
}
public void Drawing()
{
baseControl.BitmapSetting(Dis);
baseControl.BitmapSetting(Display);
baseControl.SetTitle(UITitle);
Modes[mode].Setting();
@@ -312,7 +297,7 @@ namespace _2DGAMELIB
//DEBUG shows the hit lut
//GD.DrawImage(Hit, new Point(0, 0));
baseControl.SetBitmap(Dis);
baseControl.SetBitmap(Display);
};
@@ -323,27 +308,25 @@ namespace _2DGAMELIB
}
}
public void Draw(RenderArea Are)
{
//Note: this is terribly slow...
//would be better to not copy the entire frame
Are.DrawTo(GD, GH);
Are.DrawTo(DisplayGraphics, HitGraphics);
}
//TODO fix?
public void CursorHide()
{
//TODO fix?
}
//TODO fix?
Glfw.SetInputMode(baseControl.window, InputMode.Cursor, (int)CursorMode.Hidden);
}
public void CursorShow()
{
//TODO fix?
}
Glfw.SetInputMode(baseControl.window, InputMode.Cursor, (int)CursorMode.Normal);
}
//hit color stuff
public Color GetUniqueColor()
@@ -410,6 +393,6 @@ namespace _2DGAMELIB
//return result;
}*/
static Med() {}
static ModeEventDispatcher() {}
}
}

20
2DGAMELIB/_2DGAMELIB/ObjExtensions.cs
View File

@@ -15,7 +15,25 @@ namespace _2DGAMELIB
["首"] = "Neck",
["頭"] = "Head",
["後髪0"] = "BackHair0",
["後髪1"] = "BackHair1"
["後髪1"] = "BackHair1",
["横髪"] = "SideHair",
["脚"] = "Leg",
//["腕"] = "Arm"
["肩"] = "Shoulder",
["胸"] = "Chest",
//["乳房"] = "Breast",
//["腹"] = "Abdomen",
//["顔"] = "Face",
//["目"] = "Eye",
//["眉"] = "Eyebrow",
//["瞼"] = "Eyelid",
//["鼻"] = "Nose",
//["口"] = "Mouth",
//["耳"] = "Ear",
//["触覚"] = "Antenna",
//["髪"] = "Hair",
//["基髪"] = "BaseHair",
//["吹出し"] = "SpeechBubble",
};
public static void MigrateKeys(this Obj obj)

2
2DGAMELIB/_2DGAMELIB/RenderArea.cs
View File

@@ -38,7 +38,7 @@ namespace _2DGAMELIB
Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag);
}
public RenderArea(Med Med, bool Hit)
public RenderArea(ModeEventDispatcher Med, bool Hit)
{
if (Hit)
{

2
2DGAMELIB/_2DGAMELIB/Tex.cs
View File

@@ -249,7 +249,7 @@ namespace _2DGAMELIB
pars.Add(feed.Tag, feed);
}
public void SetHitColor(Med Med)
public void SetHitColor(ModeEventDispatcher Med)
{
if (parT.HitColor != Color.Transparent)
{

18
2DGAMELIB/_2DGAMELIB/UI.cs
View File

@@ -1,3 +1,4 @@
using GLFW;
using System;
using System.ComponentModel;
using System.IO;
@@ -7,7 +8,7 @@ namespace _2DGAMELIB
{
public class UI //: Form
{
private Med Med;
private ModeEventDispatcher modeEventDispatcher;
private GlImage wpfImage1;
@@ -17,16 +18,16 @@ namespace _2DGAMELIB
private bool BigWindow;
public UI(Med Med)
public UI(ModeEventDispatcher Med)
{
this.Med = Med;
this.modeEventDispatcher = Med;
InitializeComponent();
}
private void UI_Load(object sender, EventArgs e)
{
//base.ClientSize =
Med.Setting(wpfImage1);
modeEventDispatcher.Setting(wpfImage1);
//base.ClientSize = new Size(1024, 768);
try
{
@@ -53,7 +54,7 @@ namespace _2DGAMELIB
private void UI_FormClosing()
{
Med.Drive = false;
modeEventDispatcher.Drive = false;
}
private void UI_Resize(object sender, EventArgs e)
@@ -107,10 +108,9 @@ namespace _2DGAMELIB
//beauty
this.wpfImage1.Closing = delegate () { UI_FormClosing(); };
//TODO fix?
//base.Load += new System.EventHandler(UI_Load);
UI_Load(null, null);
//TODO fix?
//base.Load += new System.EventHandler(UI_Load);
UI_Load(null, null);
//base.Resize += new System.EventHandler(UI_Resize);
//base.ResumeLayout(false);
}