← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

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,v 1.4 2004/04/08 11:34:49 kester Exp $
 
2
 * $Id: KX_OdePhysicsController.cpp,v 1.6 2005/03/25 10:33:37 kester Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
23
23
#include "KX_GameObject.h"
24
24
#include "KX_MotionState.h"
25
25
 
 
26
#include "MT_assert.h"
 
27
 
 
28
#include "PHY_IPhysicsEnvironment.h"
 
29
 
26
30
#ifdef HAVE_CONFIG_H
27
31
#include <config.h>
28
32
#endif
62
66
 
63
67
        // cheating here...
64
68
        KX_GameObject* gameobj = (KX_GameObject*)       object->GetSGClientObject();
65
 
        gameobj->m_pPhysicsController1 = this;
 
69
        gameobj->SetPhysicsController(this);
66
70
        
67
71
}
68
72
 
225
229
        
226
230
}
227
231
 
228
 
void    KX_OdePhysicsController::resolveCombinedVelocities(const MT_Vector3 & lin_vel, const MT_Vector3 & ang_vel )
 
232
void            KX_OdePhysicsController::resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ)
229
233
{
230
234
}
231
235