LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02: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/Contact.cpp
+8 -7
View File
@@ -20,6 +20,7 @@
#include "Contact.h"
#include "World.h"
#include "Physics.h"
namespace love
{
@@ -41,30 +42,30 @@ namespace box2d
int Contact::getPosition(lua_State * L)
{
love::luax_assert_argc(L, 1, 1);
lua_pushnumber(L, world->scaleUp(point.position.x));
lua_pushnumber(L, world->scaleUp(point.position.y));
lua_pushnumber(L, Physics::scaleUp(point.position.x));
lua_pushnumber(L, Physics::scaleUp(point.position.y));
return 2;
}
int Contact::getVelocity(lua_State * L)
{
love::luax_assert_argc(L, 1, 1);
lua_pushnumber(L, world->scaleUp(point.velocity.x));
lua_pushnumber(L, world->scaleUp(point.velocity.y));
lua_pushnumber(L, Physics::scaleUp(point.velocity.x));
lua_pushnumber(L, Physics::scaleUp(point.velocity.y));
return 2;
}
int Contact::getNormal(lua_State * L)
{
love::luax_assert_argc(L, 1, 1);
lua_pushnumber(L, world->scaleUp(point.normal.x));
lua_pushnumber(L, world->scaleUp(point.normal.y));
lua_pushnumber(L, Physics::scaleUp(point.normal.x));
lua_pushnumber(L, Physics::scaleUp(point.normal.y));
return 2;
}
float Contact::getSeparation() const
{
return world->scaleUp(point.separation);
return Physics::scaleUp(point.separation);
}
float Contact::getFriction() const