Changeset 471 for trunk/src/engine/particle_engine.cc

Timestamp:

09/21/15 19:13:26 (10 years ago)

Author:

epyon

Message:

• full math library
• GLM dependency removed

File:

• trunk/src/engine/particle_engine.cc (modified) (2 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     = -math::dot( datap->plane_normal, datap->plane_point ) / math::sqrt( math::dot( datap->plane_normal, datap->plane_normal ) );
+        datap->distance     = -math::dot( datap->plane_normal, datap->plane_point ) / sqrt( math::dot( datap->plane_normal, datap->plane_normal ) );
         return true;
 }
@@ -751 +751 @@
                                         {
                                                 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 );
+                                                float cos_theta = r.frange( cos( emission_angle ), 1.0f );
+                                                float sin_theta = sqrt(1.0f - cos_theta * cos_theta );
                                                 float phi       = r.frange( 0.0f, 2* math::pi<float>() );
                                                 pinfo.velocity  = orient * 
-                                                        ( edata.odir * ( math::cos(phi) * sin_theta ) +
-                                                        edata.cdir * ( math::sin(phi)*sin_theta ) +
+                                                        ( edata.odir * ( cos(phi) * sin_theta ) +
+                                                        edata.cdir * ( sin(phi)*sin_theta ) +
                                                         edata.dir  * cos_theta );
                                         }