fixed Rectangle rounding issue, fixed Triangle lighting issue
fixed Rectangle rounding issues, fixed Triangle lighting issue
merged changes