Bug Fix: allocator requires class not a fundamental type

vegastrike · Oct 29, 2023 · b4a6976 · b4a6976
1 parent 05a00be
commit b4a6976
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/engine/src/gfx/particle.cpp b/engine/src/gfx/particle.cpp
@@ -365,13 +365,13 @@ void ParticleTrail::DrawAndUpdate()
     vector< Vector, aligned_allocator<Vector> >::iterator v = particleVel.begin();
     vector< QVector, aligned_allocator<QVector> >::iterator loc = particleLoc.begin();
     vector< GFXColor, aligned_allocator<GFXColor> >::iterator col = particleColor.begin();
-    vector< float, aligned_allocator<float> >::iterator sz = particleSize.begin();
+    auto sz = particleSize.begin();
     while ( col != particleColor.end() ) {
         if ( !(col->a > minalpha) ) {
             vector< Vector, aligned_allocator<Vector> >::iterator vlast = particleVel.end() - 1;
             vector< QVector, aligned_allocator<QVector> >::iterator loclast = particleLoc.end() - 1;
             vector< GFXColor, aligned_allocator<GFXColor> >::iterator collast = particleColor.end() - 1;
-            vector< float, aligned_allocator<float> >::iterator szlast = particleSize.end() - 1;
+            auto szlast = particleSize.end() - 1;
             if (col != collast) {
                 *v = *vlast;
                 *loc = *loclast;
@@ -406,7 +406,7 @@ void ParticleTrail::AddParticle( const ParticlePoint &P, const Vector &V, float
         vector< Vector, aligned_allocator<Vector> >::iterator vel = particleVel.begin();
         vector< QVector, aligned_allocator<QVector> >::iterator loc = particleLoc.begin();
         vector< GFXColor, aligned_allocator<GFXColor> >::iterator col = particleColor.begin();
-        vector< float, aligned_allocator<float> >::iterator sz = particleSize.begin();
+        auto sz = particleSize.begin();
         size_t off = ( (size_t) rand() ) % particleLoc.size();
         vel += off;
         loc += off;

diff --git a/engine/src/gfx/particle.h b/engine/src/gfx/particle.h
@@ -53,7 +53,7 @@ class ParticleTrail
     std::vector< Vector, aligned_allocator<Vector> > particleVel;
     std::vector< QVector, aligned_allocator<QVector> > particleLoc;
     std::vector< GFXColor, aligned_allocator<GFXColor> > particleColor;
-    std::vector< float, aligned_allocator<float> > particleSize;
+    std::vector< float > particleSize;
     std::vector< float > particleVert;
     std::vector< float > distances;
     std::vector< unsigned short > pointIndices;