Changed the alternation between geometries

Now uses a compile-time #DEFINE as opposed to a SWITCH.

Signed-off-by: JP-Ellis <coujellis@gmail.com>