Refactor mould drawing code. Use shape_query for lighting information