Add SurfaceFlags, and more formatting :)

2026-05-24 18:03:08 -05:00
parent d3ea4e5e99
commit bd3dd8f523
38 changed files with 716 additions and 1295 deletions
@@ -214,9 +214,6 @@ void geo_layout_cmd_update_node_flags(void)
 */
 void geo_layout_cmd_node_root(void)
 {
-    s32 i;
-    struct GraphNodeRoot *graphNode;
-
    s16 x = cur_geo_cmd_s16(0x04);
    s16 y = cur_geo_cmd_s16(0x06);
    s16 width = cur_geo_cmd_s16(0x08);
@@ -227,7 +224,7 @@ void geo_layout_cmd_node_root(void)
    // cmd+0x02 = 0x00: Mario face, 0x0A: all other levels
    gGeoNumViews = cur_geo_cmd_s16(0x02) + 2;

-    graphNode = init_graph_node_root(gGraphNodePool, NULL, 0, x, y, width, height);
+    struct GraphNodeRoot *graphNode = init_graph_node_root(gGraphNodePool, NULL, 0, x, y, width, height);

    // gGeoViews is unused in libsm64
    gGeoViews = NULL; // alloc_only_pool_alloc(gGraphNodePool, gGeoNumViews * sizeof(struct GraphNode *));
@@ -235,7 +232,7 @@ void geo_layout_cmd_node_root(void)
    graphNode->views = gGeoViews;
    graphNode->numViews = gGeoNumViews;

-    for (i = 0; i < gGeoNumViews; i++)
+    for (s32 i = 0; i < gGeoNumViews; i++)
    {
        gGeoViews[i] = NULL;
    }
@@ -251,10 +248,9 @@ void geo_layout_cmd_node_root(void)
 */
 void geo_layout_cmd_node_ortho_projection(void)
 {
-    struct GraphNodeOrthoProjection *graphNode;
    f32 scale = (f32)cur_geo_cmd_s16(0x02) / 100.0f;

-    graphNode = init_graph_node_ortho_projection(gGraphNodePool, NULL, scale);
+    struct GraphNodeOrthoProjection *graphNode = init_graph_node_ortho_projection(gGraphNodePool, NULL, scale);

    register_scene_graph_node(&graphNode->node);

@@ -271,7 +267,6 @@ void geo_layout_cmd_node_ortho_projection(void)
 */
 void geo_layout_cmd_node_perspective(void)
 {
-    struct GraphNodePerspective *graphNode;
    GraphNodeFunc frustumFunc = NULL;
    s16 fov = cur_geo_cmd_s16(0x02);
    s16 near = cur_geo_cmd_s16(0x04);
@@ -284,7 +279,7 @@ void geo_layout_cmd_node_perspective(void)
        gGeoLayoutCommand += 4 << CMD_SIZE_SHIFT;
    }

-    graphNode = init_graph_node_perspective(gGraphNodePool, NULL, fov, near, far, frustumFunc, 0);
+    struct GraphNodePerspective *graphNode = init_graph_node_perspective(gGraphNodePool, NULL, fov, near, far, frustumFunc, 0);

    register_scene_graph_node(&graphNode->fnNode.node);

@@ -297,9 +292,7 @@ void geo_layout_cmd_node_perspective(void)
 */
 void geo_layout_cmd_node_start(void)
 {
-    struct GraphNodeStart *graphNode;
-
-    graphNode = init_graph_node_start(gGraphNodePool, NULL);
+    struct GraphNodeStart *graphNode = init_graph_node_start(gGraphNodePool, NULL);

    register_scene_graph_node(&graphNode->node);

@@ -318,9 +311,7 @@ void geo_layout_cmd_nop3(void)
 */
 void geo_layout_cmd_node_master_list(void)
 {
-    struct GraphNodeMasterList *graphNode;
-
-    graphNode = init_graph_node_master_list(gGraphNodePool, NULL, cur_geo_cmd_u8(0x01));
+    struct GraphNodeMasterList *graphNode = init_graph_node_master_list(gGraphNodePool, NULL, cur_geo_cmd_u8(0x01));

    register_scene_graph_node(&graphNode->node);

@@ -335,11 +326,10 @@ void geo_layout_cmd_node_master_list(void)
 */
 void geo_layout_cmd_node_level_of_detail(void)
 {
-    struct GraphNodeLevelOfDetail *graphNode;
    s16 minDistance = cur_geo_cmd_s16(0x04);
    s16 maxDistance = cur_geo_cmd_s16(0x06);

-    graphNode = init_graph_node_render_range(gGraphNodePool, NULL, minDistance, maxDistance);
+    struct GraphNodeLevelOfDetail *graphNode = init_graph_node_render_range(gGraphNodePool, NULL, minDistance, maxDistance);

    register_scene_graph_node(&graphNode->node);

@@ -356,14 +346,11 @@ void geo_layout_cmd_node_level_of_detail(void)
 */
 void geo_layout_cmd_node_switch_case(void)
 {
-    struct GraphNodeSwitchCase *graphNode;
-
-    graphNode =
-            init_graph_node_switch_case(gGraphNodePool, NULL,
-                                        cur_geo_cmd_s16(0x02), // case which is initially selected
-                                        0,
-                                        cur_geo_cmd_ptr(0x04), // case update function
-                                        0);
+    struct GraphNodeSwitchCase *graphNode = init_graph_node_switch_case(gGraphNodePool, NULL,
+                                                                        cur_geo_cmd_s16(0x02), // case which is initially selected
+                                                                        0,
+                                                                        cur_geo_cmd_ptr(0x04), // case update function
+                                                                        0);

    register_scene_graph_node(&graphNode->fnNode.node);

@@ -383,7 +370,6 @@ void geo_layout_cmd_node_switch_case(void)
 */
 void geo_layout_cmd_node_camera(void)
 {
-    struct GraphNodeCamera *graphNode;
    s16 *cmdPos = (s16 *)&gGeoLayoutCommand[4];

    Vec3f pos, focus;
@@ -391,8 +377,8 @@ void geo_layout_cmd_node_camera(void)
    cmdPos = read_vec3s_to_vec3f(pos, cmdPos);
    cmdPos = read_vec3s_to_vec3f(focus, cmdPos);

-    graphNode = init_graph_node_camera(gGraphNodePool, NULL, pos, focus,
-                                       cur_geo_cmd_ptr(0x10), cur_geo_cmd_s16(0x02));
+    struct GraphNodeCamera *graphNode = init_graph_node_camera(gGraphNodePool, NULL, pos, focus,
+                                                               cur_geo_cmd_ptr(0x10), cur_geo_cmd_s16(0x02));

    register_scene_graph_node(&graphNode->fnNode.node);

@@ -437,8 +423,6 @@ void geo_layout_cmd_node_camera(void)
 */
 void geo_layout_cmd_node_translation_rotation(void)
 {
-    struct GraphNodeTranslationRotation *graphNode;
-
    Vec3s translation, rotation;

    void *displayList = NULL;
@@ -475,8 +459,8 @@ void geo_layout_cmd_node_translation_rotation(void)
        cmdPos += 2 << CMD_SIZE_SHIFT;
    }

-    graphNode = init_graph_node_translation_rotation(gGraphNodePool, NULL, drawingLayer, displayList,
-                                                     translation, rotation);
+    struct GraphNodeTranslationRotation *graphNode = init_graph_node_translation_rotation(gGraphNodePool, NULL, drawingLayer, displayList,
+                                                                                          translation, rotation);
    register_scene_graph_node(&graphNode->node);

    gGeoLayoutCommand = (u8 *)cmdPos;
@@ -494,8 +478,6 @@ void geo_layout_cmd_node_translation_rotation(void)
 */
 void geo_layout_cmd_node_translation(void)
 {
-    struct GraphNodeTranslation *graphNode;
-
    Vec3s translation;

    s16 drawingLayer = 0;
@@ -512,8 +494,7 @@ void geo_layout_cmd_node_translation(void)
        cmdPos += 2 << CMD_SIZE_SHIFT;
    }

-    graphNode =
-            init_graph_node_translation(gGraphNodePool, NULL, drawingLayer, displayList, translation);
+    struct GraphNodeTranslation *graphNode = init_graph_node_translation(gGraphNodePool, NULL, drawingLayer, displayList, translation);

    register_scene_graph_node(&graphNode->node);

@@ -532,8 +513,6 @@ void geo_layout_cmd_node_translation(void)
 */
 void geo_layout_cmd_node_rotation(void)
 {
-    struct GraphNodeRotation *graphNode;
-
    Vec3s sp2c;

    s16 drawingLayer = 0;
@@ -550,7 +529,7 @@ void geo_layout_cmd_node_rotation(void)
        cmdPos += 2 << CMD_SIZE_SHIFT;
    }

-    graphNode = init_graph_node_rotation(gGraphNodePool, NULL, drawingLayer, displayList, sp2c);
+    struct GraphNodeRotation *graphNode = init_graph_node_rotation(gGraphNodePool, NULL, drawingLayer, displayList, sp2c);

    register_scene_graph_node(&graphNode->node);

@@ -567,8 +546,6 @@ void geo_layout_cmd_node_rotation(void)
 */
 void geo_layout_cmd_node_scale(void)
 {
-    struct GraphNodeScale *graphNode;
-
    s16 drawingLayer = 0;
    s16 params = cur_geo_cmd_u8(0x01);
    f32 scale = cur_geo_cmd_u32(0x04) / 65536.0f;
@@ -581,7 +558,7 @@ void geo_layout_cmd_node_scale(void)
        gGeoLayoutCommand += 4 << CMD_SIZE_SHIFT;
    }

-    graphNode = init_graph_node_scale(gGraphNodePool, NULL, drawingLayer, displayList, scale);
+    struct GraphNodeScale *graphNode = init_graph_node_scale(gGraphNodePool, NULL, drawingLayer, displayList, scale);

    register_scene_graph_node(&graphNode->node);

@@ -604,7 +581,6 @@ void geo_layout_cmd_nop2(void)
 */
 void geo_layout_cmd_node_animated_part(void)
 {
-    struct GraphNodeAnimatedPart *graphNode;
    Vec3s translation;
    s32 drawingLayer = cur_geo_cmd_u8(0x01);
    void *displayList = cur_geo_cmd_ptr(0x08);
@@ -612,8 +588,7 @@ void geo_layout_cmd_node_animated_part(void)

    read_vec3s(translation, &cmdPos[1]);

-    graphNode =
-            init_graph_node_animated_part(gGraphNodePool, NULL, drawingLayer, displayList, translation);
+    struct GraphNodeAnimatedPart *graphNode = init_graph_node_animated_part(gGraphNodePool, NULL, drawingLayer, displayList, translation);

    register_scene_graph_node(&graphNode->node);

@@ -632,7 +607,6 @@ void geo_layout_cmd_node_animated_part(void)
 */
 void geo_layout_cmd_node_billboard(void)
 {
-    struct GraphNodeBillboard *graphNode;
    Vec3s translation;
    s16 drawingLayer = 0;
    s16 params = cur_geo_cmd_u8(0x01);
@@ -648,7 +622,7 @@ void geo_layout_cmd_node_billboard(void)
        cmdPos += 2 << CMD_SIZE_SHIFT;
    }

-    graphNode = init_graph_node_billboard(gGraphNodePool, NULL, drawingLayer, displayList, translation);
+    struct GraphNodeBillboard *graphNode = init_graph_node_billboard(gGraphNodePool, NULL, drawingLayer, displayList, translation);

    register_scene_graph_node(&graphNode->node);

@@ -662,11 +636,10 @@ void geo_layout_cmd_node_billboard(void)
 */
 void geo_layout_cmd_node_display_list(void)
 {
-    struct GraphNodeDisplayList *graphNode;
    s32 drawingLayer = cur_geo_cmd_u8(0x01);
    void *displayList = cur_geo_cmd_ptr(0x04);

-    graphNode = init_graph_node_display_list(gGraphNodePool, NULL, drawingLayer, displayList);
+    struct GraphNodeDisplayList *graphNode = init_graph_node_display_list(gGraphNodePool, NULL, drawingLayer, displayList);

    register_scene_graph_node(&graphNode->node);

@@ -681,12 +654,11 @@ void geo_layout_cmd_node_display_list(void)
 */
 void geo_layout_cmd_node_shadow(void)
 {
-    struct GraphNodeShadow *graphNode;
    u8 shadowType = cur_geo_cmd_s16(0x02);
    u8 shadowSolidity = cur_geo_cmd_s16(0x04);
    s16 shadowScale = cur_geo_cmd_s16(0x06);

-    graphNode = init_graph_node_shadow(gGraphNodePool, NULL, shadowScale, shadowSolidity, shadowType);
+    struct GraphNodeShadow *graphNode = init_graph_node_shadow(gGraphNodePool, NULL, shadowScale, shadowSolidity, shadowType);

    register_scene_graph_node(&graphNode->node);

@@ -696,9 +668,7 @@ void geo_layout_cmd_node_shadow(void)
 // 0x17: Create scene graph node that manages the group of all object nodes
 void geo_layout_cmd_node_object_parent(void)
 {
-    struct GraphNodeObjectParent *graphNode;
-
-    graphNode = init_graph_node_object_parent(gGraphNodePool, NULL, &gObjParentGraphNode);
+    struct GraphNodeObjectParent *graphNode = init_graph_node_object_parent(gGraphNodePool, NULL, &gObjParentGraphNode);

    register_scene_graph_node(&graphNode->node);

@@ -712,11 +682,9 @@ void geo_layout_cmd_node_object_parent(void)
 */
 void geo_layout_cmd_node_generated(void)
 {
-    struct GraphNodeGenerated *graphNode;
-
-    graphNode = init_graph_node_generated(gGraphNodePool, NULL,
-                                          cur_geo_cmd_ptr(0x04), // asm function
-                                          cur_geo_cmd_s16(0x02)); // parameter
+    struct GraphNodeGenerated *graphNode = init_graph_node_generated(gGraphNodePool, NULL,
+                                                                     cur_geo_cmd_ptr(0x04), // asm function
+                                                                     cur_geo_cmd_s16(0x02)); // parameter

    register_scene_graph_node(&graphNode->fnNode.node);

@@ -730,9 +698,7 @@ void geo_layout_cmd_node_generated(void)
 */
 void geo_layout_cmd_node_background(void)
 {
-    struct GraphNodeBackground *graphNode;
-
-    graphNode = init_graph_node_background(
+    struct GraphNodeBackground *graphNode = init_graph_node_background(
        gGraphNodePool, NULL,
        cur_geo_cmd_s16(0x02), // background ID, or RGBA5551 color if asm function is null
        cur_geo_cmd_ptr(0x04), // asm function
@@ -756,7 +722,6 @@ void geo_layout_cmd_nop(void)
 */
 void geo_layout_cmd_copy_view(void)
 {
-    struct GraphNodeObjectParent *graphNode;
    struct GraphNode *node = NULL;
    s16 index = cur_geo_cmd_s16(0x02);

@@ -774,7 +739,7 @@ void geo_layout_cmd_copy_view(void)
        }
    }

-    graphNode = init_graph_node_object_parent(gGraphNodePool, NULL, node);
+    struct GraphNodeObjectParent *graphNode = init_graph_node_object_parent(gGraphNodePool, NULL, node);

    register_scene_graph_node(&graphNode->node);

@@ -791,12 +756,11 @@ void geo_layout_cmd_copy_view(void)
 */
 void geo_layout_cmd_node_held_obj(void)
 {
-    struct GraphNodeHeldObject *graphNode;
    Vec3s offset;

    read_vec3s(offset, (s16 *)&gGeoLayoutCommand[0x02]);

-    graphNode = init_graph_node_held_object(
+    struct GraphNodeHeldObject *graphNode = init_graph_node_held_object(
        gGraphNodePool, NULL, NULL, offset, cur_geo_cmd_ptr(0x08), cur_geo_cmd_u8(0x01));

    register_scene_graph_node(&graphNode->fnNode.node);
@@ -811,8 +775,7 @@ void geo_layout_cmd_node_held_obj(void)
 */
 void geo_layout_cmd_node_culling_radius(void)
 {
-    struct GraphNodeCullingRadius *graphNode;
-    graphNode = init_graph_node_culling_radius(gGraphNodePool, NULL, cur_geo_cmd_s16(0x02));
+    struct GraphNodeCullingRadius *graphNode = init_graph_node_culling_radius(gGraphNodePool, NULL, cur_geo_cmd_s16(0x02));
    register_scene_graph_node(&graphNode->node);
    gGeoLayoutCommand += 0x04 << CMD_SIZE_SHIFT;
 }