slightly more stable?

Author: yohjimane

src/Layers/xrRender/r__dsgraph_render.cpp

@@ -32,11 +32,9 @@ bool cmp_ssa(const T &lhs, const T &rhs)
 template <typename T>
 bool cmp_pass(const T& left, const T& right)
 {
-    Msg("try cmp pass %s %s", left->first->ps->cName.c_str(), right->first->ps->cName.c_str());
     if (left->first->equal(*right->first))
         return false;
 
-    Msg("cmp pass ok %s %s %f %f", left->first->ps->cName.c_str(), right->first->ps->cName.c_str(), left->second.ssa, right->second.ssa);
     return left->second.ssa >= right->second.ssa;
 }
 

src/xrGame/PhysicObject.cpp

@@ -382,6 +382,30 @@ void CPhysicObject::AddElement(CPhysicsElement* root_e, int id)
     E->mXFORM.set(K->LL_GetTransform(u16(id)));
     Fobb bb = K->LL_GetBox(u16(id));
 
+    if (dbg_draw_doors)
+    {
+        const u16 bone_id = static_cast<u16>(id);
+        CBoneData& bone_data = K->LL_GetData(bone_id);
+        const SBoneShape& shape = bone_data.shape;
+        const SJointIKData& joint = bone_data.IK_data;
+        const char* bone_name = K->LL_BoneName_dbg(bone_id);
+        Msg("[door_physics] AddElement bone='%s' id=%u parent=%p element=%p shape=%u flags=0x%X halfsize=(%.3f, %.3f, %.3f)"
+            " joint_type=%u limits_y=(%.3f, %.3f) no_physics=%s",
+            bone_name ? bone_name : "<unnamed>",
+            bone_id,
+            root_e,
+            E,
+            shape.type,
+            shape.flags.get(),
+            shape.box.m_halfsize.x,
+            shape.box.m_halfsize.y,
+            shape.box.m_halfsize.z,
+            joint.type,
+            joint.limits[1].limit.x,
+            joint.limits[1].limit.y,
+            shape.flags.is(SBoneShape::sfNoPhysics) ? "true" : "false");
+    }
+
     if (bb.m_halfsize.magnitude() < 0.05f)
     {
         bb.m_halfsize.add(0.05f);
@@ -414,6 +438,12 @@ void CPhysicObject::CreateBody(CSE_ALifeObjectPhysic* po)
 {
     if (m_pPhysicsShell)
         return;
+    if (dbg_draw_doors)
+    {
+        const char* visual_name = cNameVisual().c_str();
+        Msg("[door_physics] CreateBody start obj='%s' visual='%s' type=%d mass=%.3f", cName().c_str(),
+            visual_name ? visual_name : "<none>", int(m_type), m_mass);
+    }
     IKinematics* pKinematics = smart_cast<IKinematics*>(Visual());
     switch (m_type)
     {
@@ -429,6 +459,11 @@ void CPhysicObject::CreateBody(CSE_ALifeObjectPhysic* po)
         m_pPhysicsShell->set_Kinematics(pKinematics);
         AddElement(0, pKinematics->LL_GetBoneRoot());
         m_pPhysicsShell->setMass1(m_mass);
+        if (dbg_draw_doors)
+        {
+            Msg("[door_physics] CreateBody built chain shell: bone_root=%u bone_count=%u", pKinematics->LL_GetBoneRoot(),
+                pKinematics->LL_BoneCount());
+        }
     }
     break;
 
@@ -440,6 +475,11 @@ void CPhysicObject::CreateBody(CSE_ALifeObjectPhysic* po)
     break;
     }
 
+    if (dbg_draw_doors)
+    {
+        Msg("[door_physics] CreateBody post-switch shell=%p", m_pPhysicsShell);
+    }
+
     m_pPhysicsShell->mXFORM.set(XFORM());
     m_pPhysicsShell->SetAirResistance(0.001f, 0.02f);
     if (pKinematics)

src/xrScriptEngine/script_engine.cpp

@@ -572,18 +572,28 @@ void CScriptEngine::print_error(lua_State* L, int iErrorCode)
     {
     case LUA_ERRRUN:
         scriptEngine->script_log(LuaMessageType::Error, "SCRIPT RUNTIME ERROR");
+        scriptEngine->print_stack(L);
+        LogMemoryUsage(L, "runtime error");
         break;
     case LUA_ERRMEM:
         scriptEngine->script_log(LuaMessageType::Error, "SCRIPT ERROR (memory allocation)");
+        scriptEngine->print_stack(L);
+        LogMemoryUsage(L, "memory error");
         break;
     case LUA_ERRERR:
         scriptEngine->script_log(LuaMessageType::Error, "SCRIPT ERROR (while running the error handler function)");
+        scriptEngine->print_stack(L);
+        LogMemoryUsage(L, "error handler failure");
         break;
     case LUA_ERRFILE:
         scriptEngine->script_log(LuaMessageType::Error, "SCRIPT ERROR (while running file)");
+        scriptEngine->print_stack(L);
+        LogMemoryUsage(L, "file error");
         break;
     case LUA_ERRSYNTAX:
         scriptEngine->script_log(LuaMessageType::Error, "SCRIPT SYNTAX ERROR");
+        scriptEngine->print_stack(L);
+        LogMemoryUsage(L, "syntax error");
         break;
     case LUA_YIELD:
         scriptEngine->script_log(LuaMessageType::Info, "Thread is yielded");
@@ -600,6 +610,24 @@ void CScriptEngine::flush_log()
     m_output.save_to(log_file_name);
 }
 
+void CScriptEngine::LogMemoryUsage(lua_State* state, pcstr reason)
+{
+    if (!state)
+        return;
+
+    CScriptEngine* engine = GetInstance(state);
+    if (!engine)
+        return;
+
+    const int kb = lua_gc(state, LUA_GCCOUNT, 0);
+    const int bytes = lua_gc(state, LUA_GCCOUNTB, 0);
+    const int total_bytes = kb * 1024 + bytes;
+
+    const pcstr tag = reason ? reason : "unknown";
+    Msg("[LUA][memory] %s : %d KB + %d B (total %d bytes)", tag, kb, bytes, total_bytes);
+    engine->script_log(LuaMessageType::Info, "[memory] %s : %d KB + %d B (total %d bytes)", tag, kb, bytes, total_bytes);
+}
+
 CScriptEngine::CScriptEngine(bool is_editor, bool is_with_profiler)
 {
     luabind::allocator = &luabind_allocator;

src/xrScriptEngine/script_engine.hpp

@@ -194,6 +194,7 @@ class XRSCRIPTENGINE_API CScriptEngine
 
 private:
     static void print_error(lua_State* L, int iErrorCode);
+    static void LogMemoryUsage(lua_State* state, pcstr reason);
 
 public:
     static void on_error(lua_State* state);