Skip to content

Commit 9db4463

Browse files
committed
chore: run fantomas
1 parent c60b436 commit 9db4463

9 files changed

Lines changed: 128 additions & 107 deletions

File tree

samples/ThreeDSample/DayNight.fs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ let getPrimaryLightDirection (time: float32) (arcRadius: float32) : Vector3 =
9595
if time >= 6.0f && time <= 18.0f then
9696
celestialArc ((time - 6.0f) / 12.0f) arcRadius
9797
else
98-
let t = if time > 18.0f then (time - 18.0f) / 12.0f else (time + 6.0f) / 12.0f
98+
let t =
99+
if time > 18.0f then
100+
(time - 18.0f) / 12.0f
101+
else
102+
(time + 6.0f) / 12.0f
103+
99104
celestialArc t arcRadius
100105

101106
let getPrimaryLightColor(time: float32) : Color =
@@ -121,6 +126,7 @@ let getPrimaryLightColor(time: float32) : Color =
121126
let getPrimaryLightIntensity(time: float32) : float32 =
122127
if time >= 6.0f && time <= 18.0f then
123128
let t = (time - 6.0f) / 12.0f
129+
124130
if t * arcDegrees < fadeDegrees then
125131
t * arcDegrees / fadeDegrees
126132
elif (1.0f - t) * arcDegrees < fadeDegrees then
@@ -129,8 +135,10 @@ let getPrimaryLightIntensity(time: float32) : float32 =
129135
1.0f
130136
else
131137
let t =
132-
if time > 18.0f then (time - 18.0f) / 12.0f
133-
else (time + 6.0f) / 12.0f
138+
if time > 18.0f then
139+
(time - 18.0f) / 12.0f
140+
else
141+
(time + 6.0f) / 12.0f
134142

135143
let maxMoon = 0.3f
136144

samples/ThreeDSample/DiagnosticsView.fs

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,29 @@ open ThreeDSample.Types
88

99
// ── System ──
1010

11-
let inline system (model: DiagnosticsModel) : unit =
12-
model.Fps <- Raylib.GetFPS()
11+
let inline system(model: DiagnosticsModel) : unit = model.Fps <- Raylib.GetFPS()
1312

1413
let view (ctx: GameContext) (model: GameModel) (buffer: RenderBuffer2D) =
1514
let diag = model.Diagnostics
1615

17-
buffer.Add(
18-
Command2D.text {
19-
Font = diag.Font
20-
Text =
21-
$"FPS: {diag.Fps} Chunks: {diag.ChunkCount} Score: {diag.Score}"
22-
Position = Vector2(10.0f, 10.0f)
23-
FontSize = 20.0f
24-
Spacing = 1.0f
25-
Color = Color.Yellow
26-
Layer = 0<RenderLayer>
27-
}
28-
)
29-
30-
buffer.Add(
31-
Command2D.text {
32-
Font = diag.Font
33-
Text =
34-
$"Time: {diag.TimeOfDay:F1}h Pos: ({diag.PlayerX:F0},{diag.PlayerY:F0},{diag.PlayerZ:F0}) Grounded: {diag.IsGrounded}"
35-
Position = Vector2(10.0f, 35.0f)
36-
FontSize = 20.0f
37-
Spacing = 1.0f
38-
Color = Color.Yellow
39-
Layer = 0<RenderLayer>
40-
}
41-
)
16+
buffer
17+
|> Draw.text {
18+
Font = diag.Font
19+
Text = $"FPS: {diag.Fps} Chunks: {diag.ChunkCount} Score: {diag.Score}"
20+
Position = Vector2(10.0f, 10.0f)
21+
FontSize = 20.0f
22+
Spacing = 1.0f
23+
Color = Color.Yellow
24+
Layer = 0<RenderLayer>
25+
}
26+
|> Draw.text {
27+
Font = diag.Font
28+
Text =
29+
$"Time: {diag.TimeOfDay:F1}h Pos: ({diag.PlayerX:F0},{diag.PlayerY:F0},{diag.PlayerZ:F0}) Grounded: {diag.IsGrounded}"
30+
Position = Vector2(10.0f, 35.0f)
31+
FontSize = 20.0f
32+
Spacing = 1.0f
33+
Color = Color.Yellow
34+
Layer = 0<RenderLayer>
35+
}
36+
|> Draw.drop

