Changeset 520 for trunk/src/engine/particle_manager.cc

Timestamp:

10/03/16 17:45:46 (9 years ago)

Author:

epyon

Message:

• ecs updates
• animation updates
• ragdoll manager
• lua has own random engine
• several minor fixes
• particle engine/particle group
• shitload of other stuff
• bullet world

File:

• trunk/src/engine/particle_manager.cc (modified) (1 diff)

trunk/src/engine/particle_manager.cc

@@ -61 +61 @@
         data->emitter_count   = 0;
         data->affector_count  = 0;
-
-        const_string orientation = table.get_string( "orientation", "point" );
-        if ( orientation == "point" )                     { data->orientation = particle_orientation::POINT; }
-        else if ( orientation == "oriented" )             { data->orientation = particle_orientation::ORIENTED; }
-        else if ( orientation == "oriented_common" )      { data->orientation = particle_orientation::ORIENTED_COMMON; }
-        else if ( orientation == "perpendicular" )        { data->orientation = particle_orientation::PERPENDICULAR; }
-        else if ( orientation == "perpendicular_common" ) { data->orientation = particle_orientation::PERPENDICULAR_COMMON; }
-        else 
-        {
-                NV_LOG_ERROR( "Unknown orientation type! (", orientation, ")!" );
-                data->orientation = particle_orientation::POINT;
-        }
-
-        const_string origin = table.get_string( "origin", "center" );
-        if      ( origin == "center" )        { data->origin = particle_origin::CENTER; }
-        else if ( origin == "top_left" )      { data->origin = particle_origin::TOP_LEFT; }
-        else if ( origin == "top_center" )    { data->origin = particle_origin::TOP_CENTER; }
-        else if ( origin == "top_right" )     { data->origin = particle_origin::TOP_RIGHT; }
-        else if ( origin == "center_left" )   { data->origin = particle_origin::CENTER_LEFT; }
-        else if ( origin == "center_right" )  { data->origin = particle_origin::CENTER_RIGHT; }
-        else if ( origin == "bottom_left" )   { data->origin = particle_origin::BOTTOM_LEFT; }
-        else if ( origin == "bottom_center" ) { data->origin = particle_origin::BOTTOM_CENTER; }
-        else if ( origin == "bottom_right" )  { data->origin = particle_origin::BOTTOM_RIGHT; }
-        else 
-        {
-                NV_LOG_ERROR( "Unknown particle origin! (", origin, ")!" );
-                data->origin = particle_origin::CENTER;
-        }
+        data->orientation     = particle_orientation( table.get_unsigned("orientation", 0) );
+        data->origin          = particle_origin( table.get_unsigned( "origin",0  ) );
 
         data->common_up  = math::normalize( table.get<vec3>("common_up",  vec3(1,0,0) ) );