AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 15:41:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

de-Windonizing

Browse Source
This commit is contained in:
Marc Zinnschlag 2011-02-26 16:34:43 +01:00
parent ab1fa41c24
commit 6c1338821e
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bullet/CMotionState.cpp
View File

@ -3,7 +3,7 @@
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <btBulletCollisionCommon.h> #include <btBulletCollisionCommon.h>
#include <components\nifbullet\bullet_nif_loader.hpp> #include <components/nifbullet/bullet_nif_loader.hpp>
//#include <apps\openmw\mwworld\world.hpp> //#include <apps\openmw\mwworld\world.hpp>
namespace OEngine { namespace OEngine {

2
bullet/CMotionState.h
View File

@ -1,7 +1,7 @@
#ifndef OENGINE_CMOTIONSTATE_H #ifndef OENGINE_CMOTIONSTATE_H
#define OENGINE_CMOTIONSTATE_H #define OENGINE_CMOTIONSTATE_H
#include <BulletDynamics\Dynamics\btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include <string> #include <string>
namespace OEngine { namespace OEngine {

4
bullet/btKinematicCharacterController.h
View File

@ -17,9 +17,9 @@ subject to the following restrictions:
#define KINEMATIC_CHARACTER_CONTROLLER_H #define KINEMATIC_CHARACTER_CONTROLLER_H
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "LinearMath\btQuickprof.h" #include "LinearMath/btQuickprof.h"
#include "BulletDynamics\Character\btCharacterControllerInterface.h" #include "BulletDynamics/Character/btCharacterControllerInterface.h"
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"

10
bullet/physic.cpp
View File

@ -1,7 +1,7 @@
#include "physic.hpp" #include "physic.hpp"
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <btBulletCollisionCommon.h> #include <btBulletCollisionCommon.h>
#include <components\nifbullet\bullet_nif_loader.hpp> #include <components/nifbullet/bullet_nif_loader.hpp>
//#include <apps\openmw\mwworld\world.hpp> //#include <apps\openmw\mwworld\world.hpp>
#include "CMotionState.h" #include "CMotionState.h"
#include "OgreRoot.h" #include "OgreRoot.h"
@ -69,18 +69,18 @@ namespace Physic
delete externalCollisionShape; delete externalCollisionShape;
} }
void PhysicActor::setWalkDirection(btVector3& mvt) void PhysicActor::setWalkDirection(const btVector3& mvt)
{ {
mCharacter->setWalkDirection( mvt ); mCharacter->setWalkDirection( mvt );
} }
void PhysicActor::Rotate(btQuaternion& quat) void PhysicActor::Rotate(const btQuaternion& quat)
{ {
externalGhostObject->getWorldTransform().setRotation( externalGhostObject->getWorldTransform().getRotation() * quat ); externalGhostObject->getWorldTransform().setRotation( externalGhostObject->getWorldTransform().getRotation() * quat );
internalGhostObject->getWorldTransform().setRotation( internalGhostObject->getWorldTransform().getRotation() * quat ); internalGhostObject->getWorldTransform().setRotation( internalGhostObject->getWorldTransform().getRotation() * quat );
} }
void PhysicActor::setRotation(btQuaternion& quat) void PhysicActor::setRotation(const btQuaternion& quat)
{ {
externalGhostObject->getWorldTransform().setRotation( quat ); externalGhostObject->getWorldTransform().setRotation( quat );
internalGhostObject->getWorldTransform().setRotation( quat ); internalGhostObject->getWorldTransform().setRotation( quat );
@ -96,7 +96,7 @@ namespace Physic
return internalGhostObject->getWorldTransform().getRotation(); return internalGhostObject->getWorldTransform().getRotation();
} }
void PhysicActor::setPosition(btVector3& pos) void PhysicActor::setPosition(const btVector3& pos)
{ {
internalGhostObject->getWorldTransform().setOrigin(pos); internalGhostObject->getWorldTransform().setOrigin(pos);
externalGhostObject->getWorldTransform().setOrigin(pos); externalGhostObject->getWorldTransform().setOrigin(pos);

10
bullet/physic.hpp
View File

@ -1,7 +1,7 @@
#ifndef OENGINE_BULLET_PHYSIC_H #ifndef OENGINE_BULLET_PHYSIC_H
#define OENGINE_BULLET_PHYSIC_H #define OENGINE_BULLET_PHYSIC_H
#include <BulletDynamics\Dynamics\btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include "BulletCollision/CollisionDispatch/btGhostObject.h" #include "BulletCollision/CollisionDispatch/btGhostObject.h"
#include <string> #include <string>
#include <list> #include <list>
@ -62,17 +62,17 @@ namespace Physic
*I think it's also needed to take time into account. A typical call should look like this: *I think it's also needed to take time into account. A typical call should look like this:
*setWalkDirection( mvt * orientation * dt) *setWalkDirection( mvt * orientation * dt)
*/ */
void setWalkDirection(btVector3& mvt); void setWalkDirection(const btVector3& mvt);
void Rotate(btQuaternion& quat); void Rotate(const btQuaternion& quat);
void setRotation(btQuaternion& quat); void setRotation(const btQuaternion& quat);
btVector3 getPosition(void); btVector3 getPosition(void);
btQuaternion getRotation(void); btQuaternion getRotation(void);
void setPosition(btVector3& pos); void setPosition(const btVector3& pos);
btKinematicCharacterController* mCharacter; btKinematicCharacterController* mCharacter;