samples/ThreeDSample/MinimapView.fs

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module ThreeDSample.Minimap
22

3-
#nowarn "9"
3+
#warnon 9
44

55
open System.Collections.Generic
66
open System.Numerics
@@ -201,41 +201,35 @@ let private viewInner
201201
let halfMinimap = minimapSize * 0.5f
202202

203203
if minimap.TexReady then
204-
buffer.Add(
205-
Command2D.sprite {
206-
Texture = minimap.Texture
207-
Dest = Rectangle(minimapX, minimapY, minimapSize, minimapSize)
208-
Source = Rectangle(0.0f, 0.0f, float32 texSize, float32 texSize)
209-
Origin = Vector2.Zero
210-
Rotation = 0.0f
211-
Color = Color.White
212-
Layer = 100<RenderLayer>
213-
}
214-
)
204+
buffer
205+
|> Draw.sprite {
206+
Texture = minimap.Texture
207+
Dest = Rectangle(minimapX, minimapY, minimapSize, minimapSize)
208+
Source = Rectangle(0.0f, 0.0f, float32 texSize, float32 texSize)
209+
Origin = Vector2.Zero
210+
Rotation = 0.0f
211+
Color = Color.White
212+
Layer = 100<RenderLayer>
213+
}
214+
|> Draw.drop
215215

216216
let centerX = minimapX + halfMinimap
217217
let centerY = minimapY + halfMinimap
218218
let facingX = sin playerFacing
219219
let facingZ = cos playerFacing
220220

221-
buffer.Add(
222-
Command2D.fillCircle
223-
(102<RenderLayer>, Color.Yellow)
224-
(Vector2(centerX, centerY), 3.0f)
225-
)
226-
227-
buffer.Add(
228-
Command2D.lineThick
229-
(102<RenderLayer>, Color.Yellow, 2.0f)
230-
(Vector2(centerX, centerY),
231-
Vector2(centerX + facingX * 10.0f, centerY + facingZ * 10.0f))
232-
)
233-
234-
buffer.Add(
235-
Command2D.rectOutline
236-
(103<RenderLayer>, Color.White, 2.0f)
237-
(Rectangle(minimapX, minimapY, minimapSize, minimapSize))
238-
)
221+
buffer
222+
|> Draw.fillCircle
223+
(102<RenderLayer>, Color.Yellow)
224+
(Vector2(centerX, centerY), 3.0f)
225+
|> Draw.lineThick
226+
(102<RenderLayer>, Color.Yellow, 2.0f)
227+
(Vector2(centerX, centerY),
228+
Vector2(centerX + facingX * 10.0f, centerY + facingZ * 10.0f))
229+
|> Draw.rectOutline
230+
(103<RenderLayer>, Color.White, 2.0f)
231+
(Rectangle(minimapX, minimapY, minimapSize, minimapSize))
232+
|> Draw.drop
239233

240234
let view (ctx: GameContext) (model: GameModel) (buffer: RenderBuffer2D) =
241235
viewInner ctx model.Minimap model.PlayerPosition model.PlayerFacing buffer

samples/ThreeDSample/Program.fs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ let main _ =
8989
SpotBias = 0.001f
9090
SlopeScaleBias = 0.001f
9191
},
92-
shadowAtlasConfig =
93-
{ShadowAtlasConfig.defaults with Resolution = 4096; DirectionalLightSize = ValueSome 30.f}
92+
shadowAtlasConfig = {
93+
ShadowAtlasConfig.defaults with
94+
Resolution = 4096
95+
DirectionalLightSize = ValueSome 30.f
96+
}
9497

9598
)
9699

samples/ThreeDSample/View.fs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module ThreeDSample.View
22

3+
#nowarn 9
4+
35
open System
46
open System.Collections.Generic
57
open System.Numerics
@@ -49,11 +51,9 @@ let private resolveMeshesAndMaterial(blockType: BlockType) =
4951
if m.MeshCount > 0 then
5052
[|
5153
for mi = 0 to m.MeshCount - 1 do
52-
#nowarn 9
5354
let mesh = NativePtr.get m.Meshes mi
5455
let matIdx = NativePtr.get m.MeshMaterial mi
5556
let raylibMat = NativePtr.get m.Materials matIdx
56-
#warnon 9
5757
struct (mesh, Material3D.fromRaylibMaterial raylibMat)
5858
|]
5959
else
@@ -98,9 +98,8 @@ let view (ctx: GameContext) (model: GameModel) (buffer: RenderBuffer3D) =
9898
)
9999

