diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-20 23:31:33 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-20 23:31:33 +0200 |
commit | f509312bfe078d18b6f57af8011999231864d7fe (patch) | |
tree | a197c0da3ef01902c8c2bb6b40daedf113302a6c /test/unit/graphics | |
parent | 5d15d37ef23a43ebe595674b7503112407356cb0 (diff) | |
parent | e2be034ec369dbe23b17281a21338282a0258ff2 (diff) | |
download | colobot-f509312bfe078d18b6f57af8011999231864d7fe.tar.gz colobot-f509312bfe078d18b6f57af8011999231864d7fe.tar.bz2 colobot-f509312bfe078d18b6f57af8011999231864d7fe.zip |
Merge commit 'colobot-gold-0.1.4-alpha' into debian
* commit 'colobot-gold-0.1.4-alpha': (159 commits)
Release alpha-0.1.4
Fixed console spam when music files are not installed
Updated data submodule
Fixed amount of fireball damage done to allies, close issue #356
Fixed icon on Windows; updated properties in .rc file
COLOBOT: Gold Edition -> Colobot: Gold Edition
Updated data submodule
#335, #348, #352
Updated INSTALL.md to reflect latest changes to music repository
Added oggenc to Travis config
Fallback to English files if translated ones are not available
Removed duplicate license header
Tools for measuring mission time without opening game window
Fixed m_exitAfterMission
Fixed #335 and #348
Added -headless
Changing resolution from commandline
-runscene for userlevels
Increased mission end accuracy
Added some debug stuff, possible fix for #348 and #335
...
Diffstat (limited to 'test/unit/graphics')
-rw-r--r-- | test/unit/graphics/core/device_mock.h | 35 | ||||
-rw-r--r-- | test/unit/graphics/engine/engine_mock.h | 18 | ||||
-rw-r--r-- | test/unit/graphics/engine/lightman_test.cpp | 18 | ||||
-rw-r--r-- | test/unit/graphics/engine/modelfile_test.cpp | 18 |
4 files changed, 72 insertions, 17 deletions
diff --git a/test/unit/graphics/core/device_mock.h b/test/unit/graphics/core/device_mock.h index 498239f..5ab0b7d 100644 --- a/test/unit/graphics/core/device_mock.h +++ b/test/unit/graphics/core/device_mock.h @@ -1,3 +1,21 @@ +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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://gnu.org/licenses + */ #pragma once #include "graphics/core/device.h" @@ -21,11 +39,8 @@ public: MOCK_METHOD0(Clear, void()); MOCK_METHOD2(SetTransform, void(Gfx::TransformType type, const Math::Matrix &matrix)); - MOCK_METHOD1(GetTransform, const Math::Matrix& (Gfx::TransformType type)); - MOCK_METHOD2(MultiplyTransform, void(Gfx::TransformType type, const Math::Matrix &matrix)); MOCK_METHOD1(SetMaterial, void(const Gfx::Material &material)); - MOCK_METHOD0(GetMaterial, const Gfx::Material&()); MOCK_METHOD0(GetMaxLightCount, int()); @@ -33,7 +48,6 @@ public: MOCK_METHOD1(GetLight, const Gfx::Light&(int index)); MOCK_METHOD2(SetLightEnabled, void(int index, bool enabled)); - MOCK_METHOD1(GetLightEnabled, bool(int index)); MOCK_METHOD2(CreateTexture, Gfx::Texture(CImage *image, const Gfx::TextureCreateParams ¶ms)); MOCK_METHOD2(CreateTexture, Gfx::Texture(ImageData *data, const Gfx::TextureCreateParams ¶ms)); @@ -45,13 +59,10 @@ public: MOCK_METHOD2(SetTexture, void(int index, const Gfx::Texture &texture)); MOCK_METHOD2(SetTexture, void(int index, unsigned int textureId)); - MOCK_METHOD1(GetTexture, Gfx::Texture(int index)); MOCK_METHOD2(SetTextureEnabled, void(int index, bool enabled)); - MOCK_METHOD1(GetTextureEnabled, bool(int index)); MOCK_METHOD2(SetTextureStageParams, void(int index, const Gfx::TextureStageParams ¶ms)); - MOCK_METHOD1(GetTextureStageParams, Gfx::TextureStageParams(int index)); MOCK_METHOD3(SetTextureStageWrap, void(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT)); @@ -77,34 +88,24 @@ public: MOCK_METHOD1(GetRenderState, bool(Gfx::RenderState state)); MOCK_METHOD1(SetDepthTestFunc, void(Gfx::CompFunc func)); - MOCK_METHOD0(GetDepthTestFunc, Gfx::CompFunc()); MOCK_METHOD1(SetDepthBias, void(float factor)); - MOCK_METHOD0(GetDepthBias, float()); MOCK_METHOD2(SetAlphaTestFunc, void(Gfx::CompFunc func, float refValue)); - MOCK_METHOD2(GetAlphaTestFunc, void(Gfx::CompFunc &func, float &refValue)); MOCK_METHOD2(SetBlendFunc, void(Gfx::BlendFunc srcBlend, Gfx::BlendFunc dstBlend)); - MOCK_METHOD2(GetBlendFunc, void(Gfx::BlendFunc &srcBlend, Gfx::BlendFunc &dstBlend)); MOCK_METHOD1(SetClearColor, void(const Gfx::Color &color)); - MOCK_METHOD0(GetClearColor, Gfx::Color()); MOCK_METHOD1(SetGlobalAmbient, void(const Gfx::Color &color)); - MOCK_METHOD0(GetGlobalAmbient, Gfx::Color()); MOCK_METHOD5(SetFogParams, void(Gfx::FogMode mode, const Gfx::Color &color, float start, float end, float density)); - MOCK_METHOD5(GetFogParams, void(Gfx::FogMode &mode, Gfx::Color &color, float &start, float &end, float &density)); MOCK_METHOD1(SetCullMode, void(Gfx::CullMode mode)); - MOCK_METHOD0(GetCullMode, Gfx::CullMode()); MOCK_METHOD1(SetShadeModel, void(Gfx::ShadeModel model)); - MOCK_METHOD0(GetShadeModel, Gfx::ShadeModel()); MOCK_METHOD1(SetFillMode, void(Gfx::FillMode mode)); - MOCK_METHOD0(GetFillMode, Gfx::FillMode()); MOCK_CONST_METHOD0(GetFrameBufferPixels, void*()); }; diff --git a/test/unit/graphics/engine/engine_mock.h b/test/unit/graphics/engine/engine_mock.h index 1a15eca..72ceddb 100644 --- a/test/unit/graphics/engine/engine_mock.h +++ b/test/unit/graphics/engine/engine_mock.h @@ -1,3 +1,21 @@ +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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://gnu.org/licenses + */ #include "graphics/engine/engine.h" #include <gmock/gmock.h> diff --git a/test/unit/graphics/engine/lightman_test.cpp b/test/unit/graphics/engine/lightman_test.cpp index e2dc785..d493afb 100644 --- a/test/unit/graphics/engine/lightman_test.cpp +++ b/test/unit/graphics/engine/lightman_test.cpp @@ -1,3 +1,21 @@ +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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://gnu.org/licenses + */ #include "graphics/engine/lightman.h" #include "app/system_mock.h" diff --git a/test/unit/graphics/engine/modelfile_test.cpp b/test/unit/graphics/engine/modelfile_test.cpp index 0598e84..ba95d04 100644 --- a/test/unit/graphics/engine/modelfile_test.cpp +++ b/test/unit/graphics/engine/modelfile_test.cpp @@ -1,3 +1,21 @@ +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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://gnu.org/licenses + */ #include "graphics/engine/modelfile.h" #include "math/func.h" |