added texture mapping for Triangles
merged final changes