Changeset 501 for trunk/nv/interface/camera.hh

Timestamp:

06/15/16 18:34:37 (9 years ago)

Author:

epyon

Message:

• particle engine updates
• device/context redesign
• caching of GL state - texture bindings and programs
• camera view_perspective and view_perspective_inv

File:

• trunk/nv/interface/camera.hh (modified) (1 diff)

trunk/nv/interface/camera.hh

@@ -84 +84 @@
                 const mat4& get_view()       const { return m_camera.get_view(); }
                 const mat4& get_projection() const { return m_camera.get_projection(); }
-                mat4 get_modelview()  const { return get_view() * m_model; }
-                mat4 get_mvp()        const { return m_camera.get_projection() * get_modelview(); }
+                mat4 get_viewprojection() const { return m_camera.get_projection() * get_view(); }
+                mat4 get_modelview()      const { return get_view() * m_model; }
+                mat4 get_mvp()            const { return m_camera.get_projection() * get_modelview(); }
 
                 mat4 get_view_inv()       const { return math::inverse( get_view() ); }
                 mat4 get_model_inv()      const { return math::inverse( get_model() ); }
                 mat4 get_modelview_inv()  const { return math::inverse( get_modelview() ); }
-                mat4 get_projection_inv() const { return math::inverse( get_projection() ); }
+                mat4 get_projection_inv()     const { return math::inverse( get_projection() ); }
+                mat4 get_viewprojection_inv() const { return math::inverse( get_viewprojection() ); }
                 mat4 get_mvp_inv()        const { return math::inverse( get_mvp() ); }
                 mat3 get_normal()         const { return math::transpose( math::inverse( mat3( get_modelview() ) ) ); }