Index: trunk/src/formats/assimp_loader.cc
===================================================================
--- trunk/src/formats/assimp_loader.cc	(revision 442)
+++ trunk/src/formats/assimp_loader.cc	(revision 451)
@@ -139,5 +139,5 @@
 			vec2 s = assimp_st_cast( mesh->mTextureCoords[0][i] );
 
-			glm::vec3 t_i = glm::normalize( t - n * glm::dot( n, t ) );
+			vec3 t_i = glm::normalize( t - n * glm::dot( n, t ) );
 			float det = ( glm::dot( glm::cross( n, t ), b ) );
 			det = ( det < 0.0f ? -1.0f : 1.0f );
@@ -440,6 +440,6 @@
 // 	if ( node->mNumScalingKeys > 0 )
 // 	{
-// 		nv::vec3 scale_vec0 = assimp_vec3_cast( node->mScalingKeys[0].mValue );
-// 		float scale_value   = glm::length( glm::abs( scale_vec0 - nv::vec3(1,1,1) ) );
+// 		vec3 scale_vec0 = assimp_vec3_cast( node->mScalingKeys[0].mValue );
+// 		float scale_value   = glm::length( math::abs( scale_vec0 - vec3(1,1,1) ) );
 // 		if ( node->mNumScalingKeys > 1 || scale_value > 0.001 ) 
 // 		{
Index: trunk/src/formats/md3_loader.cc
===================================================================
--- trunk/src/formats/md3_loader.cc	(revision 442)
+++ trunk/src/formats/md3_loader.cc	(revision 451)
@@ -240,5 +240,5 @@
 	if ( !s_normal_ready )
 	{
-		float pi      = glm::pi<float>();
+		float pi      = math::pi<float>();
 		float convert = (2 * pi) / 255.0f;
 		int n = 0;
@@ -246,11 +246,11 @@
 		{
 			float flat    = lat * convert;
-			float sin_lat = glm::sin( flat );
-			float cos_lat = glm::cos( flat );
+			float sin_lat = math::sin( flat );
+			float cos_lat = math::cos( flat );
 			for ( int lng = 0; lng < 256; ++lng, ++n )
 			{
 				float flng    = lng * convert;
-				float sin_lng = glm::sin( flng );
-				float cos_lng = glm::cos( flng );
+				float sin_lng = math::sin( flng );
+				float cos_lng = math::cos( flng );
 				s_normal_cache[n].x = cos_lat * sin_lng;
 //				s_normal_cache[n].y = sin_lat * sin_lng;