diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-26 20:58:02 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-26 20:58:02 +0100 |
commit | 5574eccebd16ae38a2a21ed202d1f9d1ba8f67a4 (patch) | |
tree | b742447d1b3262c1541e9c0fe037ad35be467dff /src/graphics/engine/test | |
parent | f9f15a2f3f80f968a64e76141b1e6fa5e28c7232 (diff) | |
download | colobot-5574eccebd16ae38a2a21ed202d1f9d1ba8f67a4.tar.gz colobot-5574eccebd16ae38a2a21ed202d1f9d1ba8f67a4.tar.bz2 colobot-5574eccebd16ae38a2a21ed202d1f9d1ba8f67a4.zip |
Engine optimization - rewritten model management
- new class CModelManager
- rewritten engine object structure in CEngine
- created shared model data instead of separate objects per each
model instance
- minor refactoring
Diffstat (limited to 'src/graphics/engine/test')
-rw-r--r-- | src/graphics/engine/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/graphics/engine/test/modelfile_test.cpp | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/graphics/engine/test/CMakeLists.txt b/src/graphics/engine/test/CMakeLists.txt index 4e3263b..b1db2c7 100644 --- a/src/graphics/engine/test/CMakeLists.txt +++ b/src/graphics/engine/test/CMakeLists.txt @@ -8,7 +8,6 @@ modelfile_test.cpp ../modelfile.cpp ../../../common/logger.cpp ../../../common/stringutils.cpp -../../../common/iman.cpp ) add_definitions(-DMODELFILE_NO_ENGINE) diff --git a/src/graphics/engine/test/modelfile_test.cpp b/src/graphics/engine/test/modelfile_test.cpp index 6879a1b..43cd43b 100644 --- a/src/graphics/engine/test/modelfile_test.cpp +++ b/src/graphics/engine/test/modelfile_test.cpp @@ -15,12 +15,11 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include "common/iman.h" #include "common/logger.h" #include "graphics/engine/modelfile.h" #include "math/func.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> #include <cassert> #include <sstream> @@ -190,8 +189,7 @@ TEST(ModelFileTest, RWTxtModel) std::stringstream str; str.str(TEXT_MODEL); - CInstanceManager iMan; - Gfx::CModelFile modelFile(&iMan); + Gfx::CModelFile modelFile; EXPECT_TRUE(modelFile.ReadTextModel(str)); @@ -216,8 +214,7 @@ TEST(ModelFileTest, RWBinModel) std::stringstream str; str.str(TEXT_MODEL); - CInstanceManager iMan; - Gfx::CModelFile modelFile(&iMan); + Gfx::CModelFile modelFile; EXPECT_TRUE(modelFile.ReadTextModel(str)); @@ -242,8 +239,7 @@ TEST(ModelFileTest, RWOldModel) std::stringstream str; str.str(TEXT_MODEL); - CInstanceManager iMan; - Gfx::CModelFile modelFile(&iMan); + Gfx::CModelFile modelFile; EXPECT_TRUE(modelFile.ReadTextModel(str)); |