Revert "Fixes billboarding-related problems"

This reverts commit 5558ecbd4e.

data/behavior_data.c

@@ -219,6 +219,9 @@
 #define BILLBOARD() \
     BC_B(0x21)
 
+#define CYLBOARD() \
+    BC_B(0x38)
+
 // Hides the current object.
 #define HIDE() \
     BC_B(0x22)
@@ -3180,7 +3183,7 @@ const BehaviorScript bhvFloorTrapInCastle[] = {
 
 const BehaviorScript bhvTree[] = {
     BEGIN(OBJ_LIST_POLELIKE),
-    BILLBOARD(),
+    CYLBOARD(),
     OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
     SET_INT(oInteractType, INTERACT_POLE),
     SET_HITBOX(/*Radius*/ 80, /*Height*/ 500),

src/engine/behavior_script.c

@@ -133,6 +133,15 @@ static s32 bhv_cmd_disable_rendering(void) {
 // Usage: BILLBOARD()
 static s32 bhv_cmd_billboard(void) {
     gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_BILLBOARD;
+
+    gCurBhvCommand++;
+    return BHV_PROC_CONTINUE;
+}
+
+// Command 0x
+static s32 bhv_cmd_cylboard(void) {
+    gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_CYLBOARD;
+
     gCurBhvCommand++;
     return BHV_PROC_CONTINUE;
 }
@@ -897,6 +906,7 @@ static BhvCommandProc BehaviorCmdTable[] = {
     bhv_cmd_disable_rendering, //35
     bhv_cmd_set_int_unused, //36
     bhv_cmd_spawn_water_droplet, //37
+    bhv_cmd_cylboard //38
 };
 
 // Execute the behavior script of the current object, process the object flags, and other miscellaneous code for updating objects.

src/engine/graph_node.h

@@ -30,6 +30,7 @@ extern Vec3s gVec3sOne;
 #define GRAPH_RENDER_Z_BUFFER       (1 << 3)
 #define GRAPH_RENDER_INVISIBLE      (1 << 4)
 #define GRAPH_RENDER_HAS_ANIMATION  (1 << 5)
+#define GRAPH_RENDER_CYLBOARD       (1 << 6)
 
 // Whether the node type has a function pointer of type GraphNodeFunc
 #define GRAPH_NODE_TYPE_FUNCTIONAL            0x100

src/engine/math_util.c

@@ -377,6 +377,31 @@ void mtxf_billboard(Mat4 dest, Mat4 mtx, Vec3f position, s16 angle) {
     dest[3][3] = 1;
 }
 
+void mtxf_cylboard(Mat4 dest, Mat4 mtx, Vec3f position, s16 angle) { //straight up mtxf_billboard but minus the dest[1][n] lines. transform for cylindrical billboards
+    dest[0][0] = coss(angle);
+    dest[0][1] = sins(angle);
+    dest[0][2] = 0;
+    dest[0][3] = 0;
+
+    dest[1][0] = mtx[1][0];
+    dest[1][1] = mtx[1][1];
+    dest[1][2] = mtx[1][2];
+    dest[1][3] = 0;
+
+    dest[2][0] = 0;
+    dest[2][1] = 0;
+    dest[2][2] = 1;
+    dest[2][3] = 0;
+
+    dest[3][0] =
+        mtx[0][0] * position[0] + mtx[1][0] * position[1] + mtx[2][0] * position[2] + mtx[3][0];
+    dest[3][1] =
+        mtx[0][1] * position[0] + mtx[1][1] * position[1] + mtx[2][1] * position[2] + mtx[3][1];
+    dest[3][2] =
+        mtx[0][2] * position[0] + mtx[1][2] * position[1] + mtx[2][2] * position[2] + mtx[3][2];
+    dest[3][3] = 1;
+}
+
 /**
  * Set 'dest' to a transformation matrix that aligns an object with the terrain
  * based on the normal. Used for enemies.

src/engine/math_util.h

@@ -56,6 +56,7 @@ void mtxf_lookat(f32 mtx[4][4], Vec3f b, Vec3f c, s16 d);
 void mtxf_rotate_zxy_and_translate(f32 mtx[4][4], Vec3f b, Vec3s c);
 void mtxf_rotate_xyz_and_translate(f32 mtx[4][4], Vec3f b, Vec3s c);
 void mtxf_billboard(f32 mtx1[4][4], f32 mtx2[4][4], Vec3f c, s16 d);
+void mtxf_cylboard(f32 mtx1[4][4], f32 mtx2[4][4], Vec3f c, s16 d);
 void mtxf_align_terrain_normal(f32 mtx[4][4], Vec3f b, Vec3f c, s16 d);
 void mtxf_align_terrain_triangle(f32 mtx[4][4], Vec3f b, s16 c, f32 d);
 void mtxf_mul(f32 dest[4][4], f32 a[4][4], f32 b[4][4]);

src/game/behaviors/cannon.inc.c

@@ -17,9 +17,11 @@ void opened_cannon_act_0(void) {
         cur_obj_enable_rendering();
         cur_obj_become_tangible();
     }
-    if (o->oDistanceToMario < 500.0f) {
     cur_obj_become_tangible();
     cur_obj_enable_rendering();
+    if (o->oDistanceToMario < 500.0f) {
+        //cur_obj_become_tangible();
+        //cur_obj_enable_rendering();
         if (o->oInteractStatus & INT_STATUS_INTERACTED
             && (!(o->oInteractStatus
                   & INT_STATUS_TOUCHED_BOB_OMB))) // bob-omb explodes when it gets into a cannon
@@ -30,8 +32,8 @@ void opened_cannon_act_0(void) {
         } else
             o->oInteractStatus = 0;
     } else {
-        cur_obj_become_intangible();
-        cur_obj_disable_rendering();
+        //cur_obj_become_intangible();
+        //cur_obj_disable_rendering();
         o->oCannonUnk10C = 0;
     }
 }

src/game/object_helpers.c

@@ -1595,6 +1595,10 @@ void obj_set_billboard(struct Object *obj) {
     obj->header.gfx.node.flags |= GRAPH_RENDER_BILLBOARD;
 }
 
+void obj_set_cylboard(struct Object *obj) {
+    obj->header.gfx.node.flags |= GRAPH_RENDER_CYLBOARD;
+}
+
 void cur_obj_set_hitbox_radius_and_height(f32 radius, f32 height) {
     o->hitboxRadius = radius;
     o->hitboxHeight = height;

src/game/object_helpers.h

@@ -292,6 +292,7 @@ extern void cur_obj_shake_y(f32);
 void cur_obj_start_cam_event(struct Object *obj, s32 cameraEvent);
 // extern ? set_mario_interact_hoot_if_in_range(?);
 void obj_set_billboard(struct Object *a0);
+void obj_set_cylboard(struct Object *a0);
 void cur_obj_set_hitbox_radius_and_height(f32,f32);
 void cur_obj_set_hurtbox_radius_and_height(f32,f32);
 // extern ? obj_spawn_loot_coins(?);

src/game/rendering_graph_node.c

@@ -796,6 +796,9 @@ static void geo_process_object(struct Object *node) {
         if (node->header.gfx.throwMatrix != NULL) {
             mtxf_mul(gMatStack[gMatStackIndex + 1], (void *) node->header.gfx.throwMatrix,
                      gMatStack[gMatStackIndex]);
+        } else if (node->header.gfx.node.flags & GRAPH_RENDER_CYLBOARD) {
+            mtxf_cylboard(gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex],
+                           node->header.gfx.pos, gCurGraphNodeCamera->roll);
         } else if (node->header.gfx.node.flags & GRAPH_RENDER_BILLBOARD) {
             mtxf_billboard(gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex],
                            node->header.gfx.pos, gCurGraphNodeCamera->roll);