archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.50:

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
Brecht Van Lommel
2009-06-08 20:08:19 +00:00
parent e93db433a0 d76a6f5231
commit c8b4cf9206
594 changed files with 28292 additions and 13753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
source/gameengine/SceneGraph/SG_IObject.cpp
View File

@@ -39,19 +39,20 @@ SG_IObject::
SG_IObject(
void* clientobj,
void* clientinfo,
SG_Callbacks callbacks
SG_Callbacks& callbacks
):
SG_QList(),
m_SGclientObject(clientobj),
m_SGclientInfo(clientinfo),
m_callbacks(callbacks)
m_SGclientInfo(clientinfo)
{
//nothing to do
m_callbacks = callbacks;
}
SG_IObject::
SG_IObject(
const SG_IObject &other
) :
SG_QList(),
m_SGclientObject(other.m_SGclientObject),
m_SGclientInfo(other.m_SGclientInfo),
m_callbacks(other.m_callbacks)
@@ -74,92 +75,17 @@ RemoveAllControllers(
m_SGcontrollers.clear();
}
/// Needed for replication
SGControllerList&
SG_IObject::
GetSGControllerList(
){
return m_SGcontrollers;
}
void*
SG_IObject::
GetSGClientObject(
){
return m_SGclientObject;
}
const
void*
SG_IObject::
GetSGClientObject(
) const {
return m_SGclientObject;
}
void
SG_IObject::
SetSGClientObject(
void* clientObject
){
m_SGclientObject = clientObject;
}
bool
SG_IObject::
ActivateReplicationCallback(
SG_IObject *replica
){
if (m_callbacks.m_replicafunc)
{
// Call client provided replication func
if (m_callbacks.m_replicafunc(replica,m_SGclientObject,m_SGclientInfo) == NULL)
return false;
}
return true;
};
void
SG_IObject::
ActivateDestructionCallback(
){
if (m_callbacks.m_destructionfunc)
{
// Call client provided destruction function on this!
m_callbacks.m_destructionfunc(this,m_SGclientObject,m_SGclientInfo);
}
else
{
// no callback but must still destroy the node to avoid memory leak
delete this;
}
}
void
SG_IObject::
ActivateUpdateTransformCallback(
){
if (m_callbacks.m_updatefunc)
{
// Call client provided update func.
m_callbacks.m_updatefunc(this, m_SGclientObject, m_SGclientInfo);
}
}
void
SG_IObject::
SetControllerTime(
double time
){
void SG_IObject::SetControllerTime(double time)
{
SGControllerList::iterator contit;
for (contit = m_SGcontrollers.begin();contit!=m_SGcontrollers.end();++contit)
{
(*contit)->SetSimulatedTime(time);
}
}
/// Needed for replication
SG_IObject::
~SG_IObject()