From 7cbdc616b413565720963fa90e538c335e069460 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 3 Sep 2022 22:19:42 +0200 Subject: [PATCH] Removed some unused Properties from the ModelView Control --- PCK-Studio/Classes/Models/Box.cs | 2 +- PCK-Studio/Classes/Models/ModelView.cs | 49 ---------------------- PCK-Studio/Classes/Models/Object3DGroup.cs | 14 +++---- 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/PCK-Studio/Classes/Models/Box.cs b/PCK-Studio/Classes/Models/Box.cs index 40b2b051..23d64a9d 100644 --- a/PCK-Studio/Classes/Models/Box.cs +++ b/PCK-Studio/Classes/Models/Box.cs @@ -39,7 +39,7 @@ namespace PckStudio.Models right.LocalTransformation = a * rightLocalTransformation; } - public Box(Image image, Rectangle srcTopBottom, Rectangle srcSides, Point3D origin, Effects effects) + public Box(Image image, Rectangle srcTopBottom, Rectangle srcSides, Point3D origin, Effects effects = Effects.None) { this.effects = effects; Origin = origin; diff --git a/PCK-Studio/Classes/Models/ModelView.cs b/PCK-Studio/Classes/Models/ModelView.cs index 8b3801bc..28b65eb3 100644 --- a/PCK-Studio/Classes/Models/ModelView.cs +++ b/PCK-Studio/Classes/Models/ModelView.cs @@ -29,35 +29,6 @@ namespace PckStudio.Models private float PiBy180 = 0.0174532924f; - [Browsable(true)] - public event EventHandler SkinDowloadedx - { - add - { - EventHandler eventHandler = SkinDowloaded; - EventHandler eventHandler2; - do - { - eventHandler2 = eventHandler; - EventHandler value2 = (EventHandler)Delegate.Combine(eventHandler2, value); - eventHandler = Interlocked.CompareExchange(ref SkinDowloaded, value2, eventHandler2); - } - while (eventHandler != eventHandler2); - } - remove - { - EventHandler eventHandler = SkinDowloaded; - EventHandler eventHandler2; - do - { - eventHandler2 = eventHandler; - EventHandler value2 = (EventHandler)Delegate.Remove(eventHandler2, value); - eventHandler = Interlocked.CompareExchange(ref SkinDowloaded, value2, eventHandler2); - } - while (eventHandler != eventHandler2); - } - } - protected override void OnBackColorChanged(EventArgs e) { base.OnBackColorChanged(e); @@ -304,26 +275,6 @@ namespace PckStudio.Models return bitmap; } - private System.Drawing.Image RenderText(string text) - { - int num = 0; - using (System.Drawing.Graphics graphics = CreateGraphics()) - { - num = (int)graphics.MeasureString(text, Font).Width; - } - System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap(num + 2, 0x12); - using (System.Drawing.Graphics graphics2 = System.Drawing.Graphics.FromImage(bitmap)) - { - using (System.Drawing.Brush brush = new System.Drawing.SolidBrush(textShadowColor)) - { - graphics2.TextRenderingHint = TextRenderingHint.SingleBitPerPixelGridFit; - graphics2.DrawString(text, Font, brush, 2f, 2f); - graphics2.DrawString(text, Font, System.Drawing.Brushes.White, 0f, 0f); - } - } - return bitmap; - } - private System.Drawing.Image RenderVersionText() { System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap(0x154, 0x12); diff --git a/PCK-Studio/Classes/Models/Object3DGroup.cs b/PCK-Studio/Classes/Models/Object3DGroup.cs index 1612adbd..fc3cd524 100644 --- a/PCK-Studio/Classes/Models/Object3DGroup.cs +++ b/PCK-Studio/Classes/Models/Object3DGroup.cs @@ -10,7 +10,7 @@ namespace PckStudio.Models set { base.Viewport = value; - foreach (Object3D object3D in object3DList) + foreach (Object3D object3D in objects) { object3D.Viewport = value; } @@ -21,7 +21,7 @@ namespace PckStudio.Models { set { - foreach (Object3D object3D in object3DList) + foreach (Object3D object3D in objects) { object3D.Image = value; } @@ -31,16 +31,16 @@ namespace PckStudio.Models internal override void Update() { Matrix3D globalTransformation = this.globalTransformation * localTransformation; - for (int i = 0; i < object3DList.Count; i++) + for (int i = 0; i < objects.Count; i++) { - object3DList[i].GlobalTransformation = globalTransformation; + objects[i].GlobalTransformation = globalTransformation; } } public override float HitTest(System.Drawing.PointF location) { float num = -1000f; - foreach (Object3D object3D in object3DList) + foreach (Object3D object3D in objects) { float num2 = object3D.HitTest(location); if (num2 > num) @@ -57,9 +57,9 @@ namespace PckStudio.Models { throw new ArgumentException("Cannot add Object3D into itself."); } - object3DList.Add(object3D); + objects.Add(object3D); } - private List object3DList = new List(); + private List objects = new List(); } }