Changeset 451 for trunk/src/engine

Timestamp:

07/30/15 19:47:02 (10 years ago)

Author:

epyon

Message:

• math library started

File:

• trunk/src/engine/particle_engine.cc (modified) (3 diffs)

trunk/src/engine/particle_engine.cc

@@ -231 +231 @@
         datap->plane_normal = normalize_safe( datap->plane_normal, vec3(0.0f,1.0f,0.0f) );
         datap->bounce       = table->get<float>("bounce", 0.0f );
-        datap->distance     = -glm::dot( datap->plane_normal, datap->plane_point ) / glm::sqrt(glm::dot( datap->plane_normal, datap->plane_normal ) );
+        datap->distance     = -glm::dot( datap->plane_normal, datap->plane_point ) / math::sqrt(glm::dot( datap->plane_normal, datap->plane_normal ) );
         return true;
 }
@@ -411 +411 @@
                                 edata.dir          = glm::normalize( element.get<vec3>("direction", vec3(0,1,0) ) );
                                 
-                                edata.odir = glm::vec3( 0, 0, 1 );
+                                edata.odir = vec3( 0, 0, 1 );
                                 if ( edata.dir != vec3( 0, 1, 0 ) && edata.dir != vec3( 0, -1, 0 ) )
                                         edata.odir = glm::normalize( glm::cross( edata.dir, vec3( 0, 1, 0 ) ) );                edata.cdir = glm::cross( edata.dir, edata.odir );
@@ -750 +750 @@
                                         {
                                                 float emission_angle = glm::radians( edata.angle );
-                                                float cos_theta = r.frange( glm::cos( emission_angle ), 1.0f );
-                                                float sin_theta = glm::sqrt(1.0f - cos_theta * cos_theta );
-                                                float phi       = r.frange( 0.0f, 2*glm::pi<float>() );
+                                                float cos_theta = r.frange( math::cos( emission_angle ), 1.0f );
+                                                float sin_theta = math::sqrt(1.0f - cos_theta * cos_theta );
+                                                float phi       = r.frange( 0.0f, 2* math::pi<float>() );
                                                 pinfo.velocity  = orient * 
-                                                        ( edata.odir * ( glm::cos(phi) * sin_theta ) +
-                                                        edata.cdir * ( glm::sin(phi)*sin_theta ) + 
+                                                        ( edata.odir * ( math::cos(phi) * sin_theta ) +
+                                                        edata.cdir * ( math::sin(phi)*sin_theta ) +
                                                         edata.dir  * cos_theta );
                                         }