Fixed define order.  Switched raymarch over to material struct.