Compute light in world space

Change-Id: I1683c53d05dab7af890c00ac55c9963afc6d0df3
Made the code consistent

Change-Id: I7c13ad6ec781c46fe4ef239fe439c0721a1e6068