From 15da2d3d251ab6b359fb1adf63230d1e18b7faeb Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Sun, 26 Jan 2025 00:41:05 +0100 Subject: [PATCH] Revert "DEBUGGERY" This reverts commit e1becd8a390bbb2396808559bb3ab00917a28322. --- games/devtest/mods/testentities/visuals.lua | 2 +- irr/include/matrix4.h | 15 --------------- irr/src/SkinnedMesh.cpp | 6 ------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/games/devtest/mods/testentities/visuals.lua b/games/devtest/mods/testentities/visuals.lua index 11b330b9a..26b538e7f 100644 --- a/games/devtest/mods/testentities/visuals.lua +++ b/games/devtest/mods/testentities/visuals.lua @@ -111,7 +111,7 @@ core.register_entity("testentities:cool_guy", { }, }, on_activate = function(self) - self.object:set_animation({x = 15, y = 15}, 0, 0, true) + self.object:set_animation({x = 0, y = 29}, 30, 0, true) end, }) diff --git a/irr/include/matrix4.h b/irr/include/matrix4.h index a78784b9c..ac6cff9b5 100644 --- a/irr/include/matrix4.h +++ b/irr/include/matrix4.h @@ -13,7 +13,6 @@ #include "rect.h" #include #include "IrrCompileConfig.h" // for IRRLICHT_API -#include namespace irr { @@ -89,20 +88,6 @@ public: { return M[index]; } - //! Debug print the matrix - friend std::ostream& operator<<(std::ostream& os, const CMatrix4& matrix) - { - os << "Matrix4:" << std::endl; - for (int row = 0; row < 4; ++row) - { - for (int col = 0; col < 4; ++col) - { - os << matrix(row, col) << " "; - } - os << std::endl; - } - return os; - } //! Simple operator for linearly accessing every element of the matrix. const T &operator[](u32 index) const { return M[index]; } diff --git a/irr/src/SkinnedMesh.cpp b/irr/src/SkinnedMesh.cpp index 83f37c869..e9dcc40f5 100644 --- a/irr/src/SkinnedMesh.cpp +++ b/irr/src/SkinnedMesh.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -468,7 +467,6 @@ SkinnedMesh *SkinnedMeshBuilder::finalize() else matrices.push_back(std::get(joint->transform).buildMatrix()); } - auto local_matrices = matrices; calculateGlobalMatrices(matrices); @@ -483,10 +481,6 @@ SkinnedMesh *SkinnedMeshBuilder::finalize() SSkinMeshBuffer *Buffer = (*SkinningBuffers)[attachedMeshIdx]; Buffer->Transformation = matrices[i]; } - std::cout << "Joint Name: " << joint->Name.value_or("unnamed") << std::endl; - std::cout << "Local: " << local_matrices[i] << std::endl; - std::cout << "Global: " << matrices[i] << std::endl; - std::cout << "Global Inverse: " << joint->GlobalInversedMatrix.value() << std::endl; } recalculateBaseBoundingBoxes();