From a50d651896fe05439fe608711ef296ea4fb1818f Mon Sep 17 00:00:00 2001 From: ketmar Date: Sun, 19 Jan 2014 17:04:28 +0200 Subject: [PATCH] cosmetix --- src/jelly/Body.h | 2 +- src/jelly/World.cpp | 4 ++-- src/jelly/World.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jelly/Body.h b/src/jelly/Body.h index 911a653..d2dd9dd 100644 --- a/src/jelly/Body.h +++ b/src/jelly/Body.h @@ -85,7 +85,7 @@ public: float getClosestPointOnEdgeSquared (const Vector2 &pt, int edgeNum, Vector2 *hitPt, Vector2 *norm, float *edgeD) const; int getClosestPointMass (const Vector2 &pos, float *dist) const; - int getPointMassCount () const { return mPointCount; } + int pointMassCount () const { return mPointCount; } PointMass *getPointMass (int index) { return &mPointMasses[index]; } void addGlobalForce (const Vector2 &pt, const Vector2 &force); diff --git a/src/jelly/World.cpp b/src/jelly/World.cpp index afb445f..9c72bb0 100644 --- a/src/jelly/World.cpp +++ b/src/jelly/World.cpp @@ -415,8 +415,8 @@ void World::_checkAndMoveBoundary (Body::BodyBoundary *bb) { void World::bodyCollide (Body *bA, Body *bB, std::vector &infoList) { - int bApmCount = bA->getPointMassCount(); - int bBpmCount = bB->getPointMassCount(); + int bApmCount = bA->pointMassCount(); + int bBpmCount = bB->pointMassCount(); AABB boxB = bB->getAABB(); // check all PointMasses on bodyA for collision against bodyB. if there is a collision, return detailed info. BodyCollisionInfo infoAway; diff --git a/src/jelly/World.h b/src/jelly/World.h index 6d990af..e645900 100644 --- a/src/jelly/World.h +++ b/src/jelly/World.h @@ -49,12 +49,12 @@ public: void update (float elapsed); - int getMaterialCount () const { return mMaterialCount; } + int materialCount () const { return mMaterialCount; } float getPenetrationThreshold () const { return mPenetrationThreshold; } void setPenetrationThreshold (float val) { mPenetrationThreshold = val; } - int getPenetrationCount () const { return mPenetrationCount; } + int penetrationCount () const { return mPenetrationCount; } private: struct BodyCollisionInfo { -- 2.11.4.GIT