Index: trunk/src/core/random.cc
===================================================================
--- trunk/src/core/random.cc	(revision 454)
+++ trunk/src/core/random.cc	(revision 471)
@@ -21,5 +21,5 @@
 void random::mt_init( uint32 seed )
 {
-	m_state[0] = static_cast<uint32_t>( seed & mt_full_mask );
+	m_state[0] = static_cast<uint32>( seed & mt_full_mask );
 	for ( int i = 1; i < mersenne_n; i++ )
 	{
@@ -111,5 +111,5 @@
 {
 	f32 angle = frand( math::pi<f32>() * 2.f );
-	return vec2( math::cos( angle ), math::sin( angle ) );
+	return vec2( cos( angle ), sin( angle ) );
 }
 
@@ -117,9 +117,9 @@
 {
 	f32 cos_theta = frange( -1.0f, 1.0f );
-	f32 sin_theta = math::sqrt( 1.0f - cos_theta * cos_theta );
+	f32 sin_theta = sqrt( 1.0f - cos_theta * cos_theta );
 	f32 phi       = frand( 2 * math::pi<f32>() );
 	return vec3( 
-		sin_theta * math::sin(phi),
-		sin_theta * math::cos(phi),
+		sin_theta * sin(phi),
+		sin_theta * cos(phi),
 		cos_theta
 		);
@@ -132,12 +132,12 @@
 	if ( r1 > r2 ) swap( r1, r2 );
 	f32 rf = 2* math::pi<f32>()*(r1/r2);
-	return vec2( r2*math::cos( rf ), r2*math::sin( rf ) );
+	return vec2( r2*cos( rf ), r2*sin( rf ) );
 }
 
 nv::vec2 nv::random::precise_disk_point()
 {
-	f32 r = math::sqrt( frand() );
+	f32 r = sqrt( frand() );
 	f32 rangle = frand( math::pi<f32>() );
-	return vec2( r*math::cos( rangle ), r*math::sin( rangle ) );
+	return vec2( r*cos( rangle ), r*sin( rangle ) );
 }
 
@@ -146,11 +146,11 @@
 	f32 rad     = frand();
 	f32 pi      = math::pi<f32>();
-	f32 phi     = math::asin( frange( -1.0f, 1.0f ) ) + pi*.5f;
+	f32 phi     = asin( frange( -1.0f, 1.0f ) ) + pi*.5f;
 	f32 theta   = frange( 0.0f, 2 * math::pi<f32>() );
-	f32 sin_phi = math::sin( phi );
+	f32 sin_phi = sin( phi );
 	return vec3( 
-		rad * math::cos(theta) * sin_phi,
-		rad * math::sin(theta) * sin_phi,
-		rad * math::cos(phi)
+		rad * cos(theta) * sin_phi,
+		rad * sin(theta) * sin_phi,
+		rad * cos(phi)
 	);
 }
@@ -158,11 +158,11 @@
 nv::vec3 nv::random::precise_sphere_point()
 {
-	f32 radius = math::pow( frand(), 1.f/3.f );
+	f32 radius = pow( frand(), 1.f/3.f );
 	f32 cos_theta = frange( -1.0f, 1.0f );
-	f32 sin_theta = math::sqrt( 1.0f - cos_theta * cos_theta );
+	f32 sin_theta = sqrt( 1.0f - cos_theta * cos_theta );
 	f32 phi       = frange( 0.0f, 2 * math::pi<f32>() );
 	return vec3( 
-		radius * sin_theta * math::sin(phi),
-		radius * sin_theta * math::cos(phi),
+		radius * sin_theta * sin(phi),
+		radius * sin_theta * cos(phi),
 		radius * cos_theta
 		);
@@ -203,5 +203,5 @@
 	f32 idist2 = iradius * iradius;
 	f32 odist2 = oradius * oradius;
-	f32 rdist  = math::sqrt( frange( idist2, odist2 ) );
+	f32 rdist  = sqrt( frange( idist2, odist2 ) );
 	return rdist * precise_unit_vec2();
 }
@@ -216,5 +216,5 @@
 	f32 idist3 = iradius * iradius * iradius;
 	f32 odist3 = oradius * oradius * oradius;
-	f32 rdist  = math::pow( frange( idist3, odist3 ), 1.f/3.f );
+	f32 rdist  = pow( frange( idist3, odist3 ), 1.f/3.f );
 	return rdist * precise_unit_vec3();
 }
@@ -237,5 +237,5 @@
 	f32 idist2 = ((iradii2.x * iradii2.y) / low ) * odist2;
 
-	f32 rdist     = math::sqrt( frange( idist2, odist2 ) );
+	f32 rdist     = sqrt( frange( idist2, odist2 ) );
 	return odir * rdist;	
 }
@@ -260,8 +260,8 @@
 	f32 idist2 = ((iradii2.x * iradii2.y * iradii2.z) / low ) * odist2;
 
-	f32 odist3 = odist2 * math::sqrt( odist2 );
-	f32 idist3 = idist2 * math::sqrt( idist2 );
-
-	f32 rdist     = math::pow( frange( idist3, odist3 ), 1.f/3.f );
+	f32 odist3 = odist2 * sqrt( odist2 );
+	f32 idist3 = idist2 * sqrt( idist2 );
+
+	f32 rdist     = pow( frange( idist3, odist3 ), 1.f/3.f );
 	return odir * rdist;	
 }