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

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

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

trunk/src/engine/particle_engine.cc

@@ -577 +577 @@
         case particle_origin::CENTER        : break;
         case particle_origin::TOP_LEFT      : lb = vec2(0.f,-1.f); rt = vec2(1.f,0.f);  break;
-        case particle_origin::TOP_CENTER    : lb.y = -1.f; rt.y = 0.f; break;  break;
+        case particle_origin::TOP_CENTER    : lb.y = -1.f; rt.y = 0.f; break;
         case particle_origin::TOP_RIGHT     : lb = vec2(-1.f,-1.f); rt = vec2(); break;
         case particle_origin::CENTER_LEFT   : lb.x = 0.f; rt.x = 1.f; break;
@@ -663 +663 @@
 {
         if ( info->count > 0 )
-                for ( sint32 i = info->count-1; i >= 0; --i )
+                for ( sint32 i = (sint32)info->count-1; i >= 0; --i )
                 {
                         particle& pinfo = info->particles[i];
@@ -723 +723 @@
                                         {
                                                 float emission_angle = glm::radians( edata.angle );
-                                                float cos_theta = r.frange( cos( emission_angle ), 1.0f );
+                                                float cos_theta = r.frange( glm::cos( emission_angle ), 1.0f );
                                                 float sin_theta = glm::sqrt(1.0f - cos_theta * cos_theta );
                                                 float phi       = r.frange( 0.0f, 2*glm::pi<float>() );