From 1b14dcaeb863b1af118a393efad24c320c534689 Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Sat, 24 Sep 2011 13:22:05 -0400 Subject: [PATCH] cleaning up *Shape constructors --HG-- branch : box2d-update --- src/modules/physics/box2d/ChainShape.cpp | 4 +--- src/modules/physics/box2d/CircleShape.cpp | 3 +-- src/modules/physics/box2d/EdgeShape.cpp | 3 +-- src/modules/physics/box2d/PolygonShape.cpp | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/modules/physics/box2d/ChainShape.cpp b/src/modules/physics/box2d/ChainShape.cpp index f127be479..2f3a3a1ec 100644 --- a/src/modules/physics/box2d/ChainShape.cpp +++ b/src/modules/physics/box2d/ChainShape.cpp @@ -34,10 +34,8 @@ namespace physics namespace box2d { ChainShape::ChainShape(b2ChainShape * c, bool loop) - : loop(loop) + : Shape(c), loop(loop) { - shape = c; - Memoizer::add(shape, this); } ChainShape::~ChainShape() diff --git a/src/modules/physics/box2d/CircleShape.cpp b/src/modules/physics/box2d/CircleShape.cpp index 752f2f94d..a9123a3b9 100644 --- a/src/modules/physics/box2d/CircleShape.cpp +++ b/src/modules/physics/box2d/CircleShape.cpp @@ -33,9 +33,8 @@ namespace physics namespace box2d { CircleShape::CircleShape(b2CircleShape * c) + : Shape(c) { - shape = c; - Memoizer::add(shape, this); } CircleShape::~CircleShape() diff --git a/src/modules/physics/box2d/EdgeShape.cpp b/src/modules/physics/box2d/EdgeShape.cpp index 1e90db188..1416419b1 100644 --- a/src/modules/physics/box2d/EdgeShape.cpp +++ b/src/modules/physics/box2d/EdgeShape.cpp @@ -33,9 +33,8 @@ namespace physics namespace box2d { EdgeShape::EdgeShape(b2EdgeShape * e) + : Shape(e) { - shape = e; - Memoizer::add(shape, this); } EdgeShape::~EdgeShape() diff --git a/src/modules/physics/box2d/PolygonShape.cpp b/src/modules/physics/box2d/PolygonShape.cpp index 62c1a80d2..c77e0106b 100644 --- a/src/modules/physics/box2d/PolygonShape.cpp +++ b/src/modules/physics/box2d/PolygonShape.cpp @@ -34,9 +34,8 @@ namespace physics namespace box2d { PolygonShape::PolygonShape(b2PolygonShape * p) + : Shape(p) { - shape = p; - Memoizer::add(shape, this); } PolygonShape::~PolygonShape()