Revision: 19873
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19873
Author: ben2610
Date: 2009-04-22 18:58:04 +0200 (Wed, 22 Apr 2009)
Log Message:
-----------
BGE: some more cleanup, remove useless ReplicaSetName(), move code to
ProcessReplica.
Modified Paths:
--------------
trunk/blender/source/gameengine/Expressions/Value.cpp
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h
trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.h
Modified: trunk/blender/source/gameengine/Expressions/Value.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.cpp 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Expressions/Value.cpp 2009-04-22
16:58:04 UTC (rev 19873)
@@ -524,8 +524,6 @@
m_ValFlags.RefCountDisabled = false;
- ReplicaSetName(GetName());
-
/* copy all props */
if (m_pNamedPropertyArray)
{
Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h 2009-04-22 16:26:22 UTC
(rev 19872)
+++ trunk/blender/source/gameengine/Expressions/Value.h 2009-04-22 16:58:04 UTC
(rev 19873)
@@ -294,7 +294,6 @@
virtual STR_String GetName() = 0;
// Retrieve the name of the
value
virtual void SetName(STR_String name) = 0;
// Set the name of the value
- virtual void ReplicaSetName(STR_String name) = 0;
/** Sets the value to this cvalue.
* @attention this particular function should never be called. Why not
abstract? */
virtual void SetValue(CValue* newval);
@@ -410,10 +409,10 @@
if (name.Length())
m_pstrNewName = new STR_String(name);
}
- virtual void ReplicaSetName(STR_String name) {
- m_pstrNewName=NULL;
- if (name.Length())
- m_pstrNewName = new STR_String(name);
+ virtual void ProcessReplica() {
+ CValue::ProcessReplica();
+ if (m_pstrNewName)
+ m_pstrNewName = new STR_String(*m_pstrNewName);
}
virtual STR_String GetName() {
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
2009-04-22 16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
2009-04-22 16:58:04 UTC (rev 19873)
@@ -143,14 +143,6 @@
}
-
-void SCA_ILogicBrick::ReplicaSetName(STR_String name)
-{
- m_name = name;
-}
-
-
-
bool SCA_ILogicBrick::IsActive()
{
return m_bActive;
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h 2009-04-22
16:58:04 UTC (rev 19873)
@@ -72,7 +72,6 @@
virtual double GetNumber();
virtual STR_String GetName();
virtual void SetName(STR_String name);
- virtual void ReplicaSetName(STR_String name);
bool IsActive();
void SetActive(bool active) ;
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2009-04-22
16:58:04 UTC (rev 19873)
@@ -199,26 +199,11 @@
m_name = name;
}; // Set the name
of the value
-
-
-void KX_GameObject::ReplicaSetName(STR_String name)
-{
-}
-
-
-
-
-
-
KX_IPhysicsController* KX_GameObject::GetPhysicsController()
{
return m_pPhysicsController1;
}
-
-
-
-
KX_GameObject* KX_GameObject::GetParent()
{
KX_GameObject* result = NULL;
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.h 2009-04-22
16:58:04 UTC (rev 19873)
@@ -257,14 +257,6 @@
STR_String name
);
- /**
- * Inherited from CValue -- does nothing.
- */
- void
- ReplicaSetName(
- STR_String name
- );
-
/**
* Inherited from CValue -- return a new copy of this
* instance allocated on the heap. Ownership of the new
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2009-04-22
16:58:04 UTC (rev 19873)
@@ -138,7 +138,6 @@
STR_String KX_MeshProxy::GetName() { return m_meshobj->GetName();}
void KX_MeshProxy::SetName(STR_String name) { };
CValue* KX_MeshProxy::GetReplica() { return NULL;}
-void KX_MeshProxy::ReplicaSetName(STR_String name) {};
// stuff for python integration
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h 2009-04-22
16:58:04 UTC (rev 19873)
@@ -53,7 +53,6 @@
virtual RAS_MeshObject* GetMesh() { return m_meshobj; }
virtual STR_String GetName();
virtual void SetName(STR_String name);
// Set the name of the value
- virtual void ReplicaSetName(STR_String name);
virtual CValue* GetReplica();
// stuff for python integration
Modified: trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2009-04-22
16:58:04 UTC (rev 19873)
@@ -183,9 +183,7 @@
STR_String KX_PolyProxy::GetName() { return sPolyName;}
void KX_PolyProxy::SetName(STR_String) { };
CValue* KX_PolyProxy::GetReplica() { return NULL;}
-void KX_PolyProxy::ReplicaSetName(STR_String) {};
-
// stuff for python integration
KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMaterialIndex,
Modified: trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h 2009-04-22
16:58:04 UTC (rev 19873)
@@ -48,7 +48,6 @@
double GetNumber();
STR_String GetName();
void SetName(STR_String name);
// Set the name of the value
- void ReplicaSetName(STR_String name);
CValue* GetReplica();
Modified: trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp 2009-04-22
16:58:04 UTC (rev 19873)
@@ -340,9 +340,7 @@
STR_String KX_VertexProxy::GetName() { return sVertexName;}
void KX_VertexProxy::SetName(STR_String) { };
CValue* KX_VertexProxy::GetReplica() { return NULL;}
-void KX_VertexProxy::ReplicaSetName(STR_String) {};
-
// stuff for python integration
PyObject* KX_VertexProxy::PyGetXYZ()
Modified: trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.h 2009-04-22
16:26:22 UTC (rev 19872)
+++ trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.h 2009-04-22
16:58:04 UTC (rev 19873)
@@ -49,7 +49,6 @@
double GetNumber();
STR_String GetName();
void SetName(STR_String name);
// Set the name of the value
- void ReplicaSetName(STR_String name);
CValue* GetReplica();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
