Added ServerEntity.model_handle

Moved model_header from Entity to ServerEntity

Author: Ayuto

addons/source-python/packages/source-python/entities/_base.py

@@ -358,15 +358,6 @@ def _set_parent(self, parent):
 
         .. seealso:: :meth:`get_parent` and :meth:`set_parent`""")
 
-    @property
-    def model_header(self):
-        """Return the entity's model header.
-
-        :rtype: ModelHeader
-        """
-        return model_cache.get_model_header(model_cache.find_model(
-            self.model_name))
-
     def get_property_bool(self, name):
         """Return the boolean property.
 

src/CMakeLists.txt

@@ -209,6 +209,7 @@ Set(SOURCEPYTHON_ENTITIES_MODULE_HEADERS
 )
 
 Set(SOURCEPYTHON_ENTITIES_MODULE_SOURCES
+    core/modules/entities/entities.cpp
     core/modules/entities/entities_constants_wrap.cpp
     core/modules/entities/entities_helpers_wrap.cpp
     core/modules/entities/entities_wrap.cpp

src/core/modules/entities/entities.cpp

@@ -0,0 +1,90 @@
+/**
+* =============================================================================
+* Source Python
+* Copyright (C) 2012-2018 Source Python Development Team.  All rights reserved.
+* =============================================================================
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License, version 3.0, as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, the Source Python Team gives you permission
+* to link the code of this program (as well as its derivative works) to
+* "Half-Life 2," the "Source Engine," and any Game MODs that run on software
+* by the Valve Corporation.  You must obey the GNU General Public License in
+* all respects for all other code used.  Additionally, the Source.Python
+* Development Team grants this exception to all derivative works.
+*/
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+// Source.Python
+#include "entities.h"
+
+
+// ============================================================================
+// >> External variables
+// ============================================================================
+extern IMDLCache *modelcache;
+
+
+// ============================================================================
+// >> IServerUnknownExt
+// ============================================================================
+const char* IServerUnknownExt::GetClassname(IServerUnknown* pUnknown)
+{
+	IServerNetworkable* pNetworkable = pUnknown->GetNetworkable();
+	if (!pNetworkable)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to get the IServerNetworkable pointer.");
+
+	return pNetworkable->GetClassName();
+}
+
+bool IServerUnknownExt::IsNetworked(IServerUnknown* pUnknown)
+{
+	IServerNetworkable *pServerNetworkable = pUnknown->GetNetworkable();
+	if (pServerNetworkable)
+		return pServerNetworkable->GetEdict() != NULL;
+
+	return false;
+}
+
+
+// ============================================================================
+// >> ServerEntityExt
+// ============================================================================
+void ServerEntityExt::SetModelName(IServerEntity *pServerEntity, const char *szModelName)
+{
+	CBaseEntity *pBaseEntity = pServerEntity->GetBaseEntity();
+	if (!pBaseEntity)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "BaseEntity is NULL.");
+
+	((CBaseEntityWrapper *)pBaseEntity)->SetKeyValue("model", szModelName);
+}
+
+MDLHandle_t ServerEntityExt::get_model_handle(IServerEntity *pServerEntity)
+{
+	string_t name = pServerEntity->GetModelName();
+	if (!name)
+		return MDLHANDLE_INVALID;
+
+	return modelcache->FindMDL(name.ToCStr());
+}
+
+studiohdr_t* ServerEntityExt::get_model_header(IServerEntity *pServerEntity)
+{
+	MDLHandle_t handle = get_model_handle(pServerEntity);
+	if (handle == MDLHANDLE_INVALID)
+		return NULL;
+
+	return modelcache->GetStudioHdr(handle);
+}

src/core/modules/entities/entities.h

@@ -49,14 +49,9 @@
 class ServerEntityExt
 {
 public:
-	static void SetModelName(IServerEntity *pServerEntity, const char *szModelName)
-	{
-		CBaseEntity *pBaseEntity = pServerEntity->GetBaseEntity();
-		if (!pBaseEntity)
-			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "BaseEntity is NULL.");
-
-		((CBaseEntityWrapper *)pBaseEntity)->SetKeyValue("model", szModelName);
-	}
+	static void SetModelName(IServerEntity *pServerEntity, const char *szModelName);
+	static MDLHandle_t get_model_handle(IServerEntity *pServerEntity);
+	static studiohdr_t* get_model_header(IServerEntity *pServerEntity);
 };
 
 

src/core/modules/entities/entities_entity.cpp

@@ -36,26 +36,12 @@
 #include "modules/physics/physics.h"
 #include ENGINE_INCLUDE_PATH(entities_datamaps_wrap.h)
 
+
 // ============================================================================
-// >> CBaseEntityWrapper
+// >> External variables
 // ============================================================================
-const char* IServerUnknownExt::GetClassname(IServerUnknown* pUnknown)
-{
-	IServerNetworkable* pNetworkable = pUnknown->GetNetworkable();
-	if (!pNetworkable)
-		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to get the IServerNetworkable pointer.");
+extern IMDLCache *modelcache;
 
-	return pNetworkable->GetClassName();
-}
-
-bool IServerUnknownExt::IsNetworked(IServerUnknown* pUnknown)
-{
-	IServerNetworkable *pServerNetworkable = pUnknown->GetNetworkable();
-	if (pServerNetworkable)
-		return pServerNetworkable->GetEdict() != NULL;
-
-	return false;
-}
 
 // ============================================================================
 // >> CBaseEntityWrapper
@@ -341,4 +327,4 @@ bool CBaseEntityWrapper::IsPlayer()
 IPhysicsObjectWrapper* CBaseEntityWrapper::GetPhysicsObject()
 {
 	return Wrap<IPhysicsObjectWrapper>(GetDatamapProperty<IPhysicsObject*>("m_pPhysicsObject"));
-}
+}

src/core/modules/entities/entities_entity.h

@@ -192,6 +192,10 @@ class CBaseEntityWrapper: public IServerEntity
 
 	// Other methods
 	bool IsPlayer();
+
+	// Model stuff
+	MDLHandle_t get_model_handle();
+	studiohdr_t* get_model_header();
 };
 
 

src/core/modules/entities/entities_wrap.cpp

@@ -201,13 +201,27 @@ void export_server_entity(scope _entities)
 		.add_property("model_index",
 			&IServerEntity::GetModelIndex,
 			&IServerEntity::SetModelIndex,
-			"Returns the model index for this entity."
+			"Returns the model index for this entity.\n\n"
+			":rtype: int"
 		)
 
 		.add_property("model_name",
 			&IServerEntity::GetModelName,
 			&ServerEntityExt::SetModelName,
-			"Returns the name of the model this entity is using."
+			"Return the name of the model this entity is using.\n\n"
+			":rtype: str"
+		)
+
+		.add_property("model_handle",
+			&ServerEntityExt::get_model_handle,
+			"Return the handle of the entity's model.\n\n"
+			":rtype: int"
+		)
+
+		.add_property("model_header",
+			make_function(&ServerEntityExt::get_model_header, reference_existing_object_policy()),
+			"Return the entity's model header.\n\n"
+			":rtype: ModelHeader"
 		)
 
 		ADD_MEM_TOOLS(IServerEntity)