Changeset 453 for trunk/src

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

Location:

trunk/src

Files:

• engine/particle_engine.cc (modified) (1 diff)
• rocket/rocket_interface.cc (modified) (1 diff)
• sdl/sdl_audio.cc (modified) (1 diff)

trunk/src/engine/particle_engine.cc

@@ -749 +749 @@
                                         if ( edata.angle > 0.0f )
                                         {
-                                                float emission_angle = glm::radians( edata.angle );
+                                                float emission_angle = math::radians( edata.angle );
                                                 float cos_theta = r.frange( math::cos( emission_angle ), 1.0f );
                                                 float sin_theta = math::sqrt(1.0f - cos_theta * cos_theta );

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 );

trunk/src/sdl/sdl_audio.cc

@@ -75 +75 @@
                         if ( relative != vec3() )
                         {
-                                angle = glm::degrees( -glm::orientedAngle( m_forward, glm::normalize( relative ), m_up ) );
+                                angle = math::degrees( -glm::orientedAngle( m_forward, glm::normalize( relative ), m_up ) );
                                 distance = glm::clamp( 20.0f * glm::length( relative ), 0.0f, 255.0f );
                         }