added bump map calcs
merge