[colobot] 153/390: Added -headless
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit f8841f96f279fe4c479779364f3f06914cf8bc02
Author: krzys-h <krzys_h at interia.pl>
Date: Fri Oct 31 20:05:06 2014 +0100
Added -headless
For automated stuff on devices without GPU
---
src/CMakeLists.txt | 1 +
src/app/app.cpp | 76 ++++++---
src/app/app.h | 6 +-
src/graphics/core/nulldevice.cpp | 359 +++++++++++++++++++++++++++++++++++++++
src/graphics/core/nulldevice.h | 145 ++++++++++++++++
5 files changed, 556 insertions(+), 31 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8914e1..25bbafa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,6 +80,7 @@ set(BASE_SOURCES
common/resources/outputstream.cpp
common/resources/sndfile.cpp
graphics/core/color.cpp
+ graphics/core/nulldevice.cpp
graphics/engine/camera.cpp
graphics/engine/cloud.cpp
graphics/engine/engine.cpp
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 513fc27..93fb554 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -31,6 +31,7 @@
#include "common/resources/resourcemanager.h"
#include "graphics/engine/modelmanager.h"
+#include "graphics/core/nulldevice.h"
#include "graphics/opengl/gldevice.h"
#include "object/robotmain.h"
@@ -168,6 +169,7 @@ CApplication::CApplication()
m_runSceneRank = 0;
m_sceneTest = false;
+ m_headless = false;
m_resolutionOverride = false;
m_language = LANGUAGE_ENV;
@@ -228,7 +230,8 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
OPT_SAVEDIR,
OPT_MOD,
OPT_VBO,
- OPT_RESOLUTION
+ OPT_RESOLUTION,
+ OPT_HEADLESS
};
option options[] =
@@ -245,6 +248,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
{ "mod", required_argument, nullptr, OPT_MOD },
{ "vbo", required_argument, nullptr, OPT_VBO },
{ "resolution", required_argument, nullptr, OPT_RESOLUTION },
+ { "headless", no_argument, nullptr, OPT_HEADLESS },
{ nullptr, 0, nullptr, 0}
};
@@ -287,6 +291,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
GetLogger()->Message(" -mod path load datadir mod from given path\n");
GetLogger()->Message(" -vbo mode set OpenGL VBO mode (one of: auto, enable, disable)\n");
GetLogger()->Message(" -resolution WxH set resolution\n");
+ GetLogger()->Message(" -headless headless mode - disables graphics, sound and user interaction\n");
return PARSE_ARGS_HELP;
}
case OPT_DEBUG:
@@ -402,6 +407,11 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
m_resolutionOverride = true;
break;
}
+ case OPT_HEADLESS:
+ {
+ m_headless = true;
+ break;
+ }
default:
assert(false); // should never get here
}
@@ -460,7 +470,11 @@ bool CApplication::Create()
//Create the sound instance.
#ifdef OPENAL_SOUND
- m_sound = static_cast<CSoundInterface *>(new ALSound());
+ if(!m_headless) {
+ m_sound = static_cast<CSoundInterface *>(new ALSound());
+ } else {
+ m_sound = new CSoundInterface();
+ }
#else
GetLogger()->Info("No sound support.\n");
m_sound = new CSoundInterface();
@@ -505,35 +519,37 @@ bool CApplication::Create()
return false;
}
- // load settings from profile
- int iValue;
- if ( GetProfile().GetIntProperty("Setup", "Resolution", iValue) && !m_resolutionOverride )
- {
- std::vector<Math::IntPoint> modes;
- GetVideoResolutionList(modes, true, true);
- if (static_cast<unsigned int>(iValue) < modes.size())
- m_deviceConfig.size = modes.at(iValue);
- }
+ if(!m_headless) {
+ // load settings from profile
+ int iValue;
+ if ( GetProfile().GetIntProperty("Setup", "Resolution", iValue) && !m_resolutionOverride )
+ {
+ std::vector<Math::IntPoint> modes;
+ GetVideoResolutionList(modes, true, true);
+ if (static_cast<unsigned int>(iValue) < modes.size())
+ m_deviceConfig.size = modes.at(iValue);
+ }
- if ( GetProfile().GetIntProperty("Setup", "Fullscreen", iValue) && !m_resolutionOverride )
- {
- m_deviceConfig.fullScreen = (iValue == 1);
- }
+ if ( GetProfile().GetIntProperty("Setup", "Fullscreen", iValue) && !m_resolutionOverride )
+ {
+ m_deviceConfig.fullScreen = (iValue == 1);
+ }
- if (! CreateVideoSurface())
- return false; // dialog is in function
+ if (! CreateVideoSurface())
+ return false; // dialog is in function
- if (m_private->surface == nullptr)
- {
- m_errorMessage = std::string("SDL error while setting video mode:\n") +
- std::string(SDL_GetError());
- GetLogger()->Error(m_errorMessage.c_str());
- m_exitCode = 4;
- return false;
+ if (m_private->surface == nullptr)
+ {
+ m_errorMessage = std::string("SDL error while setting video mode:\n") +
+ std::string(SDL_GetError());
+ GetLogger()->Error(m_errorMessage.c_str());
+ m_exitCode = 4;
+ return false;
+ }
+
+ SDL_WM_SetCaption(m_windowTitle.c_str(), m_windowTitle.c_str());
}
- SDL_WM_SetCaption(m_windowTitle.c_str(), m_windowTitle.c_str());
-
// Enable translating key codes of key press events to unicode chars
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -541,8 +557,12 @@ bool CApplication::Create()
// Don't generate joystick events
SDL_JoystickEventState(SDL_IGNORE);
- // The video is ready, we can create and initalize the graphics device
- m_device = new Gfx::CGLDevice(m_deviceConfig);
+ if(!m_headless) {
+ // The video is ready, we can create and initalize the graphics device
+ m_device = new Gfx::CGLDevice(m_deviceConfig);
+ } else {
+ m_device = new Gfx::CNullDevice();
+ }
if (! m_device->Create() )
{
m_errorMessage = std::string("Error in CDevice::Create()\n") + standardInfoMessage;
diff --git a/src/app/app.h b/src/app/app.h
index d933374..52ed77a 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -500,11 +500,11 @@ protected:
//! Low cpu mode
bool m_lowCPU;
-
- //! Show prototype levels
- bool m_protoMode;
//! Screen resoultion overriden by commandline
bool m_resolutionOverride;
+
+ //! Headles mode
+ bool m_headless;
};
diff --git a/src/graphics/core/nulldevice.cpp b/src/graphics/core/nulldevice.cpp
new file mode 100644
index 0000000..006149c
--- /dev/null
+++ b/src/graphics/core/nulldevice.cpp
@@ -0,0 +1,359 @@
+/*
+ * 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
+ */
+
+// * This file is part of the COLOBOT source code
+// * 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/.
+
+
+#include "graphics/core/nulldevice.h"
+
+#include "common/config.h"
+#include "common/logger.h"
+
+#include "math/geometry.h"
+
+
+// Graphics module namespace
+namespace Gfx {
+
+CNullDevice::CNullDevice()
+{
+ m_matrix = Math::Matrix();
+ m_material = Material();
+ m_light = Light();
+}
+
+CNullDevice::~CNullDevice()
+{
+}
+
+void CNullDevice::DebugHook()
+{
+}
+
+void CNullDevice::DebugLights()
+{
+}
+
+bool CNullDevice::Create()
+{
+ return true;
+}
+
+void CNullDevice::Destroy()
+{
+}
+
+void CNullDevice::BeginScene()
+{
+}
+
+void CNullDevice::EndScene()
+{
+}
+
+void CNullDevice::Clear()
+{
+}
+
+void CNullDevice::SetTransform(TransformType type, const Math::Matrix &matrix)
+{
+}
+
+const Math::Matrix& CNullDevice::GetTransform(TransformType type)
+{
+ return m_matrix;
+}
+
+void CNullDevice::MultiplyTransform(TransformType type, const Math::Matrix &matrix)
+{
+}
+
+void CNullDevice::SetMaterial(const Material &material)
+{
+}
+
+const Material& CNullDevice::GetMaterial()
+{
+ return m_material;
+}
+
+int CNullDevice::GetMaxLightCount()
+{
+ return 99;
+}
+
+void CNullDevice::SetLight(int index, const Light &light)
+{
+}
+
+const Light& CNullDevice::GetLight(int index)
+{
+ return m_light;
+}
+
+void CNullDevice::SetLightEnabled(int index, bool enabled)
+{
+}
+
+bool CNullDevice::GetLightEnabled(int index)
+{
+ return false;
+}
+
+Texture CNullDevice::CreateTexture(CImage *image, const TextureCreateParams ¶ms)
+{
+ Texture tex;
+ tex.id = 1; // tex.id = 0 => invalid texture
+ return tex;
+}
+
+Texture CNullDevice::CreateTexture(ImageData *data, const TextureCreateParams ¶ms)
+{
+ Texture tex;
+ tex.id = 1; // tex.id = 0 => invalid texture
+ return tex;
+}
+
+void CNullDevice::DestroyTexture(const Texture &texture)
+{
+}
+
+void CNullDevice::DestroyAllTextures()
+{
+}
+
+int CNullDevice::GetMaxTextureStageCount()
+{
+ return 0;
+}
+
+void CNullDevice::SetTexture(int index, const Texture &texture)
+{
+}
+
+void CNullDevice::SetTexture(int index, unsigned int textureId)
+{
+}
+
+Texture CNullDevice::GetTexture(int index)
+{
+ return Texture();
+}
+
+void CNullDevice::SetTextureEnabled(int index, bool enabled)
+{
+}
+
+bool CNullDevice::GetTextureEnabled(int index)
+{
+ return false;
+}
+
+void CNullDevice::SetTextureStageParams(int index, const TextureStageParams ¶ms)
+{
+}
+
+void CNullDevice::SetTextureStageWrap(int index, TexWrapMode wrapS, TexWrapMode wrapT)
+{
+}
+
+TextureStageParams CNullDevice::GetTextureStageParams(int index)
+{
+ return TextureStageParams();
+}
+
+void CNullDevice::DrawPrimitive(PrimitiveType type, const Vertex *vertices, int vertexCount,
+ Color color)
+{
+}
+
+void CNullDevice::DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount,
+ Color color)
+{
+}
+
+void CNullDevice::DrawPrimitive(PrimitiveType type, const VertexCol *vertices, int vertexCount)
+{
+}
+
+unsigned int CNullDevice::CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount)
+{
+ return 0;
+}
+
+unsigned int CNullDevice::CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount)
+{
+ return 0;
+}
+
+unsigned int CNullDevice::CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount)
+{
+ return 0;
+}
+
+void CNullDevice::UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount)
+{
+}
+
+void CNullDevice::UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount)
+{
+}
+
+void CNullDevice::UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount)
+{
+}
+
+void CNullDevice::DrawStaticBuffer(unsigned int bufferId)
+{
+}
+
+void CNullDevice::DestroyStaticBuffer(unsigned int bufferId)
+{
+}
+
+int CNullDevice::ComputeSphereVisibility(const Math::Vector ¢er, float radius)
+{
+ return 0;
+}
+
+void CNullDevice::SetRenderState(RenderState state, bool enabled)
+{
+}
+
+bool CNullDevice::GetRenderState(RenderState state)
+{
+ return false;
+}
+
+void CNullDevice::SetDepthTestFunc(CompFunc func)
+{
+}
+
+CompFunc CNullDevice::GetDepthTestFunc()
+{
+ return COMP_FUNC_NEVER;
+}
+
+void CNullDevice::SetDepthBias(float factor)
+{
+}
+
+float CNullDevice::GetDepthBias()
+{
+ return 0.0f;
+}
+
+void CNullDevice::SetAlphaTestFunc(CompFunc func, float refValue)
+{
+}
+
+void CNullDevice::GetAlphaTestFunc(CompFunc &func, float &refValue)
+{
+
+ func = COMP_FUNC_NEVER;
+ refValue = 0.0f;
+}
+
+void CNullDevice::SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend)
+{
+}
+
+void CNullDevice::GetBlendFunc(BlendFunc &srcBlend, BlendFunc &dstBlend)
+{
+ srcBlend = BLEND_ZERO;
+ dstBlend = BLEND_ZERO;
+}
+
+void CNullDevice::SetClearColor(const Color &color)
+{
+}
+
+Color CNullDevice::GetClearColor()
+{
+ return Color(0.0f, 0.0f, 0.0f, 0.0f);
+}
+
+void CNullDevice::SetGlobalAmbient(const Color &color)
+{
+}
+
+Color CNullDevice::GetGlobalAmbient()
+{
+ return Color(0.0f, 0.0f, 0.0f, 0.0f);
+}
+
+void CNullDevice::SetFogParams(FogMode mode, const Color &color, float start, float end, float density)
+{
+}
+
+void CNullDevice::GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density)
+{
+ //
+}
+
+void CNullDevice::SetCullMode(CullMode mode)
+{
+}
+
+CullMode CNullDevice::GetCullMode()
+{
+ return CULL_CW;
+}
+
+void CNullDevice::SetShadeModel(ShadeModel model)
+{
+}
+
+ShadeModel CNullDevice::GetShadeModel()
+{
+ return SHADE_FLAT;
+}
+
+void CNullDevice::SetFillMode(FillMode mode)
+{
+}
+
+FillMode CNullDevice::GetFillMode()
+{
+ return FILL_POINT;
+}
+
+void* CNullDevice::GetFrameBufferPixels() const
+{
+ return nullptr;
+}
+
+
+} // namespace Gfx
+
+
diff --git a/src/graphics/core/nulldevice.h b/src/graphics/core/nulldevice.h
new file mode 100644
index 0000000..c6065a6
--- /dev/null
+++ b/src/graphics/core/nulldevice.h
@@ -0,0 +1,145 @@
+/*
+ * 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
+ * \brief Abstract graphics device - CDevice class and related structs/enums
+ */
+
+#pragma once
+
+
+#include "graphics/core/device.h"
+
+// Graphics module namespace
+namespace Gfx {
+
+/**
+ * \class CNullDevice
+ * \brief Device implementation that doesn't render anything
+ *
+ */
+class CNullDevice : public CDevice
+{
+public:
+ CNullDevice();
+ virtual ~CNullDevice();
+
+ virtual void DebugHook();
+ virtual void DebugLights();
+
+ virtual bool Create();
+ virtual void Destroy();
+
+ virtual void BeginScene();
+ virtual void EndScene();
+
+ virtual void Clear();
+
+ virtual void SetTransform(TransformType type, const Math::Matrix &matrix);
+ virtual const Math::Matrix& GetTransform(TransformType type);
+ virtual void MultiplyTransform(TransformType type, const Math::Matrix &matrix);
+
+ virtual void SetMaterial(const Material &material);
+ virtual const Material& GetMaterial();
+
+ virtual int GetMaxLightCount();
+ virtual void SetLight(int index, const Light &light);
+ virtual const Light& GetLight(int index);
+ virtual void SetLightEnabled(int index, bool enabled);
+ virtual bool GetLightEnabled(int index);
+
+ virtual Texture CreateTexture(CImage *image, const TextureCreateParams ¶ms);
+ virtual Texture CreateTexture(ImageData *data, const TextureCreateParams ¶ms);
+ virtual void DestroyTexture(const Texture &texture);
+ virtual void DestroyAllTextures();
+
+ virtual int GetMaxTextureStageCount();
+ virtual void SetTexture(int index, const Texture &texture);
+ virtual void SetTexture(int index, unsigned int textureId);
+ virtual Texture GetTexture(int index);
+ virtual void SetTextureEnabled(int index, bool enabled);
+ virtual bool GetTextureEnabled(int index);
+
+ virtual void SetTextureStageParams(int index, const TextureStageParams ¶ms);
+ virtual TextureStageParams GetTextureStageParams(int index);
+
+ virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT);
+
+ virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount,
+ Color color = Color(1.0f, 1.0f, 1.0f, 1.0f));
+ virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount,
+ Color color = Color(1.0f, 1.0f, 1.0f, 1.0f));
+ virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount);
+
+ virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const Vertex* vertices, int vertexCount);
+ virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount);
+ virtual unsigned int CreateStaticBuffer(PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount);
+ virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const Vertex* vertices, int vertexCount);
+ virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexTex2* vertices, int vertexCount);
+ virtual void UpdateStaticBuffer(unsigned int bufferId, PrimitiveType primitiveType, const VertexCol* vertices, int vertexCount);
+ virtual void DrawStaticBuffer(unsigned int bufferId);
+ virtual void DestroyStaticBuffer(unsigned int bufferId);
+
+ virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius);
+
+ virtual void SetRenderState(RenderState state, bool enabled);
+ virtual bool GetRenderState(RenderState state);
+
+ virtual void SetDepthTestFunc(CompFunc func);
+ virtual CompFunc GetDepthTestFunc();
+
+ virtual void SetDepthBias(float factor);
+ virtual float GetDepthBias();
+
+ virtual void SetAlphaTestFunc(CompFunc func, float refValue);
+ virtual void GetAlphaTestFunc(CompFunc &func, float &refValue);
+
+ virtual void SetBlendFunc(BlendFunc srcBlend, BlendFunc dstBlend);
+ virtual void GetBlendFunc(BlendFunc &srcBlend, BlendFunc &dstBlend);
+
+ virtual void SetClearColor(const Color &color);
+ virtual Color GetClearColor();
+
+ virtual void SetGlobalAmbient(const Color &color);
+ virtual Color GetGlobalAmbient();
+
+ virtual void SetFogParams(FogMode mode, const Color &color, float start, float end, float density);
+ virtual void GetFogParams(FogMode &mode, Color &color, float &start, float &end, float &density);
+
+ virtual void SetCullMode(CullMode mode);
+ virtual CullMode GetCullMode();
+
+ virtual void SetShadeModel(ShadeModel model);
+ virtual ShadeModel GetShadeModel();
+
+ virtual void SetFillMode(FillMode mode) ;
+ virtual FillMode GetFillMode();
+
+ virtual void* GetFrameBufferPixels() const;
+
+private:
+ Math::Matrix m_matrix;
+ Material m_material;
+ Light m_light;
+};
+
+
+} // namespace Gfx
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list