Skip to content

Commit 361fc51

Browse files
committed
feat(serender): better manage of integers and floats
1 parent 3d5d330 commit 361fc51

9 files changed

Lines changed: 45 additions & 37 deletions

File tree

SharpEngine.Core/Renderer/Instructions/DrawCircleLines.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Raylib_cs;
2+
using System;
23

34
namespace SharpEngine.Core.Renderer.Instructions;
45

@@ -11,9 +12,9 @@ internal override void Execute()
1112
{
1213
base.Execute();
1314
Raylib.DrawCircleLines(
14-
(int)Parameters[0],
15-
(int)Parameters[1],
16-
(float)Parameters[2],
15+
Convert.ToInt32(Parameters[0]),
16+
Convert.ToInt32(Parameters[1]),
17+
Convert.ToSingle(Parameters[2]),
1718
(Utils.Color)Parameters[3]
1819
);
1920
}

SharpEngine.Core/Renderer/Instructions/DrawRectangle.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Raylib_cs;
2+
using System;
23

34
namespace SharpEngine.Core.Renderer.Instructions;
45

@@ -11,10 +12,10 @@ internal override void Execute()
1112
{
1213
base.Execute();
1314
Raylib.DrawRectangle(
14-
(int)Parameters[0],
15-
(int)Parameters[1],
16-
(int)Parameters[2],
17-
(int)Parameters[3],
15+
Convert.ToInt32(Parameters[0]), // X
16+
Convert.ToInt32(Parameters[1]), // Y
17+
Convert.ToInt32(Parameters[2]), // Width
18+
Convert.ToInt32(Parameters[3]), // Height
1819
(Utils.Color)Parameters[4]
1920
);
2021
}

SharpEngine.Core/Renderer/Instructions/DrawRectangleLinesEx.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Raylib_cs;
22
using SharpEngine.Core.Math;
3+
using System;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
56

@@ -13,7 +14,7 @@ internal override void Execute()
1314
base.Execute();
1415
Raylib.DrawRectangleLinesEx(
1516
(Rect)Parameters[0],
16-
(int)Parameters[1],
17+
Convert.ToInt32(Parameters[1]),
1718
(Utils.Color)Parameters[2]
1819
);
1920
}

SharpEngine.Core/Renderer/Instructions/DrawRectanglePro.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Raylib_cs;
22
using SharpEngine.Core.Math;
3+
using System;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
56

@@ -14,7 +15,7 @@ internal override void Execute()
1415
Raylib.DrawRectanglePro(
1516
(Rect)Parameters[0],
1617
(Vec2)Parameters[1],
17-
(float)Parameters[2],
18+
Convert.ToSingle(Parameters[2]),
1819
(Utils.Color)Parameters[3]
1920
);
2021
}

SharpEngine.Core/Renderer/Instructions/DrawTextEx.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Raylib_cs;
22
using SharpEngine.Core.Math;
3+
using System;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
56

@@ -13,10 +14,10 @@ internal override void Execute()
1314
base.Execute();
1415
Raylib.DrawTextEx(
1516
(Font)Parameters[0],
16-
(string)Parameters[1],
17+
Convert.ToString(Parameters[1]),
1718
(Vec2)Parameters[2],
18-
(int)Parameters[3],
19-
(int)Parameters[4],
19+
Convert.ToInt32(Parameters[3]),
20+
Convert.ToInt32(Parameters[4]),
2021
(Utils.Color)Parameters[5]
2122
);
2223
}

SharpEngine.Core/Renderer/Instructions/DrawTextPro.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Raylib_cs;
22
using SharpEngine.Core.Math;
3+
using System;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
56

@@ -13,12 +14,12 @@ internal override void Execute()
1314
base.Execute();
1415
Raylib.DrawTextPro(
1516
(Font)Parameters[0],
16-
(string)Parameters[1],
17+
Convert.ToString(Parameters[1]),
1718
(Vec2)Parameters[2],
1819
(Vec2)Parameters[3],
19-
(float)Parameters[4],
20-
(int)Parameters[5],
21-
(int)Parameters[6],
20+
Convert.ToSingle(Parameters[4]),
21+
Convert.ToInt32(Parameters[5]),
22+
Convert.ToInt32(Parameters[6]),
2223
(Utils.Color)Parameters[7]
2324
);
2425
}

