调整debugAOI()输出的信息。

kbengine · kbengine · commit ad64cda49239 · 2014-11-04T12:13:34.000+08:00
diff --git a/kbe/src/lib/pyscript/script.hpp b/kbe/src/lib/pyscript/script.hpp
@@ -153,7 +153,10 @@ class Script
 	static void acquireLock();
 	static void releaseLock();
 
+	INLINE ScriptStdOutErr* pyStdouterr()const;
 	INLINE ScriptStdOutErrHook* pyStdouterrHook()const;
+
+	INLINE void pyPrint(const std::string& str);
 protected:
 	PyObject* 					module_;
 	PyObject*					extraModule_;		// ��չ�ű�ģ��
diff --git a/kbe/src/lib/pyscript/script.ipp b/kbe/src/lib/pyscript/script.ipp
@@ -42,6 +42,16 @@ INLINE ScriptStdOutErrHook* Script::pyStdouterrHook()const
 	return pyStdouterrHook_;
 }
 
+INLINE ScriptStdOutErr* Script::pyStdouterr()const
+{
+	return pyStdouterr_;
+}
+
+INLINE void Script::pyPrint(const std::string& str)
+{
+	pyStdouterr_->pyPrint(str);
+}
+
 }
 }
 
diff --git a/kbe/src/lib/pyscript/scriptstdouterr.cpp b/kbe/src/lib/pyscript/scriptstdouterr.cpp
@@ -108,6 +108,16 @@ bool ScriptStdOutErr::install(void)
 		return false;
 	}
 
+	PyObject * m = PyImport_ImportModule("builtins");
+	if (!m)
+	{
+		ERROR_MSG("ScriptStdOut: Failed to import builtins module\n");
+		return false;
+	}
+
+	pyPrint_ = PyObject_GetAttrString(m, "print");
+	Py_DECREF(m);
+
 	prevStderr_ = PyObject_GetAttrString(sysModule_, "stderr");
 	prevStdout_ = PyObject_GetAttrString(sysModule_, "stdout");
 
@@ -134,12 +144,32 @@ bool ScriptStdOutErr::uninstall(void)
 		prevStdout_ = NULL;
 	}
 
+	if (pyPrint_)
+	{
+		Py_DECREF(pyPrint_);
+		pyPrint_ = NULL;
+	}
+
 	Py_DECREF(sysModule_);
 	sysModule_ = NULL;
 	isInstall_ = false;
 	return true;	
 }
 
+//-------------------------------------------------------------------------------------
+void ScriptStdOutErr::pyPrint(const std::string& str)
+{
+	PyObject* pyRet = PyObject_CallFunction(pyPrint_, 
+		const_cast<char*>("(s)"), str.c_str());
+	
+	SCRIPT_ERROR_CHECK();
+	
+	if(pyRet)
+	{
+		S_RELEASE(pyRet);
+	}
+}
+
 //-------------------------------------------------------------------------------------
 
 }
diff --git a/kbe/src/lib/pyscript/scriptstdouterr.hpp b/kbe/src/lib/pyscript/scriptstdouterr.hpp
@@ -50,11 +50,14 @@ class ScriptStdOutErr: public ScriptObject
 	virtual void onPrint(const wchar_t* msg, uint32 msglen);
 
 	INLINE std::wstring& buffer();
+
+	void pyPrint(const std::string& str);
 protected:
 	bool softspace_;
 	PyObject* sysModule_;
 	PyObject* prevStderr_;
 	PyObject* prevStdout_;
+	PyObject* pyPrint_;
 	bool isInstall_;
 	std::wstring sbuffer_;
 } ;
diff --git a/kbe/src/server/cellapp/entity.cpp b/kbe/src/server/cellapp/entity.cpp
@@ -1970,15 +1970,28 @@ void Entity::debugAOI()
 {
 	if(pWitness_ == NULL)
 	{
-		ERROR_MSG(fmt::format("{}::debugAOI: {} has no witness!\n", scriptName(), this->id()));
+		Cellapp::getSingleton().getScript().pyPrint(fmt::format("{}::debugAOI: {} has no witness!\n", scriptName(), this->id()));
 		return;
 	}
 	
-	INFO_MSG(fmt::format("{}::debugAOI: {} size={}\n", scriptName(), this->id(), 
-		pWitness_->aoiEntities().size()));
-
+	int pending = 0;
 	EntityRef::AOI_ENTITIES::iterator iter = pWitness_->aoiEntities().begin();
 	for(; iter != pWitness_->aoiEntities().end(); iter++)
+	{
+		Entity* pEntity = (*iter)->pEntity();
+
+		if(pEntity)
+		{
+			if(((*iter)->flags() & ENTITYREF_FLAG_ENTER_CLIENT_PENDING) > 0)
+				pending++;
+		}
+	}
+
+	Cellapp::getSingleton().getScript().pyPrint(fmt::format("{}::debugAOI: {} size={}, Seen={}, Pending={}\n", scriptName(), this->id(), 
+		pWitness_->aoiEntities().size(), pWitness_->aoiEntities().size() - pending, pending));
+
+	iter = pWitness_->aoiEntities().begin();
+	for(; iter != pWitness_->aoiEntities().end(); iter++)
 	{
 		Entity* pEntity = (*iter)->pEntity();
 		Position3D epos;
@@ -1991,13 +2004,13 @@ void Entity::debugAOI()
 			dist = KBEVec3Length(&distvec);
 		}
 
-		INFO_MSG(fmt::format("{7}::debugAOI: {0} {1}({2}), position({3}.{4}.{5}), dist={6}\n", 
+		Cellapp::getSingleton().getScript().pyPrint(fmt::format("{7}::debugAOI: {0} {1}({2}), position({3}.{4}.{5}), dist={6}, Seen={8}\n", 
 			this->id(), 
 			(pEntity != NULL ? pEntity->scriptName() : "unknown"),
 			(*iter)->id(),
 			epos.x, epos.y, epos.z,
 			dist,
-			this->scriptName()));
+			this->scriptName(), (((*iter)->flags() & ENTITYREF_FLAG_ENTER_CLIENT_PENDING) ? "false" : "true")));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,16 @@ INLINE ScriptStdOutErrHook* Script::pyStdouterrHook()const`
`42`	`42`	`return pyStdouterrHook_;`
`43`	`43`	`}`
`44`	`44`
	`45`	`+INLINE ScriptStdOutErr* Script::pyStdouterr()const`
	`46`	`+{`
	`47`	`+ return pyStdouterr_;`
	`48`	`+}`
	`49`	`+`
	`50`	`+INLINE void Script::pyPrint(const std::string& str)`
	`51`	`+{`
	`52`	`+ pyStdouterr_->pyPrint(str);`
	`53`	`+}`
	`54`	`+`
`45`	`55`	`}`
`46`	`56`	`}`
`47`	`57`