From 4f2663acd97fdd7055a034debb5911ac86a8f215 Mon Sep 17 00:00:00 2001 From: Lolbot Date: Tue, 10 Sep 2013 21:35:20 +0000 Subject: [PATCH] fixed 4 files out of 2792: - removed 6 CR characters - removed 24 trailing whitespaces - replaced 15 tabs with spaces - fixed 1 svn:eol-style properties --- test/btphystest.cpp | 2 +- test/front_camera_sprite.lolfx | 2 +- test/physics/easyphysics.h | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/btphystest.cpp b/test/btphystest.cpp index 17df2d38..2720cb1f 100644 --- a/test/btphystest.cpp +++ b/test/btphystest.cpp @@ -78,7 +78,7 @@ BtPhysTest::BtPhysTest(bool editor) /* Create a camera that matches the settings of XNA BtPhysTest */ m_camera = new Camera(); - + #if CAT_MODE m_camera->SetView(vec3(70.f, 50.f, 0.f), vec3(0.f, 0.f, 0.f), diff --git a/test/front_camera_sprite.lolfx b/test/front_camera_sprite.lolfx index 93d798de..f9056144 100644 --- a/test/front_camera_sprite.lolfx +++ b/test/front_camera_sprite.lolfx @@ -24,7 +24,7 @@ void main(void) float cosX = cos(in_sprite_orientation); float sinY = sinX; mat2 rotationMatrix = mat2(cosX, -sinX, sinY, cosX); - + v_offset.xy = rotationMatrix * v_offset.xy; //Billboard calculations diff --git a/test/physics/easyphysics.h b/test/physics/easyphysics.h index 60bec684..b4625936 100644 --- a/test/physics/easyphysics.h +++ b/test/physics/easyphysics.h @@ -63,18 +63,18 @@ public: virtual void RemoveFromSimulation(class Simulation* current_simulation); //Force/Impulse functions - virtual void AddImpulse(const lol::vec3& impulse); + virtual void AddImpulse(const lol::vec3& impulse); virtual void AddImpulse(const lol::vec3& impulse, const lol::vec3& rel_pos); - virtual void AddImpulseTorque(const lol::vec3& torque); - virtual void AddForce(const lol::vec3& force); - virtual void AddForce(const lol::vec3& force, const lol::vec3& rel_pos); + virtual void AddImpulseTorque(const lol::vec3& torque); + virtual void AddForce(const lol::vec3& force); + virtual void AddForce(const lol::vec3& force, const lol::vec3& rel_pos); virtual void AddForceTorque(const lol::vec3& torque); //Movements getter - lol::vec3 GetLinearVelocity() const; - lol::vec3 GetLinearForce() const; - lol::vec3 GetAngularVelocity() const; - lol::vec3 GetAngularForce() const; + lol::vec3 GetLinearVelocity() const; + lol::vec3 GetLinearForce() const; + lol::vec3 GetAngularVelocity() const; + lol::vec3 GetAngularForce() const; protected: virtual void SetLocalInertia(float mass); @@ -119,18 +119,18 @@ public: virtual void RemoveFromSimulation(class Simulation* current_simulation) { } //Force/Impulse functions - virtual void AddImpulse(const lol::vec3& impulse) { } + virtual void AddImpulse(const lol::vec3& impulse) { } virtual void AddImpulse(const lol::vec3& impulse, const lol::vec3& rel_pos) { } - virtual void AddImpulseTorque(const lol::vec3& torque) { } - virtual void AddForce(const lol::vec3& force) { } - virtual void AddForce(const lol::vec3& force, const lol::vec3& rel_pos) { } + virtual void AddImpulseTorque(const lol::vec3& torque) { } + virtual void AddForce(const lol::vec3& force) { } + virtual void AddForce(const lol::vec3& force, const lol::vec3& rel_pos) { } virtual void AddForceTorque(const lol::vec3& torque) { } //Movements getter lol::vec3 GetLinearVelocity() const { return lol::vec3(.0f); } - lol::vec3 GetLinearForce() const { return lol::vec3(.0f); } - lol::vec3 GetAngularVelocity() const { return lol::vec3(.0f); } - lol::vec3 GetAngularForce() const { return lol::vec3(.0f); } + lol::vec3 GetLinearForce() const { return lol::vec3(.0f); } + lol::vec3 GetAngularVelocity() const { return lol::vec3(.0f); } + lol::vec3 GetAngularForce() const { return lol::vec3(.0f); } virtual void InitBodyToGhost() { }