Some renamings
This commit is contained in:
@@ -21,7 +21,7 @@ namespace _2DGAMELIB
|
|||||||
public bool ShowFPS;
|
public bool ShowFPS;
|
||||||
public bool Drive = true;
|
public bool Drive = true;
|
||||||
|
|
||||||
public Rect Base = new Rect(4.0, 3.0, 0.4);
|
public Rectangle Base = new Rectangle(4.0, 3.0, 0.4);
|
||||||
|
|
||||||
public Bitmap Dis;
|
public Bitmap Dis;
|
||||||
public Graphics GD;
|
public Graphics GD;
|
||||||
|
|||||||
@@ -43,9 +43,9 @@ namespace _2DGAMELIB
|
|||||||
return Func(new Hsv(ref Color)).GetColor();
|
return Func(new Hsv(ref Color)).GetColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Rectangle GetRect(this Bitmap Bmp)
|
public static System.Drawing.Rectangle GetRect(this Bitmap Bmp)
|
||||||
{
|
{
|
||||||
return new Rectangle(0, 0, Bmp.Width, Bmp.Height);
|
return new System.Drawing.Rectangle(0, 0, Bmp.Width, Bmp.Height);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LinearGradientBrush GetLGB(double Unit, Vector2D[] MM, Color Color1, Color Color2)
|
public static LinearGradientBrush GetLGB(double Unit, Vector2D[] MM, Color Color1, Color Color2)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
namespace _2DGAMELIB
|
namespace _2DGAMELIB
|
||||||
{
|
{
|
||||||
public class Rect
|
public class Rectangle
|
||||||
{
|
{
|
||||||
public double XRatio = 1.0;
|
public double XRatio = 1.0;
|
||||||
|
|
||||||
@@ -14,9 +14,9 @@ namespace _2DGAMELIB
|
|||||||
|
|
||||||
public Vector2D LocalCenter => new Vector2D(LocalWidth * 0.5, LocalHeight * 0.5);
|
public Vector2D LocalCenter => new Vector2D(LocalWidth * 0.5, LocalHeight * 0.5);
|
||||||
|
|
||||||
public Rect(){}
|
public Rectangle(){}
|
||||||
|
|
||||||
public Rect(double XRatio, double YRatio, double Size)
|
public Rectangle(double XRatio, double YRatio, double Size)
|
||||||
{
|
{
|
||||||
SetXYRatio(XRatio, YRatio);
|
SetXYRatio(XRatio, YRatio);
|
||||||
this.Size = Size;
|
this.Size = Size;
|
||||||
@@ -5,7 +5,7 @@ using System.Drawing.Imaging;
|
|||||||
namespace _2DGAMELIB
|
namespace _2DGAMELIB
|
||||||
{
|
{
|
||||||
//Render Area
|
//Render Area
|
||||||
public class RenderArea : Rect
|
public class RenderArea : Rectangle
|
||||||
{
|
{
|
||||||
//Display Layer
|
//Display Layer
|
||||||
public Bitmap DisplayLayer;
|
public Bitmap DisplayLayer;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace _2DGAMELIB
|
|||||||
|
|
||||||
private int h;
|
private int h;
|
||||||
|
|
||||||
private Rectangle r;
|
private System.Drawing.Rectangle r;
|
||||||
|
|
||||||
private ColorMatrix cm = new ColorMatrix();
|
private ColorMatrix cm = new ColorMatrix();
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ namespace _2DGAMELIB
|
|||||||
GS = Graphics.FromImage(Start);
|
GS = Graphics.FromImage(Start);
|
||||||
End = new Bitmap(w, h);
|
End = new Bitmap(w, h);
|
||||||
GE = Graphics.FromImage(End);
|
GE = Graphics.FromImage(End);
|
||||||
r = new Rectangle(0, 0, w, h);
|
r = new System.Drawing.Rectangle(0, 0, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TransformAlpha(Graphics Graphics, double Rate)
|
public void TransformAlpha(Graphics Graphics, double Rate)
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace _2DGAMELIB
|
|||||||
gl.ActiveTexture(Silk.NET.OpenGL.GLEnum.Texture0);
|
gl.ActiveTexture(Silk.NET.OpenGL.GLEnum.Texture0);
|
||||||
gl.BindTexture(Silk.NET.OpenGL.GLEnum.Texture2D, texture);
|
gl.BindTexture(Silk.NET.OpenGL.GLEnum.Texture2D, texture);
|
||||||
|
|
||||||
BitmapData data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
|
BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
|
||||||
|
|
||||||
gl.TexImage2D(
|
gl.TexImage2D(
|
||||||
Silk.NET.OpenGL.GLEnum.Texture2D,
|
Silk.NET.OpenGL.GLEnum.Texture2D,
|
||||||
|
|||||||
Reference in New Issue
Block a user