Browse Source

Fixed warning.

aster2013 11 years ago
parent
commit
a9afb47a7e

+ 1 - 1
Source/Engine/Urho2D/ParticleEmitter2D.cpp

@@ -135,7 +135,7 @@ void ParticleEmitter2D::SetModel(ParticleModel2D* model)
 
 
     lifeTime_ = model_->GetDuration();
     lifeTime_ = model_->GetDuration();
 
 
-    numParticles_ = Min(model_->GetMaxParticles(), numParticles_);    
+    numParticles_ = Min((int)model_->GetMaxParticles(), (int)numParticles_);    
     particles_.Resize(model_->GetMaxParticles());
     particles_.Resize(model_->GetMaxParticles());
     vertices_.Reserve(model_->GetMaxParticles() * 4);
     vertices_.Reserve(model_->GetMaxParticles() * 4);
 
 

+ 1 - 1
Source/Engine/Urho2D/ParticleModel2D.cpp

@@ -160,7 +160,7 @@ bool ParticleModel2D::Load(Deserializer& source)
     sourcePositionVariance_.x_ = keyValueMapping["sourcePositionVariancex"].GetFloat();
     sourcePositionVariance_.x_ = keyValueMapping["sourcePositionVariancex"].GetFloat();
     sourcePositionVariance_.y_ = keyValueMapping["sourcePositionVariancey"].GetFloat();    
     sourcePositionVariance_.y_ = keyValueMapping["sourcePositionVariancey"].GetFloat();    
 
 
-    maxParticles_ = (int)keyValueMapping["maxParticles"].GetFloat();
+    maxParticles_ = (unsigned)keyValueMapping["maxParticles"].GetFloat();
     particleLifeSpan_ = keyValueMapping["particleLifespan"].GetFloat();
     particleLifeSpan_ = keyValueMapping["particleLifespan"].GetFloat();
 
 
     particleLifeSpanVariance_ = keyValueMapping["particleLifespanVariance"].GetFloat();
     particleLifeSpanVariance_ = keyValueMapping["particleLifespanVariance"].GetFloat();

+ 2 - 2
Source/Engine/Urho2D/ParticleModel2D.h

@@ -66,7 +66,7 @@ public:
     /// Return source position variance.
     /// Return source position variance.
     const Vector2& GetSourcePositionVariance() const { return sourcePositionVariance_; }
     const Vector2& GetSourcePositionVariance() const { return sourcePositionVariance_; }
     /// Return max particles.
     /// Return max particles.
-    int GetMaxParticles() const { return maxParticles_; }
+    unsigned GetMaxParticles() const { return maxParticles_; }
     /// Return particle lifespan
     /// Return particle lifespan
     float GetParticleLifeSpan() const { return particleLifeSpan_; }
     float GetParticleLifeSpan() const { return particleLifeSpan_; }
     /// Return particle lifespan variance.
     /// Return particle lifespan variance.
@@ -128,7 +128,7 @@ private:
     /// Source position variance.
     /// Source position variance.
     Vector2 sourcePositionVariance_;
     Vector2 sourcePositionVariance_;
     /// Max particles.
     /// Max particles.
-    int maxParticles_;
+    unsigned maxParticles_;
     /// Particle lifespan
     /// Particle lifespan
     float particleLifeSpan_;
     float particleLifeSpan_;
     /// Particle lifespan variance.
     /// Particle lifespan variance.