shadow overhaul

src/game/shadow.h

@@ -4,52 +4,96 @@
 #include <PR/ultratypes.h>
 #include <PR/gbi.h>
 
+#include "types.h"
+
 /**
  * Shadow types. Shadows are circles, squares, or hardcoded rectangles, and
  * can be composed of either 4 or 9 vertices.
  */
-enum ShadowType
-{
-    SHADOW_CIRCLE_9_VERTS             =  0,
-    SHADOW_CIRCLE_4_VERTS             =  1,
-    SHADOW_CIRCLE_4_VERTS_FLAT_UNUSED =  2,
-    SHADOW_SQUARE_PERMANENT           = 10,
-    SHADOW_SQUARE_SCALABLE            = 11,
-    SHADOW_SQUARE_TOGGLABLE           = 12,
+enum ShadowType {
+    SHADOW_CIRCLE           = 0,
+    SHADOW_CIRCLE_PLAYER    = SHADOW_CIRCLE,
+    SHADOW_CIRCLE_4_VERTS   = SHADOW_CIRCLE,
+    SHADOW_CIRCLE_9_VERTS   = SHADOW_CIRCLE,
+    SHADOW_SQUARE           = 1,
+    SHADOW_SQUARE_PERMANENT = 2,
+    SHADOW_SQUARE_SCALABLE  = SHADOW_SQUARE,
+    SHADOW_SQUARE_TOGGLABLE = SHADOW_SQUARE,
     /**
      * This defines an offset after which rectangular shadows with custom
      * widths and heights can be defined.
      */
-    SHADOW_RECTANGLE_HARDCODED_OFFSET = 50,
-    SHADOW_CIRCLE_PLAYER              = 99
+    SHADOW_RECTANGLE_HARDCODED_OFFSET = 10,
+    SHADOW_RECTANGLE_SPINDEL          = (0 + SHADOW_RECTANGLE_HARDCODED_OFFSET),
+    SHADOW_RECTANGLE_WHOMP            = (1 + SHADOW_RECTANGLE_HARDCODED_OFFSET),
 };
 
-#define SHADOW_FLAGS_NONE         (0 << 0)
-/**
- * Flag for if the current shadow is above water or lava.
- */
-#define SHADOW_FLAG_WATER_BOX     (1 << 0)
-#define SHADOW_FLAG_WATER_SURFACE (1 << 1)
-/**
- * Flag for if Mario is on ice or a flying carpet.
- */
-#define SHADOW_FLAG_ICE_CARPET    (1 << 2)
-/**
- * Flag for if Mario is on a flying carpet.
- */
-#define SHADOW_FLAG_RAISED        (1 << 3)
-
-extern s8 gShadowFlags;
+enum ShadowFlags {
+    SHADOW_FLAGS_NONE         = (0 << 0),
+    // Flag for if the current shadow is above water or lava.
+    SHADOW_FLAG_WATER_BOX     = (1 << 0),
+    SHADOW_FLAG_WATER_SURFACE = (1 << 1),
+    // Flag for if Mario is on ice.
+    SHADOW_FLAG_ICE           = (1 << 2),
+    // Flag for if Mario is on a flying carpet.
+    SHADOW_FLAG_CARPET        = (1 << 3),
+};
+#define SHADOW_FLAGS_TRANSPARENT (SHADOW_FLAG_WATER_BOX | SHADOW_FLAG_WATER_SURFACE | SHADOW_FLAG_ICE | SHADOW_FLAG_CARPET)
 
 /**
- * The surface type below the current shadow.
+ * Encapsulation of information about a shadow.
  */
-extern s16 sSurfaceTypeBelowShadow;
+struct Shadow {
+    /* The y-position of the floor (or water or lava) underneath the object. */
+    f32 floorHeight;
+    /* The floor underneath the object. */
+    struct Surface *floor;
+    /* Normal vector of the floor. */
+    Vec3f floorNormal;
+    /* Size of the shadow. */
+    Vec3f scale;
+    /* Initial solidity of the shadow, from 0 to 255 (just an alpha value). */
+    Alpha solidity;
+    /* Various flags. */
+    s8 flags;
+};
+
+enum ShadowSolidity {
+    /**
+     * Constant to indicate that a shadow should not be drawn.
+     * This is used to disable shadows during specific frames of Mario's
+     * animations.
+     */
+    SHADOW_SOLIDITY_NO_SHADOW,
+    /**
+     * Constant to indicate that a shadow's solidity has been pre-set by a previous
+     * function and should not be overwritten.
+     */
+    SHADOW_SOILDITY_ALREADY_SET,
+    /**
+     * Constant to indicate that a shadow's solidity has not yet been set.
+     */
+    SHADOW_SOLIDITY_NOT_YET_SET,
+};
+
+/**
+ * A struct containing info about hardcoded rectangle shadows.
+ */
+typedef struct {
+    /* X scale of the rectangle. */
+    f32 scaleX;
+    /* Z scale of the rectangle. */
+    f32 scaleZ;
+    /* Flag for if this shadow be smaller when its object is further away. */
+    u8 scaleWithDistance : 1;
+} ShadowRectangle;
+
+extern struct Shadow gCurrShadow;
 
 /**
  * Given the (x, y, z) location of an object, create a shadow below that object
  * with the given initial solidity and "shadowType" (described above).
  */
-Gfx *create_shadow_below_xyz(f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 shadowSolidity, s8 shadowType);
+Gfx *create_shadow_below_xyz(Vec3f pos, s16 shadowScale, u8 shadowSolidity, s8 shadowType);
 
 #endif // SHADOW_H