← 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_SumoPhysicsController.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_SumoPhysicsController.cpp
8
8
#include "SM_Scene.h"
9
9
#include "KX_GameObject.h"
10
10
#include "KX_MotionState.h"
 
11
#include "KX_ClientObjectInfo.h"
 
12
 
 
13
#include "PHY_IPhysicsEnvironment.h"
11
14
 
12
15
#ifdef HAVE_CONFIG_H
13
16
#include <config.h>
63
66
        
64
67
}
65
68
 
66
 
void KX_SumoPhysicsController::resolveCombinedVelocities(
67
 
                const MT_Vector3 & lin_vel,
68
 
                const MT_Vector3 & ang_vel
69
 
        )
 
69
void            KX_SumoPhysicsController::resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ)
70
70
{
71
 
        SumoPhysicsController::resolveCombinedVelocities(lin_vel, ang_vel);
 
71
        SumoPhysicsController::resolveCombinedVelocities(linvelX,linvelY,linvelZ,angVelX,angVelY,angVelZ);
72
72
}
73
73
 
74
74
void    KX_SumoPhysicsController::ApplyTorque(const MT_Vector3& torque,bool local)
84
84
 
85
85
bool KX_SumoPhysicsController::Update(double time)
86
86
{
87
 
        return SynchronizeMotionStates(time);
88
 
 
 
87
        return SynchronizeMotionStates(time); 
89
88
}
90
89
 
91
90
void    KX_SumoPhysicsController::SetSimulatedTime(double time)
215
214
 
216
215
        
217
216
}
 
217
 
 
218