Fixed SetGravity action.

Version bump.
This commit is contained in:
Florian Rival
2014-08-04 21:14:41 +02:00
parent 442d6e3efe
commit 8cdbb4a166
3 changed files with 17 additions and 19 deletions

View File

@@ -1,11 +1,11 @@
#ifndef VERSION_H
#define VERSION_H
#ifndef GDCORE_VERSION_H
#define GDCORE_VERSION_H
namespace AutoVersion{
//Date Version Types
static const char GDCore_DATE[] = "15";
static const char GDCore_MONTH[] = "05";
static const char GDCore_DATE[] = "04";
static const char GDCore_MONTH[] = "08";
static const char GDCore_YEAR[] = "2014";
//Software Status
@@ -16,16 +16,16 @@ namespace AutoVersion{
static const long GDCore_MAJOR = 3;
static const long GDCore_MINOR = 4;
static const long GDCore_BUILD = 72;
static const long GDCore_REVISION = 0;
static const long GDCore_REVISION = 2;
//Miscellaneous Version Types
#define GDCore_RC_FILEVERSION 3,4,72,0
#define GDCore_RC_FILEVERSION_STRING "3, 4, 72, 0\0"
static const char GDCore_FULLVERSION_STRING[] = "3.4.72.0";
#define GDCore_RC_FILEVERSION 3,4,72,2
#define GDCore_RC_FILEVERSION_STRING "3, 4, 72, 2\0"
static const char GDCore_FULLVERSION_STRING[] = "3.4.72.2";
//These values are to keep track of your versioning state, don't modify them.
static const long GDCore_BUILD_HISTORY = 0;
}
#endif //VERSION_H
#endif //GDCORE_VERSION_H

View File

@@ -258,7 +258,7 @@ void PhysicsAutomatism::OnDeActivate()
/**
* Set a body to be static
*/
void PhysicsAutomatism::SetStatic(RuntimeScene & scene )
void PhysicsAutomatism::SetStatic(RuntimeScene & scene)
{
dynamic = false;
@@ -269,7 +269,7 @@ void PhysicsAutomatism::SetStatic(RuntimeScene & scene )
/**
* Set a body to be dynamic
*/
void PhysicsAutomatism::SetDynamic(RuntimeScene & scene )
void PhysicsAutomatism::SetDynamic(RuntimeScene & scene)
{
dynamic = true;
@@ -281,7 +281,7 @@ void PhysicsAutomatism::SetDynamic(RuntimeScene & scene )
/**
* Set rotation to be fixed
*/
void PhysicsAutomatism::SetFixedRotation(RuntimeScene & scene )
void PhysicsAutomatism::SetFixedRotation(RuntimeScene & scene)
{
fixedRotation = true;
@@ -292,7 +292,7 @@ void PhysicsAutomatism::SetFixedRotation(RuntimeScene & scene )
/**
* Set rotation to be free
*/
void PhysicsAutomatism::SetFreeRotation(RuntimeScene & scene )
void PhysicsAutomatism::SetFreeRotation(RuntimeScene & scene)
{
fixedRotation = false;
@@ -303,7 +303,7 @@ void PhysicsAutomatism::SetFreeRotation(RuntimeScene & scene )
/**
* Consider object as bullet, for better collision handling
*/
void PhysicsAutomatism::SetAsBullet(RuntimeScene & scene )
void PhysicsAutomatism::SetAsBullet(RuntimeScene & scene)
{
isBullet = true;
@@ -314,7 +314,7 @@ void PhysicsAutomatism::SetAsBullet(RuntimeScene & scene )
/**
* Don't consider object as bullet, for faster collision handling
*/
void PhysicsAutomatism::DontSetAsBullet(RuntimeScene & scene )
void PhysicsAutomatism::DontSetAsBullet(RuntimeScene & scene)
{
isBullet = false;
@@ -472,7 +472,7 @@ void PhysicsAutomatism::SetGravity( float xGravity, float yGravity, RuntimeScene
{
if ( !body ) CreateBody(scene);
runtimeScenesPhysicsDatas->world->SetGravity(b2Vec2( xGravity*runtimeScenesPhysicsDatas->GetInvScaleX(), -yGravity*runtimeScenesPhysicsDatas->GetInvScaleY()));
runtimeScenesPhysicsDatas->world->SetGravity(b2Vec2(xGravity, -yGravity));
}

View File

@@ -440,9 +440,7 @@ gdjs.PhysicsRuntimeAutomatism.prototype.setGravity = function( xGravity, yGravit
{
if ( this._box2DBody === null ) this.createBody();
this._sharedData.world.SetGravity(this.b2Vec2(
xGravity*this._sharedData.invScaleX,
-yGravity*this._sharedData.invScaleY));
this._sharedData.world.SetGravity(this.b2Vec2(xGravity, -yGravity));
};
gdjs.PhysicsRuntimeAutomatism.prototype.addGearJointBetweenObjects = function( object, ratio )