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
  ...

1 files changed, 19 insertions, 55 deletions

diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h
index a896104..f52e07f 100644
--- a/src/graphics/core/device.h
+++ b/src/graphics/core/device.h
@@ -1,19 +1,21 @@
-// * This file is part of the COLOBOT source code
-// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
-// * Copyright (C) 2012, Polish Portal of Colobot (PPC)
-// *
-// * 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://www.gnu.org/licenses/.
+/*
+ * 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
+ */
 
 /**
  * \file graphics/core/device.h
@@ -258,26 +260,16 @@ public:
 
     //! Sets the transform matrix of given type
     virtual void SetTransform(TransformType type, const Math::Matrix &matrix) = 0;
-    //! Returns the current transform matrix of given type
-    virtual const Math::Matrix& GetTransform(TransformType type) = 0;
-    //! Multiplies the current transform matrix of given type by given matrix
-    virtual void MultiplyTransform(TransformType type, const Math::Matrix &matrix) = 0;
 
     //! Sets the current material
     virtual void SetMaterial(const Material &material) = 0;
-    //! Returns the current material
-    virtual const Material& GetMaterial() = 0;
 
     //! Returns the maximum number of lights available
     virtual int GetMaxLightCount() = 0;
     //! Sets the light at given index
     virtual void SetLight(int index, const Light &light) = 0;
-    //! Returns the current light at given index
-    virtual const Light& GetLight(int index) = 0;
     //! Enables/disables the light at given index
     virtual void SetLightEnabled(int index, bool enabled) = 0;
-    //! Returns the current enable state of light at given index
-    virtual bool GetLightEnabled(int index) = 0;
 
     //! Creates a texture from image; the image can be safely removed after that
     virtual Texture CreateTexture(CImage *image, const TextureCreateParams &params) = 0;
@@ -294,17 +286,11 @@ public:
     virtual void SetTexture(int index, const Texture &texture) = 0;
     //! Sets the texture image by ID at given texture stage
     virtual void SetTexture(int index, unsigned int textureId) = 0;
-    //! Returns the (multi)texture at given index
-    virtual Texture GetTexture(int index) = 0;
     //! Enables/disables the given texture stage
     virtual void SetTextureEnabled(int index, bool enabled) = 0;
-    //! Returns the current enable state of given texture stage
-    virtual bool GetTextureEnabled(int index) = 0;
 
     //! Sets the params for texture stage with given index
     virtual void SetTextureStageParams(int index, const TextureStageParams &params) = 0;
-    //! Returns the current params of texture stage with given index
-    virtual TextureStageParams GetTextureStageParams(int index) = 0;
 
     //! Sets only the texture wrap modes (for faster than thru stage params)
     virtual void SetTextureStageWrap(int index, TexWrapMode wrapS, TexWrapMode wrapT) = 0;
@@ -348,61 +334,39 @@ public:
 
     //! Enables/disables the given render state
     virtual void SetRenderState(RenderState state, bool enabled) = 0;
-    //! Returns the current setting of given render state
-    virtual bool GetRenderState(RenderState state) = 0;
 
     //! Sets the function of depth test
     virtual void SetDepthTestFunc(CompFunc func) = 0;
-    //! Returns the current function of depth test
-    virtual CompFunc GetDepthTestFunc() = 0;
 
     //! Sets the depth bias (constant value added to Z-coords)
     virtual void SetDepthBias(float factor) = 0;
-    //! Returns the current depth bias
-    virtual float GetDepthBias() = 0;
 
     //! Sets the alpha test function and reference value
     virtual void SetAlphaTestFunc(CompFunc func, float refValue) = 0;
-    //! Returns the current alpha test function and reference value
-    virtual void GetAlphaTestFunc(CompFunc &func, float &refValue) = 0;
 
     //! Sets the blending functions for source and destination operations
     virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend) = 0;
-    //! Returns the current blending functions for source and destination operations
-    virtual void GetBlendFunc(BlendFunc &srcBlend, BlendFunc &dstBlend) = 0;
 
     //! Sets the clear color
     virtual void SetClearColor(const Color &color) = 0;
-    //! Returns the current clear color
-    virtual Color GetClearColor() = 0;
 
     //! Sets the global ambient color
     virtual void SetGlobalAmbient(const Color &color) = 0;
-    //! Returns the global ambient color
-    virtual Color GetGlobalAmbient() = 0;
 
     //! Sets the fog parameters: mode, color, start distance, end distance and density (for exp models)
     virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density) = 0;
-    //! Returns the current fog parameters: mode, color, start distance, end distance and density (for exp models)
-    virtual void GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density) = 0;
 
     //! Sets the current cull mode
     virtual void SetCullMode(CullMode mode) = 0;
-    //! Returns the current cull mode
-    virtual CullMode GetCullMode() = 0;
 
     //! Sets the shade model
     virtual void SetShadeModel(ShadeModel model) = 0;
-    //! Returns the current shade model
-    virtual ShadeModel GetShadeModel() = 0;
 
     //! Sets the current fill mode
     virtual void SetFillMode(FillMode mode) = 0;
-    //! Returns the current fill mode
-    virtual FillMode GetFillMode() = 0;
 
     //! Returns the pixels of the entire screen
-    virtual void* GetFrameBufferPixels()const = 0;
+    virtual void* GetFrameBufferPixels() const = 0;
 };