Changeset 453 for trunk

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

Files:

• nv/core/arcball.hh (modified) (1 diff)
• nv/interface/camera.hh (modified) (1 diff)
• nv/stl/math.hh (modified) (1 diff)
• nv/stl/math/common.hh (modified) (3 diffs)
• nv/stl/math/constants.hh (modified) (1 diff)
• nv/stl/math/geometric.hh (added)
• src/engine/particle_engine.cc (modified) (1 diff)
• src/rocket/rocket_interface.cc (modified) (1 diff)
• src/sdl/sdl_audio.cc (modified) (1 diff)

trunk/nv/core/arcball.hh

@@ -50 +50 @@
                         vec3 vb = get_arcball_vector( nposition );
 
-                        m_angle = math::acos( glm::min( 1.0f, glm::dot( va, vb ) ) );
+                        m_angle = math::acos( glm::min( 1.0f, math::dot( va, vb ) ) );
                         m_axis  = glm::cross( va, vb );
                         m_last  = nposition;

trunk/nv/interface/camera.hh

@@ -33 +33 @@
                 void set_perspective( f32 fov, f32 aspect, f32 near, f32 far )
                 {
-                        m_projection = math::perspective( glm::radians( fov ), aspect, near, far );
+                        m_projection = math::perspective( math::radians( fov ), aspect, near, far );
                 }
                 void set_ortho( f32 left, f32 right, f32 bottom, f32 top, f32 near = -1.0f, f32 far = 1.0f )

trunk/nv/stl/math.hh

@@ -13 +13 @@
 #include <nv/stl/math/common.hh>
 #include <nv/stl/math/constants.hh>
+#include <nv/stl/math/geometric.hh>
 #include <nv/stl/math/matrix_transform.hh>
 #include <nv/stl/math/cast.hh>

trunk/nv/stl/math/common.hh

@@ -15 +15 @@
 
 #include <nv/common.hh>
+#include <nv/stl/type_traits/common.hh>
 
 #if NV_COMPILER == NV_GNUC
@@ -44 +45 @@
                 using ::floor;
                 using ::ceil;
+                using ::round;
 #if 0
                 template < typename T > using tvec2 = ::glm::detail::tvec2<T, glm::precision::highp>;
@@ -65 +67 @@
                 using glm::ctor;
         }
+
+        template < typename T >
+        struct is_math_vector : false_type {};
+
+        template < typename T >
+        struct is_math_matrix : false_type {};
+
+        template < typename T >
+        struct is_math_quat : false_type {};
+
+        template < typename T >
+        struct is_math_class : bool_constant< 
+                is_math_vector< T >::value || 
+                is_math_matrix< T >::value ||
+                is_math_quat< T >::value
+        > {};
+
+        template < typename T > struct is_math_vector< math::tvec2< T > > : true_type {};
+        template < typename T > struct is_math_vector< math::tvec3< T > > : true_type {};
+        template < typename T > struct is_math_vector< math::tvec4< T > > : true_type {};
+        template < typename T > struct is_math_matrix< math::tmat2< T > > : true_type {};
+        template < typename T > struct is_math_matrix< math::tmat3< T > > : true_type {};
+        template < typename T > struct is_math_matrix< math::tmat4< T > > : true_type {};
+        template < typename T > struct is_math_quat  < math::tquat< T > > : true_type {};
 
         typedef math::tvec2<sint8> i8vec2;

trunk/nv/stl/math/constants.hh

@@ -197 +197 @@
                 }
 
+                template < typename T >
+                constexpr T radians( T degrees )
+                {
+                        static_assert( is_floating_point<T>::value, "Type expected to be floating point!" );
+                        return degrees * static_cast<T>( 0.01745329251994329576923690768489 );
+                }
+
+                template < typename T >
+                constexpr T degrees( T radians )
+                {
+                        static_assert( is_floating_point<T>::value, "Type expected to be floating point!" );
+                        return radians * static_cast<T>( 57.295779513082320876798154814105 );
+                }
+
         }
 }

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