clang formatclang-format

1 files changed, 64 insertions, 69 deletions

diff --git a/src/engine/objects/TrashBin.cpp b/src/engine/objects/TrashBin.cpp
index c94d0352f..8ff278045 100644
--- a/src/engine/objects/TrashBin.cpp
+++ b/src/engine/objects/TrashBin.cpp
@@ -18,7 +18,7 @@ extern "C" {
 #include "audio/external.h"
 }
 
-#define DEGREES_FLOAT_TO_SHORT(Degrees) ((s16)((Degrees) * (0x8000 / 180.0f)))
+#define DEGREES_FLOAT_TO_SHORT(Degrees) ((s16) ((Degrees) * (0x8000 / 180.0f)))
 
 OTrashBin::OTrashBin(const FVector& pos, const IRotator& rotation, f32 scale, OTrashBin::Behaviour bhv) {
     Name = "Trashbin";
@@ -39,7 +39,7 @@ OTrashBin::OTrashBin(const FVector& pos, const IRotator& rotation, f32 scale, OT
 void OTrashBin::Tick() {
     OTrashBin::func_8007E00C(_objectIndex);
 
-    switch(_bhv) {
+    switch (_bhv) {
         case STATIC:
             break;
         case MUNCHING:
@@ -63,7 +63,7 @@ void OTrashBin::Draw(s32 cameraId) {
             Vec3f Pos = { _pos.x + 63, _pos.y + 12, _pos.z + 25 };
             Vec3s Rot = { 0, 0x4000, 0 };
             mtxf_pos_rotation_xyz(mtx, Pos, Rot);
-            //mtxf_scale(mtx, 1.0f);
+            // mtxf_scale(mtx, 1.0f);
             if (render_set_position(mtx, 0) != 0) {
                 gSPDisplayList(gDisplayListHead++, BinMod);
             }
@@ -73,7 +73,7 @@ void OTrashBin::Draw(s32 cameraId) {
 
 void OTrashBin::init_bb_trash_bin(s32 objectIndex) {
     gObjectList[objectIndex].sizeScaling = 1.0f;
-    gObjectList[objectIndex].model = (Gfx*)d_course_banshee_boardwalk_dl_trash_bin;
+    gObjectList[objectIndex].model = (Gfx*) d_course_banshee_boardwalk_dl_trash_bin;
     gObjectList[objectIndex].unk_04C = 0;
     gObjectList[objectIndex].unk_084[7] = 0;
     set_obj_orientation(objectIndex, 0U, 0U, 0U);
@@ -149,83 +149,78 @@ void OTrashBin::func_8007E00C(s32 objectIndex) {
     }
 }
 
-Gfx OTrashBin::BinMod[] =
-{
+Gfx OTrashBin::BinMod[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gTexture651B20),
     gsDPTileSync(),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-	gsSPVertex(BinVtx, 20, 0),
-	gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
-	gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
-	gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
-	gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
-	gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
-	gsSPVertex(BinVtx2, 20, 0),
-	gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
-	gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
-	gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
-	gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
-	gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
-	gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
-	gsSPTexture(65535, 65535, 0, 0, 0),
+    gsSPVertex(BinVtx, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSPVertex(BinVtx2, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
+    gsSPTexture(65535, 65535, 0, 0, 0),
     gsSPEndDisplayList(),
 };
 
-
-
-
-
-
-
 Vtx OTrashBin::BinVtx[20] = {
-	{{ {25, -13, 62}, 0, {0, -2303}, {255, 255, 255, 0} }},
-	{{ {-25, -13, 62}, 0, {1280, -2303}, {255, 255, 255, 0} }},
-	{{ {-25, -13, -63}, 0, {1280, 896}, {255, 255, 255, 0} }},
-	{{ {25, -13, -63}, 0, {0, 895}, {255, 255, 255, 0} }},
-	{{ {25, -13, -63}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {25, 20, -63}, 0, {0, 256}, {255, 255, 255, 0} }},
-	{{ {25, 20, 62}, 0, {3199, 256}, {255, 255, 255, 0} }},
-	{{ {25, -13, 62}, 0, {3199, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, -13, -63}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, 20, -63}, 0, {0, 255}, {255, 255, 255, 0} }},
-	{{ {25, 20, -63}, 0, {1280, 255}, {255, 255, 255, 0} }},
-	{{ {25, -13, -63}, 0, {1280, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, -13, 62}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, 20, 62}, 0, {0, 255}, {255, 255, 255, 0} }},
-	{{ {-25, 20, -63}, 0, {3200, 255}, {255, 255, 255, 0} }},
-	{{ {-25, -13, -63}, 0, {3200, 1113}, {255, 255, 255, 0} }},
-	{{ {25, -13, 62}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {25, 20, 62}, 0, {0, 256}, {255, 255, 255, 0} }},
-	{{ {-25, 20, 62}, 0, {1279, 256}, {255, 255, 255, 0} }},
-	{{ {-25, -13, 62}, 0, {1279, 1113}, {255, 255, 255, 0} }},
+    { { { 25, -13, 62 }, 0, { 0, -2303 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, 62 }, 0, { 1280, -2303 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, -63 }, 0, { 1280, 896 }, { 255, 255, 255, 0 } } },
+    { { { 25, -13, -63 }, 0, { 0, 895 }, { 255, 255, 255, 0 } } },
+    { { { 25, -13, -63 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, -63 }, 0, { 0, 256 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, 62 }, 0, { 3199, 256 }, { 255, 255, 255, 0 } } },
+    { { { 25, -13, 62 }, 0, { 3199, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, -63 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, -63 }, 0, { 0, 255 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, -63 }, 0, { 1280, 255 }, { 255, 255, 255, 0 } } },
+    { { { 25, -13, -63 }, 0, { 1280, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, 62 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, 62 }, 0, { 0, 255 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, -63 }, 0, { 3200, 255 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, -63 }, 0, { 3200, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 25, -13, 62 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, 62 }, 0, { 0, 256 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, 62 }, 0, { 1279, 256 }, { 255, 255, 255, 0 } } },
+    { { { -25, -13, 62 }, 0, { 1279, 1113 }, { 255, 255, 255, 0 } } },
 };
 
 Vtx OTrashBin::BinVtx2[20] = {
-	{{ {19, -8, 52}, 0, {3199, 1113}, {255, 255, 255, 0} }},
-	{{ {25, 20, 62}, 0, {3199, 256}, {255, 255, 255, 0} }},
-	{{ {25, 20, -63}, 0, {0, 256}, {255, 255, 255, 0} }},
-	{{ {19, -8, -52}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {19, -8, -52}, 0, {1280, 1113}, {255, 255, 255, 0} }},
-	{{ {25, 20, -63}, 0, {1280, 255}, {255, 255, 255, 0} }},
-	{{ {-25, 20, -63}, 0, {0, 255}, {255, 255, 255, 0} }},
-	{{ {-19, -8, -52}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {-19, -8, 52}, 0, {1279, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, 20, 62}, 0, {1279, 256}, {255, 255, 255, 0} }},
-	{{ {25, 20, 62}, 0, {0, 256}, {255, 255, 255, 0} }},
-	{{ {19, -8, 52}, 0, {0, 1113}, {255, 255, 255, 0} }},
-	{{ {19, -8, -52}, 0, {0, 895}, {255, 255, 255, 0} }},
-	{{ {-19, -8, -52}, 0, {1280, 896}, {255, 255, 255, 0} }},
-	{{ {-19, -8, 52}, 0, {1280, -2303}, {255, 255, 255, 0} }},
-	{{ {19, -8, 52}, 0, {0, -2303}, {255, 255, 255, 0} }},
-	{{ {-19, -8, -52}, 0, {3200, 1113}, {255, 255, 255, 0} }},
-	{{ {-25, 20, -63}, 0, {3200, 255}, {255, 255, 255, 0} }},
-	{{ {-25, 20, 62}, 0, {0, 255}, {255, 255, 255, 0} }},
-	{{ {-19, -8, 52}, 0, {0, 1113}, {255, 255, 255, 0} }},
+    { { { 19, -8, 52 }, 0, { 3199, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, 62 }, 0, { 3199, 256 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, -63 }, 0, { 0, 256 }, { 255, 255, 255, 0 } } },
+    { { { 19, -8, -52 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 19, -8, -52 }, 0, { 1280, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, -63 }, 0, { 1280, 255 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, -63 }, 0, { 0, 255 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, -52 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, 52 }, 0, { 1279, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, 62 }, 0, { 1279, 256 }, { 255, 255, 255, 0 } } },
+    { { { 25, 20, 62 }, 0, { 0, 256 }, { 255, 255, 255, 0 } } },
+    { { { 19, -8, 52 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
+    { { { 19, -8, -52 }, 0, { 0, 895 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, -52 }, 0, { 1280, 896 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, 52 }, 0, { 1280, -2303 }, { 255, 255, 255, 0 } } },
+    { { { 19, -8, 52 }, 0, { 0, -2303 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, -52 }, 0, { 3200, 1113 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, -63 }, 0, { 3200, 255 }, { 255, 255, 255, 0 } } },
+    { { { -25, 20, 62 }, 0, { 0, 255 }, { 255, 255, 255, 0 } } },
+    { { { -19, -8, 52 }, 0, { 0, 1113 }, { 255, 255, 255, 0 } } },
 };