Bladeren bron

# fix gcc compile errors

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1134 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 13 jaren geleden
bovenliggende
commit
8252a31e82
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      code/IFCCurve.cpp
  2. 1 1
      code/IRRLoader.cpp

+ 2 - 2
code/IFCCurve.cpp

@@ -120,7 +120,7 @@ public:
 	// --------------------------------------------------
 	// --------------------------------------------------
 	IfcVector3 Eval(IfcFloat u) const {
 	IfcVector3 Eval(IfcFloat u) const {
 		u = -conv.angle_scale * u;
 		u = -conv.angle_scale * u;
-		return location + entity.Radius*(::cos(u)*p[0] + ::sin(u)*p[1]);
+		return location + entity.Radius*(static_cast<IfcFloat>(::cos(u))*p[0] + static_cast<IfcFloat>(::sin(u))*p[1]);
 	}
 	}
 
 
 private:
 private:
@@ -148,7 +148,7 @@ public:
 	// --------------------------------------------------
 	// --------------------------------------------------
 	IfcVector3 Eval(IfcFloat u) const {
 	IfcVector3 Eval(IfcFloat u) const {
 		u = -conv.angle_scale * u;
 		u = -conv.angle_scale * u;
-		return location + entity.SemiAxis1*::cos(u)*p[0] + entity.SemiAxis2*::sin(u)*p[1];
+		return location + entity.SemiAxis1*static_cast<IfcFloat>(::cos(u))*p[0] + entity.SemiAxis2*static_cast<IfcFloat>(::sin(u))*p[1];
 	}
 	}
 
 
 private:
 private:

+ 1 - 1
code/IRRLoader.cpp

@@ -457,7 +457,7 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
 					key.mTime = i * tdelta;
 					key.mTime = i * tdelta;
 
 
 					const float t = (float) ( in.speed * key.mTime );
 					const float t = (float) ( in.speed * key.mTime );
-					key.mValue = in.circleCenter  + in.circleRadius * ((vecU*::cos(t)) + (vecV*::sin(t)));
+					key.mValue = in.circleCenter  + in.circleRadius * ((vecU*::cosf(t)) + (vecV*::sinf(t)));
 				}
 				}
 
 
 				// This animation is repeated and repeated ...
 				// This animation is repeated and repeated ...