Changeset 453 for trunk/src/rocket

Timestamp:

07/30/15 20:49:02 (10 years ago)

Author:

epyon

Message:

• added math/degrees and radians
• added math/geometric - not used yet due to dual template parameters of vectors

File:

• trunk/src/rocket/rocket_interface.cc (modified) (1 diff)

trunk/src/rocket/rocket_interface.cc

@@ -273 +273 @@
         nv::vertex_array m_va = m_context->create_vertex_array( rv, num_vertices, (unsigned*)indices, num_indices, nv::STATIC_DRAW );
         //if ( info )   m_device->set_uniform( m_program, "texsize", nv::vec2( info->size ) );
-        m_state.set_model( glm::translate( glm::mat4(), nv::vec3( translation.x, translation.y, 0.0f ) ) );
+        m_state.set_model( nv::math::translate( nv::mat4(), nv::vec3( translation.x, translation.y, 0.0f ) ) );
         m_context->draw( nv::TRIANGLES, m_rstate, m_state, m_program, m_va, num_indices );
         m_context->release( m_va );