Changeset 374 for trunk/src/engine/particle_engine.cc

Timestamp:

05/26/15 17:35:06 (10 years ago)

Author:

epyon

Message:

• MASSIVE commit
• common.hh - size_t, ptrdiff_t, nv:: namespace, NV_ALIGN_OF and basic template tools
• STL - algorithm.hh, iterator.hh, limits.hh, numeric.hh and type_info.hh
• STL - updates to memory, array and string

File:

• trunk/src/engine/particle_engine.cc (modified) (3 diffs)

trunk/src/engine/particle_engine.cc

@@ -7 +7 @@
 #include <nv/interface/device.hh>
 #include <nv/core/random.hh>
+#include <nv/stl/utility.hh>
 #include <nv/lua/lua_glm.hh>
 #include <nv/core/logging.hh>
-#include <cmath>
 
 static const char *nv_particle_engine_vertex_shader_world =
@@ -203 +203 @@
         if ( datap->average )
         {
-                float norm_factor = glm::min( factor, 1.0f );
+                float norm_factor = nv::min( factor, 1.0f );
                 for ( uint32 i = 0; i < count; ++i ) 
                         p[i].velocity = datap->force_vector * norm_factor + p[i].velocity * ( 1.0f - norm_factor );
@@ -696 +696 @@
                         {
                                 info->count--;
-                                std::swap( info->particles[i], info->particles[info->count] );
+                                swap( info->particles[i], info->particles[info->count] );
                         }
                 }