I don't know exactly if this is what you are looking for or if it's at the right level, but you might want to have a look at the first three chapters of John Ratcliffe's _Foundations of Hyperbolic Manifolds_. They concern Euclidean, spherical and hyperbolic geometry (with sections about trigonometry), and the book is modern and (in my opinion) well-writen.