rays, lights, picking
animation merge conflict solved
second room