Merge remote-tracking branch 'upstream/master'

2017-06-02 18:26:04 -07:00
parent 0a29c8d9af 518c7ec00e
commit bfcbb339cf
126 changed files with 111577 additions and 2758 deletions
--- a/examples/OpenGLWindow/SimpleCamera.cpp
+++ b/examples/OpenGLWindow/SimpleCamera.cpp
@@ -415,3 +415,13 @@ float SimpleCamera::getCameraFrustumNear() const
 {
    return m_data->m_frustumZNear;
 }
+
+void SimpleCamera::setCameraFrustumFar(float far)
+{
+	m_data->m_frustumZFar = far;
+}
+
+void SimpleCamera::setCameraFrustumNear(float near)
+{
+	m_data->m_frustumZNear = near;
+}