summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-08-22 20:05:07 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-08-22 20:05:07 +0000
commitf5891500b0cf957c4821c204365970db0ea6bc05 (patch)
tree3c702370090818f78899edecc359660549a33c86 /legacy
parent5044cf3501cb31c873e1f4db2818012cf6dc757b (diff)
EPhysics: fix indenting and remove useless lines
No need to set to 0 zeroed memory. SVN revision: 75569
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ephysics/src/lib/ephysics_body.cpp4
-rw-r--r--legacy/ephysics/src/lib/ephysics_world.cpp8
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
239 goto err_rigid_body; 239 goto err_rigid_body;
240 } 240 }
241 241
242 body->soft_body = NULL;
243 body->collision_groups = NULL;
244 body->collision_shape = collision_shape; 242 body->collision_shape = collision_shape;
245 body->rigid_body = rigid_body; 243 body->rigid_body = rigid_body;
246 body->mass = mass; 244 body->mass = mass;
@@ -426,7 +424,7 @@ _ephysics_body_soft_body_deform(EPhysics_Body *body, double rate, Evas_Map *map)
426 424
427 _ephysics_body_soft_body_points_distance_get(body, curr_distances); 425 _ephysics_body_soft_body_points_distance_get(body, curr_distances);
428 426
429 for (int m = 0; m < 4; m++) 427 for (int m = 0; m < 4; m++)
430 { 428 {
431 Evas_Coord px, py, pz; 429 Evas_Coord px, py, pz;
432 double dx = 0, dy = 0; 430 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__)
279 279
280 if (world->soft_body_ref) 280 if (world->soft_body_ref)
281 world->dynamics_world->stepSimulation(delta, world->max_sub_steps, 281 world->dynamics_world->stepSimulation(delta, world->max_sub_steps,
282 world->fixed_time_step);
283 else
284 ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
285 delta, world->max_sub_steps,
286 world->fixed_time_step); 282 world->fixed_time_step);
283 else
284 ((btDiscreteDynamicsWorld *)world->dynamics_world)->stepSimulation(
285 delta, world->max_sub_steps, world->fixed_time_step);
287 286
288 world->walking--; 287 world->walking--;
289 288
@@ -562,7 +561,6 @@ ephysics_world_new(void)
562 else 561 else
563 world->dynamics_world->getPairCache()->setOverlapFilterCallback(filter_cb); 562 world->dynamics_world->getPairCache()->setOverlapFilterCallback(filter_cb);
564 563
565 world->soft_body_ref = 0;
566 world->rate = 30; 564 world->rate = 30;
567 world->max_sub_steps = 3; 565 world->max_sub_steps = 3;
568 world->fixed_time_step = 1/60.f; 566 world->fixed_time_step = 1/60.f;