100100
buffer
101-
|> Draw3D.beginCameraWith (
102-
Camera3D.render camera
103-
|> Camera3D.withClear l.SkyColor
101+
|> Draw3D.beginCameraWith(
102+
Camera3D.render camera |> Camera3D.withClear l.SkyColor
104103
)
105104
|> Draw3D.setAmbientLight {
106105
Color = l.AmbientColor
@@ -142,7 +141,7 @@ let view (ctx: GameContext) (model: GameModel) (buffer: RenderBuffer3D) =
142141
buffer
143142

144143
for light in model.VisibleLights do
145-
buffer.Add(Command3D.addPointLight light)
144+
Draw3D.addPointLight light buffer |> Draw3D.drop
146145

147146
let playerModel =
148147
loadOrGetModel model.ModelCache KenneyModels.characterOobi ctx
@@ -159,8 +158,7 @@ let view (ctx: GameContext) (model: GameModel) (buffer: RenderBuffer3D) =
159158

160159
Raymath.MatrixMultiply(rot, trans)
161160

162-
buffer.Add(Command3D.drawModel playerModel playerTransform)
163-
164-
buffer |> Draw3D.endCamera |> Draw3D.drop
165-
166-
Draw3D.drop buffer
161+
buffer
162+
|> Draw3D.drawModel playerModel playerTransform
163+
|> Draw3D.endCamera
164+
|> Draw3D.drop

src/Mibo.Raylib/Camera.fs

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,8 @@ module Camera3D =
270270
/// Convert a raylib <see cref="T:Raylib_cs.Camera3D"/> to a Mibo <see cref="T:Mibo.Elmish.Camera"/>
271271
/// by computing view and projection matrices.
272272
/// </summary>
273-
let fromRaylib (cam: Raylib_cs.Camera3D) : Camera = {
274-
View =
275-
Matrix4x4.CreateLookAt(cam.Position, cam.Target, cam.Up)
273+
let fromRaylib(cam: Raylib_cs.Camera3D) : Camera = {
274+
View = Matrix4x4.CreateLookAt(cam.Position, cam.Target, cam.Up)
276275
Projection =
277276
match cam.Projection with
278277
| CameraProjection.Perspective ->
@@ -295,53 +294,61 @@ module Camera3D =
295294
/// Create a rendering config from a raylib camera.
296295
/// Defaults: fullscreen, no clear, all post-process passes.
297296
/// </summary>
298-
let render (camera: Raylib_cs.Camera3D) : Camera3DConfig = {
297+
let render(camera: Raylib_cs.Camera3D) : Camera3DConfig = {
299298
Camera = camera
300299
Viewport = ValueNone
301300
ClearColor = ValueNone
302301
PostProcessPasses = ValueNone
303302
}
304303

305304
/// <summary>Set viewport in normalized screen coordinates (0-1).</summary>
306-
let withViewport (viewport: Raylib_cs.Rectangle) (config: Camera3DConfig) =
307-
{ config with Viewport = ValueSome viewport }
305+
let withViewport (viewport: Raylib_cs.Rectangle) (config: Camera3DConfig) = {
306+
config with
307+
Viewport = ValueSome viewport
308+
}
308309

309310
/// <summary>Clear with this color before rendering.</summary>
310-
let withClear (color: Color) (config: Camera3DConfig) =
311-
{ config with ClearColor = ValueSome color }
311+
let withClear (color: Color) (config: Camera3DConfig) = {
312+
config with
313+
ClearColor = ValueSome color
314+
}
312315

313316
/// <summary>Use only specific post-process pass indices.</summary>
314-
let withPostProcess (passes: int[]) (config: Camera3DConfig) =
315-
{ config with PostProcessPasses = ValueSome passes }
317+
let withPostProcess (passes: int[]) (config: Camera3DConfig) = {
318+
config with
319+
PostProcessPasses = ValueSome passes
320+
}
316321

317322
/// <summary>Disable post-processing for this camera.</summary>
318-
let withoutPostProcess (config: Camera3DConfig) =
319-
{ config with PostProcessPasses = ValueSome [||] }
323+
let withoutPostProcess(config: Camera3DConfig) = {
324+
config with
325+
PostProcessPasses = ValueSome [||]
326+
}
320327

321328
// ── Convenience Constructors ──
322329

323330
/// <summary>Split-screen left half. Clears with given color.</summary>
324331
let splitScreenLeft (camera: Raylib_cs.Camera3D) (clearColor: Color) =
325332
render camera
326-
|> withViewport (Raylib_cs.Rectangle(0.0f, 0.0f, 0.5f, 1.0f))
333+
|> withViewport(Raylib_cs.Rectangle(0.0f, 0.0f, 0.5f, 1.0f))
327334
|> withClear clearColor
328335

329336
/// <summary>Split-screen right half. Clears with given color.</summary>
330337
let splitScreenRight (camera: Raylib_cs.Camera3D) (clearColor: Color) =
331338
render camera
332-
|> withViewport (Raylib_cs.Rectangle(0.5f, 0.0f, 0.5f, 1.0f))
339+
|> withViewport(Raylib_cs.Rectangle(0.5f, 0.0f, 0.5f, 1.0f))
333340
|> withClear clearColor
334341

335342
/// <summary>Split-screen top half. Clears with given color.</summary>
336343
let splitScreenTop (camera: Raylib_cs.Camera3D) (clearColor: Color) =
337344
render camera
338-
|> withViewport (Raylib_cs.Rectangle(0.0f, 0.0f, 1.0f, 0.5f))
345+
|> withViewport(Raylib_cs.Rectangle(0.0f, 0.0f, 1.0f, 0.5f))
339346
|> withClear clearColor
340347

341348
/// <summary>Split-screen bottom half. Clears with given color.</summary>
342349
let splitScreenBottom (camera: Raylib_cs.Camera3D) (clearColor: Color) =
343350
render camera
344-
|> withViewport (Raylib_cs.Rectangle(0.0f, 0.5f, 1.0f, 0.5f))
351+
|> withViewport(Raylib_cs.Rectangle(0.0f, 0.5f, 1.0f, 0.5f))
345352
|> withClear clearColor
346353

347354
/// <summary>Picture-in-picture overlay. No post-process by default.</summary>

src/Mibo.Raylib/Graphics3D/Command3D.fs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,14 @@ module Command3D =
106106
Command3D.DrawBillboardBatch(textures, positions, sizes, colors, count)
107107

108108
let inline beginCamera(camera: Camera3D) = Command3D.BeginCamera(camera)
109-
let inline beginCameraConfig(config: Camera3DConfig) = Command3D.BeginCameraConfig(config)
109+
110+
let inline beginCameraConfig(config: Camera3DConfig) =
111+
Command3D.BeginCameraConfig(config)
112+
110113
let inline endCamera() = Command3D.EndCamera
111-
let inline setShadowOrigin(origin: Vector3) = Command3D.SetShadowOrigin(origin)
114+
115+
let inline setShadowOrigin(origin: Vector3) =
116+
Command3D.SetShadowOrigin(origin)
112117

113118
let inline setAmbientLight(light: AmbientLight3D) =
114119
Command3D.SetAmbientLight(light)
@@ -119,8 +124,8 @@ module Command3D =
119124
let inline addPointLight(light: PointLight3D) = Command3D.AddPointLight(light)
120125
let inline addSpotLight(light: SpotLight3D) = Command3D.AddSpotLight(light)
121126

122-
let inline enableShadows () = Command3D.EnableShadows
123-
let inline disableShadows () = Command3D.DisableShadows
127+
let inline enableShadows() = Command3D.EnableShadows
128+
let inline disableShadows() = Command3D.DisableShadows
124129

125130
let inline drawImmediate(action: unit -> unit) =
126131
Command3D.DrawImmediate(action)

src/Mibo.Raylib/Graphics3D/Draw3D.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ module Draw3D =
146146
buffer
147147

148148
/// <summary>Enables shadow casting for subsequent geometry until disabled.</summary>
149-
let inline enableShadows (buffer: RenderBuffer3D) =
149+
let inline enableShadows(buffer: RenderBuffer3D) =
150150
buffer.Add(Command3D.enableShadows())
151151
buffer
152152

153153
/// <summary>Disables shadow casting for subsequent geometry until re-enabled.</summary>
154-
let inline disableShadows (buffer: RenderBuffer3D) =
154+
let inline disableShadows(buffer: RenderBuffer3D) =
155155
buffer.Add(Command3D.disableShadows())
156156
buffer
157157

0 commit comments

Comments
 (0)