forked from bartvdbraak/blender
Cleanup: whitespace
This commit is contained in:
parent
89edddb26c
commit
5af7257309
@ -90,7 +90,7 @@ BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj,
|
|||||||
m_stridelength(stride),
|
m_stridelength(stride),
|
||||||
m_layer_weight(layer_weight),
|
m_layer_weight(layer_weight),
|
||||||
m_playtype(playtype),
|
m_playtype(playtype),
|
||||||
m_blendmode(blend_mode),
|
m_blendmode(blend_mode),
|
||||||
m_priority(priority),
|
m_priority(priority),
|
||||||
m_layer(layer),
|
m_layer(layer),
|
||||||
m_ipo_flags(ipo_flags),
|
m_ipo_flags(ipo_flags),
|
||||||
|
@ -233,8 +233,8 @@ BL_ArmatureObject::BL_ArmatureObject(
|
|||||||
// During object replication ob->data is increase, we decrease it now because we get a copy.
|
// During object replication ob->data is increase, we decrease it now because we get a copy.
|
||||||
id_us_min(&((bArmature *)m_origObjArma->data)->id);
|
id_us_min(&((bArmature *)m_origObjArma->data)->id);
|
||||||
m_pose = m_objArma->pose;
|
m_pose = m_objArma->pose;
|
||||||
// need this to get iTaSC working ok in the BGE
|
// need this to get iTaSC working ok in the BGE
|
||||||
m_pose->flag |= POSE_GAME_ENGINE;
|
m_pose->flag |= POSE_GAME_ENGINE;
|
||||||
memcpy(m_obmat, m_objArma->obmat, sizeof(m_obmat));
|
memcpy(m_obmat, m_objArma->obmat, sizeof(m_obmat));
|
||||||
|
|
||||||
// The side-effect of this method registers this object as "animatable" with the KX_Scene.
|
// The side-effect of this method registers this object as "animatable" with the KX_Scene.
|
||||||
|
@ -41,7 +41,7 @@ void BL_ConvertControllers(
|
|||||||
int activeLayerBitInfo,
|
int activeLayerBitInfo,
|
||||||
bool isInActiveLayer,
|
bool isInActiveLayer,
|
||||||
class KX_BlenderSceneConverter* converter,
|
class KX_BlenderSceneConverter* converter,
|
||||||
bool libloading
|
bool libloading
|
||||||
);
|
);
|
||||||
|
|
||||||
#endif /* __KX_CONVERTCONTROLLERS_H__ */
|
#endif /* __KX_CONVERTCONTROLLERS_H__ */
|
||||||
|
@ -1674,10 +1674,11 @@ CListValue* KX_GameObject::GetChildrenRecursive()
|
|||||||
KX_Scene* KX_GameObject::GetScene()
|
KX_Scene* KX_GameObject::GetScene()
|
||||||
{
|
{
|
||||||
SG_Node* node = this->GetSGNode();
|
SG_Node* node = this->GetSGNode();
|
||||||
if (node == NULL)
|
if (node == NULL) {
|
||||||
// this happens for object in non active layers, rely on static scene then
|
// this happens for object in non active layers, rely on static scene then
|
||||||
return KX_GetActiveScene();
|
return KX_GetActiveScene();
|
||||||
return static_cast<KX_Scene*>(node->GetSGClientInfo());
|
}
|
||||||
|
return static_cast<KX_Scene*>(node->GetSGClientInfo());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------
|
/* ---------------------------------------------------------------------
|
||||||
@ -4086,11 +4087,11 @@ bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( PyObject_TypeCheck(value, &KX_GameObject::Type) ||
|
if (PyObject_TypeCheck(value, &KX_GameObject::Type) ||
|
||||||
PyObject_TypeCheck(value, &KX_LightObject::Type) ||
|
PyObject_TypeCheck(value, &KX_LightObject::Type) ||
|
||||||
PyObject_TypeCheck(value, &KX_Camera::Type) ||
|
PyObject_TypeCheck(value, &KX_Camera::Type) ||
|
||||||
PyObject_TypeCheck(value, &KX_FontObject::Type) ||
|
PyObject_TypeCheck(value, &KX_FontObject::Type) ||
|
||||||
PyObject_TypeCheck(value, &KX_NavMeshObject::Type))
|
PyObject_TypeCheck(value, &KX_NavMeshObject::Type))
|
||||||
{
|
{
|
||||||
*object = static_cast<KX_GameObject*>BGE_PROXY_REF(value);
|
*object = static_cast<KX_GameObject*>BGE_PROXY_REF(value);
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ public:
|
|||||||
void ConvertAndAddScene(const STR_String& scenename,bool overlay);
|
void ConvertAndAddScene(const STR_String& scenename,bool overlay);
|
||||||
|
|
||||||
void RemoveScene(const STR_String& scenename);
|
void RemoveScene(const STR_String& scenename);
|
||||||
bool ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
|
bool ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
|
||||||
void SuspendScene(const STR_String& scenename);
|
void SuspendScene(const STR_String& scenename);
|
||||||
void ResumeScene(const STR_String& scenename);
|
void ResumeScene(const STR_String& scenename);
|
||||||
|
|
||||||
|
@ -561,7 +561,7 @@ PyAttributeDef KX_SteeringActuator::Attributes[] = {
|
|||||||
KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec),
|
KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec),
|
||||||
KX_PYATTRIBUTE_SHORT_RW("facingMode", 0, 6, true, KX_SteeringActuator, m_facingMode),
|
KX_PYATTRIBUTE_SHORT_RW("facingMode", 0, 6, true, KX_SteeringActuator, m_facingMode),
|
||||||
KX_PYATTRIBUTE_INT_RW("pathUpdatePeriod", -1, 100000, true, KX_SteeringActuator, m_pathUpdatePeriod),
|
KX_PYATTRIBUTE_INT_RW("pathUpdatePeriod", -1, 100000, true, KX_SteeringActuator, m_pathUpdatePeriod),
|
||||||
KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
|
KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
|
||||||
{ NULL } //Sentinel
|
{ NULL } //Sentinel
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -99,9 +99,9 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, int storage)
|
|||||||
m_motionblur(0),
|
m_motionblur(0),
|
||||||
m_motionblurvalue(-1.0),
|
m_motionblurvalue(-1.0),
|
||||||
m_usingoverrideshader(false),
|
m_usingoverrideshader(false),
|
||||||
m_clientobject(NULL),
|
m_clientobject(NULL),
|
||||||
m_auxilaryClientInfo(NULL),
|
m_auxilaryClientInfo(NULL),
|
||||||
m_drawingmode(KX_TEXTURED),
|
m_drawingmode(KX_TEXTURED),
|
||||||
m_texco_num(0),
|
m_texco_num(0),
|
||||||
m_attrib_num(0),
|
m_attrib_num(0),
|
||||||
//m_last_alphablend(GPU_BLEND_SOLID),
|
//m_last_alphablend(GPU_BLEND_SOLID),
|
||||||
|
@ -85,8 +85,8 @@ public:
|
|||||||
|
|
||||||
/// release video source
|
/// release video source
|
||||||
virtual bool release (void);
|
virtual bool release (void);
|
||||||
/// overwrite base refresh to handle fixed image
|
/// overwrite base refresh to handle fixed image
|
||||||
virtual void refresh(void);
|
virtual void refresh(void);
|
||||||
/// play video
|
/// play video
|
||||||
virtual bool play (void);
|
virtual bool play (void);
|
||||||
/// pause video
|
/// pause video
|
||||||
|
Loading…
Reference in New Issue
Block a user