griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE: Cleanup KX_IPO_SGCOntroller.

Browse Source 
- Add spaces around operators.
- Replace !(a == b) by a != b
- Add "f" at end of float value.
- Remove extras lines in fonctions declaration.
- Remove indentation to align attributes definition.
This commit is contained in:
Porteries Tristan
2015-10-29 15:13:04 +01:00
parent 6005bb5846
commit fc5f717888
2 changed files with 72 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
source/gameengine/Ketsji/KX_IPO_SGController.cpp
View File

@@ -61,18 +61,16 @@ KX_IpoSGController::KX_IpoSGController()
m_modified(true),
m_ipotime(1.0),
m_ipo_start_initialized(false),
m_ipo_start_euler(0.0,0.0,0.0),
m_ipo_start_euler(0.0f, 0.0f, 0.0f),
m_ipo_euler_initialized(false)
{
m_game_object = NULL;
for (int i=0; i < KX_MAX_IPO_CHANNELS; i++)
for (int i = 0; i < KX_MAX_IPO_CHANNELS; i++)
m_ipo_channels_active[i] = false;
}
void KX_IpoSGController::SetOption(
int option,
int value)
void KX_IpoSGController::SetOption(int option, int value)
{
switch (option) {
case SG_CONTR_IPO_IPO_AS_FORCE:
@@ -93,7 +91,8 @@ void KX_IpoSGController::SetOption(
if (value/* && ((SG_Node*)m_pObject)->GetSGParent() == NULL*/) {
// only accept local Ipo if the object has no parent
m_ipo_local = true;
} else {
}
else {
m_ipo_local = false;
}
m_modified = true;
@@ -103,38 +102,29 @@ void KX_IpoSGController::SetOption(
}
}
void
KX_IpoSGController::UpdateSumoReference(
)
void KX_IpoSGController::UpdateSumoReference()
{
if (m_game_object) {
}
}
void
KX_IpoSGController::SetGameObject(
KX_GameObject* go
)
void KX_IpoSGController::SetGameObject(KX_GameObject *go)
{
m_game_object = go;
}
bool KX_IpoSGController::Update(double currentTime)
{
if (m_modified)
{
if (m_modified) {
T_InterpolatorList::iterator i;
for (i = m_interpolators.begin(); !(i == m_interpolators.end()); ++i) {
for (i = m_interpolators.begin(); i != m_interpolators.end(); ++i) {
(*i)->Execute(m_ipotime);//currentTime);
}
SG_Spatial* ob = (SG_Spatial*)m_pObject;
SG_Spatial *ob = (SG_Spatial *)m_pObject;
//initialization on the first frame of the IPO
if (! m_ipo_start_initialized && currentTime != 0.0) {
if (!m_ipo_start_initialized && currentTime != 0.0f) {
m_ipo_start_point = ob->GetLocalPosition();
m_ipo_start_orient = ob->GetLocalOrientation();
m_ipo_start_scale = ob->GetLocalScale();
@@ -150,22 +140,19 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_ipo_channels_active[OB_LOC_X] || m_ipo_channels_active[OB_LOC_Y] || m_ipo_channels_active[OB_LOC_Z] ||
m_ipo_channels_active[OB_DLOC_X] || m_ipo_channels_active[OB_DLOC_Y] || m_ipo_channels_active[OB_DLOC_Z])
{
if (m_ipo_as_force == true)
{
if (m_game_object && ob && m_game_object->GetPhysicsController())
{
if (m_ipo_as_force == true) {
if (m_game_object && ob && m_game_object->GetPhysicsController()) {
MT_Vector3 vec = m_ipo_local ?
ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
m_ipo_xform.GetPosition();
m_game_object->GetPhysicsController()->ApplyForce(vec, false);
}
}
else
{
else {
// Local ipo should be defined with the object position at (0,0,0)
// Local transform is applied to the object based on initial position
MT_Point3 newPosition(0.0,0.0,0.0);
MT_Point3 newPosition(0.0f, 0.0f, 0.0f);
if (!m_ipo_add)
newPosition = ob->GetLocalPosition();
//apply separate IPO channels if there is any data in them
@@ -175,21 +162,21 @@ bool KX_IpoSGController::Update(double currentTime)
newPosition[0] = (m_ipo_channels_active[OB_DLOC_X] ? m_ipo_xform.GetPosition()[0] + m_ipo_xform.GetDeltaPosition()[0] : m_ipo_xform.GetPosition()[0]);
}
else if (m_ipo_channels_active[OB_DLOC_X] && m_ipo_start_initialized) {
newPosition[0] = (((!m_ipo_add)?m_ipo_start_point[0]:0.0) + m_ipo_xform.GetDeltaPosition()[0]);
newPosition[0] = (((!m_ipo_add) ? m_ipo_start_point[0] : 0.0f) + m_ipo_xform.GetDeltaPosition()[0]);
}
//LocY and dLocY
if (m_ipo_channels_active[OB_LOC_Y]) {
newPosition[1] = (m_ipo_channels_active[OB_DLOC_Y] ? m_ipo_xform.GetPosition()[1] + m_ipo_xform.GetDeltaPosition()[1] : m_ipo_xform.GetPosition()[1]);
}
else if (m_ipo_channels_active[OB_DLOC_Y] && m_ipo_start_initialized) {
newPosition[1] = (((!m_ipo_add)?m_ipo_start_point[1]:0.0) + m_ipo_xform.GetDeltaPosition()[1]);
newPosition[1] = (((!m_ipo_add) ? m_ipo_start_point[1] : 0.0f) + m_ipo_xform.GetDeltaPosition()[1]);
}
//LocZ and dLocZ
if (m_ipo_channels_active[OB_LOC_Z]) {
newPosition[2] = (m_ipo_channels_active[OB_DLOC_Z] ? m_ipo_xform.GetPosition()[2] + m_ipo_xform.GetDeltaPosition()[2] : m_ipo_xform.GetPosition()[2]);
}
else if (m_ipo_channels_active[OB_DLOC_Z] && m_ipo_start_initialized) {
newPosition[2] = (((!m_ipo_add)?m_ipo_start_point[2]:0.0) + m_ipo_xform.GetDeltaPosition()[2]);
newPosition[2] = (((!m_ipo_add) ? m_ipo_start_point[2] : 0.0f) + m_ipo_xform.GetDeltaPosition()[2]);
}
if (m_ipo_add) {
if (m_ipo_local)
@@ -206,15 +193,15 @@ bool KX_IpoSGController::Update(double currentTime)
m_ipo_channels_active[OB_DROT_X] || m_ipo_channels_active[OB_DROT_Y] || m_ipo_channels_active[OB_DROT_Z])
{
if (m_ipo_as_force) {
if (m_game_object && ob) {
m_game_object->ApplyTorque(m_ipo_local ?
ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() :
m_ipo_xform.GetEulerAngles(), false);
}
} else if (m_ipo_add) {
}
else if (m_ipo_add) {
if (m_ipo_start_initialized) {
double yaw=0, pitch=0, roll=0; //delta Euler angles
double yaw = 0.0, pitch = 0.0, roll = 0.0; //delta Euler angles
//RotX and dRotX
if (m_ipo_channels_active[OB_ROT_X])
@@ -227,7 +214,7 @@ bool KX_IpoSGController::Update(double currentTime)
pitch += m_ipo_xform.GetEulerAngles()[1];
if (m_ipo_channels_active[OB_DROT_Y])
pitch += m_ipo_xform.GetDeltaEulerAngles()[1];
//RotZ and dRotZ
if (m_ipo_channels_active[OB_ROT_Z])
roll += m_ipo_xform.GetEulerAngles()[2];
@@ -242,12 +229,13 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalOrientation(rotation);
}
} else if (m_ipo_channels_active[OB_ROT_X] || m_ipo_channels_active[OB_ROT_Y] || m_ipo_channels_active[OB_ROT_Z]) {
}
else if (m_ipo_channels_active[OB_ROT_X] || m_ipo_channels_active[OB_ROT_Y] || m_ipo_channels_active[OB_ROT_Z]) {
if (m_ipo_euler_initialized) {
// assume all channel absolute
// All 3 channels should be specified but if they are not, we will take
// the value at the start of the game to avoid angle sign reversal
double yaw=m_ipo_start_euler[0], pitch=m_ipo_start_euler[1], roll=m_ipo_start_euler[2];
double yaw = m_ipo_start_euler[0], pitch = m_ipo_start_euler[1], roll = m_ipo_start_euler[2];
//RotX and dRotX
if (m_ipo_channels_active[OB_ROT_X]) {
@@ -275,9 +263,10 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalOrientation(MT_Vector3(yaw, pitch, roll));
}
} else if (m_ipo_start_initialized) {
}
else if (m_ipo_start_initialized) {
// only DROT, treat as Add
double yaw=0, pitch=0, roll=0; //delta Euler angles
double yaw = 0.0, pitch = 0.0, roll = 0.0; //delta Euler angles
//dRotX
if (m_ipo_channels_active[OB_DROT_X])
@@ -286,7 +275,7 @@ bool KX_IpoSGController::Update(double currentTime)
//dRotY
if (m_ipo_channels_active[OB_DROT_Y])
pitch = m_ipo_xform.GetDeltaEulerAngles()[1];
//dRotZ
if (m_ipo_channels_active[OB_DROT_Z])
roll = m_ipo_xform.GetDeltaEulerAngles()[2];
@@ -303,7 +292,7 @@ bool KX_IpoSGController::Update(double currentTime)
m_ipo_channels_active[OB_DSIZE_X] || m_ipo_channels_active[OB_DSIZE_Y] || m_ipo_channels_active[OB_DSIZE_Z])
{
//default is no scale change
MT_Vector3 newScale(1.0,1.0,1.0);
MT_Vector3 newScale(1.0f, 1.0f, 1.0f);
if (!m_ipo_add)
newScale = ob->GetLocalScale();
@@ -311,7 +300,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[0] = (m_ipo_channels_active[OB_DSIZE_X] ? (m_ipo_xform.GetScaling()[0] + m_ipo_xform.GetDeltaScaling()[0]) : m_ipo_xform.GetScaling()[0]);
}
else if (m_ipo_channels_active[OB_DSIZE_X] && m_ipo_start_initialized) {
newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + ((!m_ipo_add)?m_ipo_start_scale[0]:0.0));
newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + ((!m_ipo_add) ? m_ipo_start_scale[0] : 0.0f));
}
//RotY dRotY
@@ -319,7 +308,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[1] = (m_ipo_channels_active[OB_DSIZE_Y] ? (m_ipo_xform.GetScaling()[1] + m_ipo_xform.GetDeltaScaling()[1]): m_ipo_xform.GetScaling()[1]);
}
else if (m_ipo_channels_active[OB_DSIZE_Y] && m_ipo_start_initialized) {
newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + ((!m_ipo_add)?m_ipo_start_scale[1]:0.0));
newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + ((!m_ipo_add)?m_ipo_start_scale[1] : 0.0f));
}
//RotZ and dRotZ
@@ -327,7 +316,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[2] = (m_ipo_channels_active[OB_DSIZE_Z] ? (m_ipo_xform.GetScaling()[2] + m_ipo_xform.GetDeltaScaling()[2]) : m_ipo_xform.GetScaling()[2]);
}
else if (m_ipo_channels_active[OB_DSIZE_Z] && m_ipo_start_initialized) {
newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + ((!m_ipo_add)?m_ipo_start_scale[2]:1.0));
newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + ((!m_ipo_add)?m_ipo_start_scale[2] : 1.0f));
}
if (m_ipo_add) {
@@ -336,24 +325,22 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalScale(newScale);
}
m_modified=false;
m_modified = false;
}
return false;
}
void KX_IpoSGController::AddInterpolator(KX_IInterpolator* interp)
void KX_IpoSGController::AddInterpolator(KX_IInterpolator *interp)
{
this->m_interpolators.push_back(interp);
m_interpolators.push_back(interp);
}
SG_Controller* KX_IpoSGController::GetReplica(class SG_Node* destnode)
SG_Controller *KX_IpoSGController::GetReplica(SG_Node *destnode)
{
KX_IpoSGController* iporeplica = new KX_IpoSGController(*this);
KX_IpoSGController *iporeplica = new KX_IpoSGController(*this);
// clear object that ipo acts on in the replica.
iporeplica->ClearObject();
iporeplica->SetGameObject((KX_GameObject*)destnode->GetSGClientObject());
iporeplica->SetGameObject((KX_GameObject *)destnode->GetSGClientObject());
// dirty hack, ask Gino for a better solution in the ipo implementation
// hacken en zagen, in what we call datahiding, not written for replication :(
@@ -362,29 +349,27 @@ SG_Controller* KX_IpoSGController::GetReplica(class SG_Node* destnode)
iporeplica->m_interpolators.clear();
T_InterpolatorList::iterator i;
for (i = oldlist.begin(); !(i == oldlist.end()); ++i) {
KX_ScalarInterpolator* copyipo = new KX_ScalarInterpolator(*((KX_ScalarInterpolator*)*i));
for (i = oldlist.begin(); i != oldlist.end(); ++i) {
KX_ScalarInterpolator *copyipo = new KX_ScalarInterpolator(*((KX_ScalarInterpolator *)*i));
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
MT_Scalar *scaal = ((KX_ScalarInterpolator *)*i)->GetTarget();
uint_ptr orgbase = (uint_ptr)&m_ipo_xform;
uint_ptr orgloc = (uint_ptr)scaal;
uint_ptr offset = orgloc-orgbase;
uint_ptr offset = orgloc - orgbase;
uint_ptr newaddrbase = (uint_ptr)&iporeplica->m_ipo_xform;
newaddrbase += offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
MT_Scalar *blaptr = (MT_Scalar *) newaddrbase;
copyipo->SetNewTarget((MT_Scalar *)blaptr);
}
return iporeplica;
}
KX_IpoSGController::~KX_IpoSGController()
{
T_InterpolatorList::iterator i;
for (i = m_interpolators.begin(); !(i == m_interpolators.end()); ++i) {
for (i = m_interpolators.begin(); i != m_interpolators.end(); ++i) {
delete (*i);
}
}

51
source/gameengine/Ketsji/KX_IPO_SGController.h
View File

@@ -42,85 +42,80 @@
class KX_IpoSGController : public SG_Controller
{
KX_IPOTransform m_ipo_xform;
T_InterpolatorList m_interpolators;
KX_IPOTransform m_ipo_xform;
T_InterpolatorList m_interpolators;
/** Flag for each IPO channel that can be applied to a game object */
bool m_ipo_channels_active[KX_MAX_IPO_CHANNELS];
bool m_ipo_channels_active[KX_MAX_IPO_CHANNELS];
/** Interpret the ipo as a force rather than a displacement? */
bool m_ipo_as_force;
bool m_ipo_as_force;
/** Add Ipo curve to current loc/rot/scale */
bool m_ipo_add;
bool m_ipo_add;
/** Ipo must be applied in local coordinate rather than in global coordinates (used for force and Add mode)*/
bool m_ipo_local;
bool m_ipo_local;
/** Were settings altered since the last update? */
bool m_modified;
bool m_modified;
/** Local time of this ipo.*/
double m_ipotime;
double m_ipotime;
/** Location of the object when the IPO is first fired (for local transformations) */
class MT_Point3 m_ipo_start_point;
MT_Point3 m_ipo_start_point;
/** Orientation of the object when the IPO is first fired (for local transformations) */
class MT_Matrix3x3 m_ipo_start_orient;
MT_Matrix3x3 m_ipo_start_orient;
/** Scale of the object when the IPO is first fired (for local transformations) */
class MT_Vector3 m_ipo_start_scale;
MT_Vector3 m_ipo_start_scale;
/** if IPO initial position has been set for local normal IPO */
bool m_ipo_start_initialized;
bool m_ipo_start_initialized;
/** Euler angles at the start of the game, needed for incomplete ROT Ipo curves */
class MT_Vector3 m_ipo_start_euler;
MT_Vector3 m_ipo_start_euler;
/** true is m_ipo_start_euler has been initialized */
bool m_ipo_euler_initialized;
bool m_ipo_euler_initialized;
/** A reference to the original game object. */
class KX_GameObject* m_game_object;
class KX_GameObject *m_game_object;
public:
KX_IpoSGController();
virtual ~KX_IpoSGController();
virtual SG_Controller* GetReplica(class SG_Node* destnode);
virtual SG_Controller *GetReplica(class SG_Node *destnode);
void
SetOption(
int option,
int value
);
void SetOption(int option, int value);
/** Set sumo data. */
void UpdateSumoReference();
/** Set reference to the corresponding game object. */
void SetGameObject(class KX_GameObject*);
void SetGameObject(class KX_GameObject *go);
void SetIPOChannelActive(int index, bool value) {
//indexes found in makesdna\DNA_ipo_types.h
m_ipo_channels_active[index] = value;
}
KX_IPOTransform& GetIPOTransform()
KX_IPOTransform &GetIPOTransform()
{
return m_ipo_xform;
}
void AddInterpolator(KX_IInterpolator* interp);
void AddInterpolator(KX_IInterpolator *interp);
virtual bool Update(double time);
virtual void SetSimulatedTime(double time)
virtual void SetSimulatedTime(double time)
{
m_ipotime = time;
m_modified = true;
}
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IpoSGController")
#endif