Improved Entity's initialization by pre-caching BaseEntity.pointer.

Author: jordanbriere

Diff for: src/core/modules/entities/entities_entity.cpp

@@ -36,6 +36,7 @@
 #include "modules/physics/physics.h"
 #include ENGINE_INCLUDE_PATH(entities_datamaps_wrap.h)
 #include "../engines/engines.h"
+#include "modules/core/core_cache.h"
 
 // ============================================================================
 // >> External variables
@@ -59,6 +60,12 @@ boost::shared_ptr<CBaseEntityWrapper> CBaseEntityWrapper::wrap(CBaseEntity* pEnt
 	);
 }
 
+void CBaseEntityWrapper::Initialize(object self, unsigned int uiEntityIndex)
+{
+	static CCachedProperty *pointer = extract<CCachedProperty *>(get_class_object<CBaseEntityWrapper>().attr("pointer"));
+	pointer->set_cached_value(self, object(GetPointer()));
+}
+
 CBaseEntity* CBaseEntityWrapper::create(const char* name)
 {
 #ifdef ENGINE_CSGO

Diff for: src/core/modules/entities/entities_entity.h

@@ -94,6 +94,7 @@ class CBaseEntityWrapper: public IServerEntity
 
 public:
 	static boost::shared_ptr<CBaseEntityWrapper> __init__(unsigned int uiEntityIndex);
+	void Initialize(object self, unsigned int uiEntityIndex);
 	static boost::shared_ptr<CBaseEntityWrapper> wrap(CBaseEntity* pEntity);
 	static CBaseEntity* create(const char* name);
 	static object create(object cls, const char* name);

Diff for: src/core/modules/entities/entities_entity_wrap.cpp

@@ -61,7 +61,13 @@ void export_base_entity(scope _entity)
 	BaseEntity.def("__init__",
 		make_constructor(
 			&CBaseEntityWrapper::__init__,
-			default_call_policies(),
+			post_constructor_policies<default_call_policies>(
+				make_function(
+					&CBaseEntityWrapper::Initialize,
+					default_call_policies(),
+					args("self", "entity_index")
+				)
+			),
 			args("entity_index")
 		)
 	);

Diff for: src/core/utilities/sp_util.h

@@ -93,6 +93,19 @@ inline bool CheckClassname(object obj, char* name)
 	return strcmp(extract<char *>(obj.attr("__class__").attr("__name__")), name) == 0;
 }
 
+//-----------------------------------------------------------------------------
+// Returns the registered python class for T.
+//-----------------------------------------------------------------------------
+template<class T>
+inline object get_class_object()
+{
+	const converter::registration *pRegistration = converter::registry::query(typeid(T));
+	if (!pRegistration || !pRegistration->m_class_object)
+		return object();
+	
+	return object(handle<>(borrowed(upcast<PyObject>(pRegistration->m_class_object))));
+}
+
 //-----------------------------------------------------------------------------
 // Helper template methods for __getitem__ and __setitem__
 //-----------------------------------------------------------------------------