LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switched get/setMeter from being a World method to a love.physics function

Browse Source 
--HG--
branch : box2d-update
This commit is contained in:
Bill Meltsner
2011-09-15 16:13:54 -04:00
parent 1fa99d022a
commit e69cafe868
22 changed files with 270 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/Shape.cpp
+19 -18
View File
@@ -23,6 +23,7 @@
// Module
#include "Body.h"
#include "World.h"
#include "Physics.h"
// STD
#include <bitset>
@@ -33,8 +34,8 @@ namespace physics
{
namespace box2d
{
Shape::Shape(World * world)
: world(world), shape(NULL)
Shape::Shape()
: shape(NULL)
{
}
@@ -62,7 +63,7 @@ namespace box2d
float Shape::getRadius() const
{
return world->scaleUp(shape->m_radius);
return Physics::scaleUp(shape->m_radius);
}
int Shape::getChildCount() const
@@ -73,19 +74,19 @@ namespace box2d
bool Shape::testPoint(float x, float y, float r, float px, float py) const
{
b2Vec2 point(px, py);
b2Transform transform(world->scaleDown(b2Vec2(x, y)), b2Rot(r));
return shape->TestPoint(transform, world->scaleDown(point));
b2Transform transform(Physics::scaleDown(b2Vec2(x, y)), b2Rot(r));
return shape->TestPoint(transform, Physics::scaleDown(point));
}
int Shape::rayCast(lua_State * L) const
{
float p1x = world->scaleDown((float)luaL_checknumber(L, 1));
float p1y = world->scaleDown((float)luaL_checknumber(L, 2));
float p2x = world->scaleDown((float)luaL_checknumber(L, 3));
float p2y = world->scaleDown((float)luaL_checknumber(L, 4));
float p1x = Physics::scaleDown((float)luaL_checknumber(L, 1));
float p1y = Physics::scaleDown((float)luaL_checknumber(L, 2));
float p2x = Physics::scaleDown((float)luaL_checknumber(L, 3));
float p2y = Physics::scaleDown((float)luaL_checknumber(L, 4));
float maxFraction = (float)luaL_checknumber(L, 5);
float x = world->scaleDown((float)luaL_checknumber(L, 6));
float y = world->scaleDown((float)luaL_checknumber(L, 7));
float x = Physics::scaleDown((float)luaL_checknumber(L, 6));
float y = Physics::scaleDown((float)luaL_checknumber(L, 7));
float r = (float)luaL_checknumber(L, 8);
int childIndex = (int)luaL_optint(L, 9, 0);
b2RayCastInput input;
@@ -95,22 +96,22 @@ namespace box2d
b2Transform transform(b2Vec2(x, y), b2Rot(r));
b2RayCastOutput output;
shape->RayCast(&output, input, transform, childIndex);
lua_pushnumber(L, world->scaleUp(output.normal.x));
lua_pushnumber(L, world->scaleUp(output.normal.y));
lua_pushnumber(L, Physics::scaleUp(output.normal.x));
lua_pushnumber(L, Physics::scaleUp(output.normal.y));
lua_pushnumber(L, output.fraction);
return 3;
}
int Shape::computeAABB(lua_State * L) const
{
float x = world->scaleDown((float)luaL_checknumber(L, 1));
float y = world->scaleDown((float)luaL_checknumber(L, 2));
float x = Physics::scaleDown((float)luaL_checknumber(L, 1));
float y = Physics::scaleDown((float)luaL_checknumber(L, 2));
float r = (float)luaL_checknumber(L, 3);
int childIndex = (int)luaL_optint(L, 4, 0);
b2Transform transform(b2Vec2(x, y), b2Rot(r));
b2AABB box;
shape->ComputeAABB(&box, transform, childIndex);
box = world->scaleUp(box);
box = Physics::scaleUp(box);
lua_pushnumber(L, box.lowerBound.x);
lua_pushnumber(L, box.lowerBound.y);
lua_pushnumber(L, box.upperBound.x);
@@ -120,10 +121,10 @@ namespace box2d
int Shape::computeMass(lua_State * L) const
{
float density = world->scaleDown((float)luaL_checknumber(L, 1));
float density = Physics::scaleDown((float)luaL_checknumber(L, 1));
b2MassData data;
shape->ComputeMass(&data, density);
b2Vec2 center = world->scaleUp(data.center);
b2Vec2 center = Physics::scaleUp(data.center);
lua_pushnumber(L, center.x);
lua_pushnumber(L, center.y);
lua_pushnumber(L, data.mass);