Fixed broken ray march. Uniforms not loaded correctly still
Merge conflicts