Cleanup

w0rm · Mar 24, 2024 · e072418 · e072418
1 parent f216899
commit e072418
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/examples/review/elm.json b/examples/review/elm.json
@@ -9,27 +9,27 @@
             "elm/core": "1.0.5",
             "elm/json": "1.1.3",
             "elm/project-metadata-utils": "1.0.1",
-            "jfmengels/elm-review": "2.4.1",
-            "jfmengels/elm-review-simplify": "1.0.1",
-            "jfmengels/elm-review-unused": "1.1.9",
-            "jfmengels/elm-review-performance": "1.0.0",
-            "stil4m/elm-syntax": "7.2.2"
+            "jfmengels/elm-review": "2.13.1",
+            "jfmengels/elm-review-simplify": "2.1.3",
+            "jfmengels/elm-review-unused": "1.2.0",
+            "jfmengels/elm-review-performance": "1.0.2",
+            "stil4m/elm-syntax": "7.3.2"
         },
         "indirect": {
             "elm/html": "1.0.0",
             "elm/parser": "1.1.0",
             "elm/random": "1.0.0",
             "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.2",
-            "elm-community/list-extra": "8.3.0",
-            "elm-explorations/test": "1.2.2",
+            "elm-community/list-extra": "8.7.0",
+            "elm-explorations/test": "2.2.0",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/structured-writer": "1.0.3"
         }
     },
     "test-dependencies": {
         "direct": {
-            "elm-explorations/test": "1.2.2"
+            "elm-explorations/test": "2.2.0"
         },
         "indirect": {}
     }

diff --git a/examples/src/RaycastCar/Car.elm b/examples/src/RaycastCar/Car.elm
@@ -112,7 +112,7 @@ updateSuspension : CarSettings -> Duration -> World id -> Frame3d Meters WorldCo
 updateSuspension carSettings dt world frame originalCar currentWheels updatedCar updatedWheels numWheelsOnGround =
     case currentWheels of
         [] ->
-            updateFriction carSettings dt world frame updatedCar numWheelsOnGround updatedWheels [] [] False
+            updateFriction carSettings dt frame updatedCar numWheelsOnGround updatedWheels [] [] False
 
         wheel :: remainingWheels ->
             let
@@ -255,11 +255,11 @@ type alias WheelFriction id =
     }
 
 
-updateFriction : CarSettings -> Duration -> World id -> Frame3d Meters WorldCoordinates { defines : BodyCoordinates } -> Body id -> Int -> List (Wheel id) -> List (WheelFriction id) -> List (Wheel id) -> Bool -> ( Body id, List (Wheel id) )
-updateFriction carSettings dt world frame updatedCar numWheelsOnGround currentWheels wheelFrictions updatedWheels sliding =
+updateFriction : CarSettings -> Duration -> Frame3d Meters WorldCoordinates { defines : BodyCoordinates } -> Body id -> Int -> List (Wheel id) -> List (WheelFriction id) -> List (Wheel id) -> Bool -> ( Body id, List (Wheel id) )
+updateFriction carSettings dt frame updatedCar numWheelsOnGround currentWheels wheelFrictions updatedWheels sliding =
     case currentWheels of
         [] ->
-            applyImpulses carSettings dt world frame updatedCar updatedWheels sliding wheelFrictions
+            applyImpulses carSettings dt frame updatedCar updatedWheels sliding wheelFrictions
 
         wheel :: remainingWheels ->
             case wheel.contact of
@@ -320,7 +320,6 @@ updateFriction carSettings dt world frame updatedCar numWheelsOnGround currentWh
                     in
                     updateFriction carSettings
                         dt
-                        world
                         frame
                         updatedCar
                         numWheelsOnGround
@@ -341,7 +340,6 @@ updateFriction carSettings dt world frame updatedCar numWheelsOnGround currentWh
                 Nothing ->
                     updateFriction carSettings
                         dt
-                        world
                         frame
                         updatedCar
                         numWheelsOnGround
@@ -351,8 +349,8 @@ updateFriction carSettings dt world frame updatedCar numWheelsOnGround currentWh
                         sliding
 
 
-applyImpulses : CarSettings -> Duration -> World id -> Frame3d Meters WorldCoordinates { defines : BodyCoordinates } -> Body id -> List (Wheel id) -> Bool -> List (WheelFriction id) -> ( Body id, List (Wheel id) )
-applyImpulses carSettings dt world frame carBody wheels sliding wheelFrictions =
+applyImpulses : CarSettings -> Duration -> Frame3d Meters WorldCoordinates { defines : BodyCoordinates } -> Body id -> List (Wheel id) -> Bool -> List (WheelFriction id) -> ( Body id, List (Wheel id) )
+applyImpulses carSettings dt frame carBody wheels sliding wheelFrictions =
     case wheelFrictions of
         [] ->
             rotateWheels carSettings dt frame carBody wheels []
@@ -398,7 +396,6 @@ applyImpulses carSettings dt world frame carBody wheels sliding wheelFrictions =
             in
             applyImpulses carSettings
                 dt
-                world
                 frame
                 newCar
                 wheels

diff --git a/sandbox/review/elm.json b/sandbox/review/elm.json
@@ -9,27 +9,27 @@
             "elm/core": "1.0.5",
             "elm/json": "1.1.3",
             "elm/project-metadata-utils": "1.0.1",
-            "jfmengels/elm-review": "2.4.1",
-            "jfmengels/elm-review-simplify": "1.0.1",
-            "jfmengels/elm-review-unused": "1.1.9",
-            "jfmengels/elm-review-performance": "1.0.0",
-            "stil4m/elm-syntax": "7.2.2"
+            "jfmengels/elm-review": "2.13.1",
+            "jfmengels/elm-review-simplify": "2.1.3",
+            "jfmengels/elm-review-unused": "1.2.0",
+            "jfmengels/elm-review-performance": "1.0.2",
+            "stil4m/elm-syntax": "7.3.2"
         },
         "indirect": {
             "elm/html": "1.0.0",
             "elm/parser": "1.1.0",
             "elm/random": "1.0.0",
             "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.2",
-            "elm-community/list-extra": "8.3.0",
-            "elm-explorations/test": "1.2.2",
+            "elm-community/list-extra": "8.7.0",
+            "elm-explorations/test": "2.2.0",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/structured-writer": "1.0.3"
         }
     },
     "test-dependencies": {
         "direct": {
-            "elm-explorations/test": "1.2.2"
+            "elm-explorations/test": "2.2.0"
         },
         "indirect": {}
     }

diff --git a/sandbox/src/CompoundVsLock.elm b/sandbox/src/CompoundVsLock.elm
@@ -20,7 +20,6 @@ import Duration
 import Frame3d
 import Html exposing (Html)
 import Html.Events exposing (onClick)
-import Internal.Constraint exposing (Constraint)
 import Length exposing (Meters)
 import Mass
 import Physics.Body as Body exposing (Body)