changed notation to match that in GLSL book.
got lighting working.
cleanup
Added more shapes.