Move inline geometry functions to header file
Fixed DemoApp compile error from previous commit