Fix test compilation
parent
99cd015dd8
commit
52cf9e2815
test
envs/opengl
unit
|
@ -78,7 +78,7 @@ void Render(Gfx::CGLDevice *device)
|
|||
worldMat.LoadIdentity();
|
||||
device->SetTransform(Gfx::TRANSFORM_WORLD, worldMat);
|
||||
|
||||
Gfx::VertexCol line[2] = { Gfx::VertexCol() };
|
||||
Gfx::VertexCol line[2] = Gfx::VertexCol{ Gfx::VertexCol() };
|
||||
|
||||
for (int x = -40; x <= 40; ++x)
|
||||
{
|
||||
|
@ -103,7 +103,7 @@ void Render(Gfx::CGLDevice *device)
|
|||
}
|
||||
|
||||
|
||||
Gfx::VertexCol quad[6] = { Gfx::VertexCol() };
|
||||
Gfx::VertexCol quad[6] = Gfx::VertexCol{ Gfx::VertexCol() };
|
||||
|
||||
quad[0].coord = Math::Vector(-1.0f, -1.0f, 0.0f);
|
||||
quad[1].coord = Math::Vector( 1.0f, -1.0f, 0.0f);
|
||||
|
|
|
@ -73,7 +73,7 @@ void Render(Gfx::CGLDevice *device)
|
|||
worldMat.LoadIdentity();
|
||||
device->SetTransform(Gfx::TRANSFORM_WORLD, worldMat);
|
||||
|
||||
Gfx::VertexCol line[2] = { Gfx::VertexCol() };
|
||||
Gfx::VertexCol line[2] = Gfx::VertexCol{ Gfx::VertexCol() };
|
||||
|
||||
for (int x = -40; x <= 40; ++x)
|
||||
{
|
||||
|
@ -98,7 +98,7 @@ void Render(Gfx::CGLDevice *device)
|
|||
}
|
||||
|
||||
|
||||
Gfx::VertexCol quad[6] = { Gfx::VertexCol() };
|
||||
Gfx::VertexCol quad[6] = Gfx::VertexCol{ Gfx::VertexCol() };
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
quad[i].color = Gfx::Color(1.0f, 1.0f, 0.0f);
|
||||
|
|
|
@ -23,6 +23,7 @@ configure_file(${SRC_DIR}/common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/comm
|
|||
# Code sources
|
||||
set(COLOBOT_SOURCES
|
||||
${SRC_DIR}/app/app.cpp
|
||||
${SRC_DIR}/app/gamedata.cpp
|
||||
${SRC_DIR}/app/pausemanager.cpp
|
||||
${SRC_DIR}/app/system.cpp
|
||||
${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
|
||||
|
|
|
@ -17,6 +17,7 @@ else()
|
|||
endif()
|
||||
|
||||
add_executable(edit_test
|
||||
${SRC_DIR}/app/gamedata.cpp
|
||||
${SRC_DIR}/app/system.cpp
|
||||
${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
|
||||
${SRC_DIR}/app/system_other.cpp
|
||||
|
|
|
@ -21,11 +21,6 @@ CApplication::~CApplication()
|
|||
{
|
||||
}
|
||||
|
||||
std::string CApplication::GetDataFilePath(DataDir /* dataDir */, const std::string& subpath) const
|
||||
{
|
||||
return subpath;
|
||||
}
|
||||
|
||||
CSoundInterface* CApplication::GetSound()
|
||||
{
|
||||
return nullptr;
|
||||
|
@ -36,11 +31,6 @@ CEventQueue* CApplication::GetEventQueue()
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
std::string CApplication::GetDataDirPath() const
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
Event CApplication::CreateUpdateEvent()
|
||||
{
|
||||
return Event(EVENT_NULL);
|
||||
|
|
Loading…
Reference in New Issue