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

Merged

Browse Source 
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
This commit is contained in:
Tamito Kajiyama
2009-09-18 22:25:49 +00:00
parent 0a4d70f4d0
commit be50ce61be
3509 changed files with 612152 additions and 643374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,23 +33,26 @@
#include <config.h>
#endif
SG_Stage gSG_Stage = SG_STAGE_UNKNOWN;
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)
@@ -72,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()