From f5891500b0cf957c4821c204365970db0ea6bc05 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Wed, 22 Aug 2012 20:05:07 +0000 Subject: [PATCH] EPhysics: fix indenting and remove useless lines No need to set to 0 zeroed memory. SVN revision: 75569 --- legacy/ephysics/src/lib/ephysics_body.cpp | 4 +--- legacy/ephysics/src/lib/ephysics_world.cpp | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/legacy/ephysics/src/lib/ephysics_body.cpp b/legacy/ephysics/src/lib/ephysics_body.cpp index 505dfe6534..18d1caab55 100644 --- a/legacy/ephysics/src/lib/ephysics_body.cpp +++ b/legacy/ephysics/src/lib/ephysics_body.cpp @@ -239,8 +239,6 @@ _ephysics_body_add(EPhysics_World *world, btCollisionShape *collision_shape, con goto err_rigid_body; } - body->soft_body = NULL; - body->collision_groups = NULL; body->collision_shape = collision_shape; body->rigid_body = rigid_body; body->mass = mass; @@ -426,7 +424,7 @@ _ephysics_body_soft_body_deform(EPhysics_Body *body, double rate, Evas_Map *map) _ephysics_body_soft_body_points_distance_get(body, curr_distances); - for (int m = 0; m < 4; m++) + for (int m = 0; m < 4; m++) { Evas_Coord px, py, pz; double dx = 0, dy = 0; diff --git a/legacy/ephysics/src/lib/ephysics_world.cpp b/legacy/ephysics/src/lib/ephysics_world.cpp index 157cd219b8..db5b4430da 100644 --- a/legacy/ephysics/src/lib/ephysics_world.cpp +++ b/legacy/ephysics/src/lib/ephysics_world.cpp @@ -279,11 +279,10 @@ _simulate_worlds(void *data __UNUSED__) if (world->soft_body_ref) world->dynamics_world->stepSimulation(delta, world->max_sub_steps, - world->fixed_time_step); - else - ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation( - delta, world->max_sub_steps, world->fixed_time_step); + else + ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation( + delta, world->max_sub_steps, world->fixed_time_step); world->walking--; @@ -562,7 +561,6 @@ ephysics_world_new(void) else world->dynamics_world->getPairCache()->setOverlapFilterCallback(filter_cb); - world->soft_body_ref = 0; world->rate = 30; world->max_sub_steps = 3; world->fixed_time_step = 1/60.f;