griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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

73
source/gameengine/SceneGraph/SG_Node.cpp
View File

@@ -40,12 +40,13 @@ using namespace std;
SG_Node::SG_Node(
void* clientobj,
void* clientinfo,
SG_Callbacks callbacks
SG_Callbacks& callbacks
)
: SG_Spatial(clientobj,clientinfo,callbacks),
m_SGparent(NULL)
{
m_modified = true;
}
SG_Node::SG_Node(
@@ -55,7 +56,7 @@ SG_Node::SG_Node(
m_children(other.m_children),
m_SGparent(other.m_SGparent)
{
// nothing to do
m_modified = true;
}
SG_Node::~SG_Node()
@@ -141,22 +142,6 @@ Destruct()
ActivateDestructionCallback();
}
SG_Node*
SG_Node::
GetSGParent(
) const {
return m_SGparent;
}
void
SG_Node::
SetSGParent(
SG_Node* parent
){
m_SGparent = parent;
}
const
SG_Node*
SG_Node::
@@ -165,28 +150,6 @@ GetRootSGParent(
return (m_SGparent ? (const SG_Node*) m_SGparent->GetRootSGParent() : (const SG_Node*) this);
}
bool
SG_Node::
IsVertexParent()
{
if (m_parent_relation)
{
return m_parent_relation->IsVertexRelation();
}
return false;
}
bool
SG_Node::
IsSlowParent()
{
if (m_parent_relation)
{
return m_parent_relation->IsSlowRelation();
}
return false;
}
void
SG_Node::
DisconnectFromParent(
@@ -199,8 +162,6 @@ DisconnectFromParent(
}
void SG_Node::AddChild(SG_Node* child)
{
m_children.push_back(child);
@@ -219,40 +180,26 @@ void SG_Node::RemoveChild(SG_Node* child)
void SG_Node::UpdateWorldData(double time)
void SG_Node::UpdateWorldData(double time, bool parentUpdated)
{
//if (!GetSGParent())
// return;
if (UpdateSpatialData(GetSGParent(),time))
if (UpdateSpatialData(GetSGParent(),time,parentUpdated))
// to update the
ActivateUpdateTransformCallback();
// The node is updated, remove it from the update list
Delink();
// update children's worlddata
for (NodeList::iterator it = m_children.begin();it!=m_children.end();++it)
{
(*it)->UpdateWorldData(time);
(*it)->UpdateWorldData(time, parentUpdated);
}
}
NodeList& SG_Node::GetSGChildren()
{
return this->m_children;
}
const NodeList& SG_Node::GetSGChildren() const
{
return this->m_children;
}
void SG_Node::ClearSGChildren()
{
m_children.clear();
}
void SG_Node::SetSimulatedTime(double time,bool recurse)
{