SharpEngine.Core/Renderer/Instructions/DrawTexturePro.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Raylib_cs;
22
using SharpEngine.Core.Math;
3+
using System;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
56

@@ -16,7 +17,7 @@ internal override void Execute()
1617
(Rect)Parameters[1],
1718
(Rect)Parameters[2],
1819
(Vec2)Parameters[3],
19-
(float)Parameters[4],
20+
Convert.ToSingle(Parameters[4]),
2021
(Utils.Color)Parameters[5]
2122
);
2223
}

SharpEngine.Core/Renderer/Instructions/ScissorMode.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Linq;
1+
using System;
2+
using System.Linq;
23
using Raylib_cs;
34

45
namespace SharpEngine.Core.Renderer.Instructions;
@@ -12,10 +13,10 @@ internal override void Execute()
1213
{
1314
base.Execute();
1415
Raylib.BeginScissorMode(
15-
(int)Parameters[0],
16-
(int)Parameters[1],
17-
(int)Parameters[2],
18-
(int)Parameters[3]
16+
Convert.ToInt32(Parameters[0]),
17+
Convert.ToInt32(Parameters[1]),
18+
Convert.ToInt32(Parameters[2]),
19+
Convert.ToInt32(Parameters[3])
1920
);
2021
SERender.DrawInstructions(
2122
Parameters.GetRange(4, Parameters.Count - 4).Select(x => (Instruction)x).ToList()

SharpEngine.Core/Renderer/SERender.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ Action shaderAction
123123
/// <param name="zLayer">Z Layer</param>
124124
/// <param name="scissorAction">Function which render in scissor mode</param>
125125
public static void ScissorMode(
126-
int posX,
127-
int posY,
128-
int width,
129-
int height,
126+
float posX,
127+
float posY,
128+
float width,
129+
float height,
130130
InstructionSource source,
131131
float zLayer,
132132
Action scissorAction
@@ -185,10 +185,10 @@ float zLayer
185185
/// <param name="source">Instruction Source</param>
186186
/// <param name="zLayer">Z Layer</param>
187187
public static void DrawRectangle(
188-
int posX,
189-
int posY,
190-
int width,
191-
int height,
188+
float posX,
189+
float posY,
190+
float width,
191+
float height,
192192
Utils.Color color,
193193
InstructionSource source,
194194
float zLayer
@@ -214,7 +214,7 @@ float zLayer
214214
/// <param name="zLayer">Z Layer</param>
215215
public static void DrawRectangleLines(
216216
Rect rect,
217-
int borderSize,
217+
float borderSize,
218218
Utils.Color borderColor,
219219
InstructionSource source,
220220
float zLayer
@@ -240,8 +240,8 @@ float zLayer
240240
/// <param name="source">Instruction Source</param>
241241
/// <param name="zLayer">Z Layer</param>
242242
public static void DrawCircleLines(
243-
int posX,
244-
int posY,
243+
float posX,
244+
float posY,
245245
float radius,
246246
Utils.Color borderColor,
247247
InstructionSource source,
@@ -309,8 +309,8 @@ public static void DrawText(
309309
Vec2 position,
310310
Vec2 origin,
311311
float rotation,
312-
int fontSize,
313-
int spacing,
312+
float fontSize,
313+
float spacing,
314314
Utils.Color color,
315315
InstructionSource source,
316316
float zLayer
@@ -351,8 +351,8 @@ public static void DrawText(
351351
Font font,
352352
string text,
353353
Vec2 position,
354-
int fontSize,
355-
int spacing,
354+
float fontSize,
355+
float spacing,
356356
Utils.Color color,
357357
InstructionSource source,
358358
float zLayer

0 commit comments

Comments
 (0)