← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_OdePhysicsController.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_OdePhysicsController.cpp
1
1
/**
2
 
 * $Id: KX_OdePhysicsController.cpp 14444 2008-04-16 22:40:48Z hos $
 
2
 * $Id: KX_OdePhysicsController.cpp 16862 2008-10-01 07:55:02Z ben2610 $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
133
133
        ODEPhysicsController::SetLinearVelocity(lin_vel[0],lin_vel[1],lin_vel[2],local);
134
134
}
135
135
 
136
 
void KX_OdePhysicsController::setOrientation(const MT_Quaternion& orn)
 
136
void KX_OdePhysicsController::setOrientation(const MT_Matrix3x3& rot)
137
137
{
 
138
        MT_Quaternion orn = rot.getRotation();
138
139
        ODEPhysicsController::setOrientation(orn[0],orn[1],orn[2],orn[3]);
139
140
}
140
141
 
168
169
        return ODEPhysicsController::getMass();
169
170
}
170
171
 
 
172
MT_Scalar       KX_OdePhysicsController::GetRadius()
 
173
{
 
174
        return MT_Scalar(0.f);
 
175
}
 
176
 
171
177
MT_Vector3      KX_OdePhysicsController::getReactionForce()
172
178
{
173
179
        return MT_Vector3(0,0,0);
177
183
 
178
184
}
179
185
 
180
 
void    KX_OdePhysicsController::SuspendDynamics()
 
186
void    KX_OdePhysicsController::SuspendDynamics(bool)
181
187
{
182
188
        ODEPhysicsController::SuspendDynamics();
183
189
}