j3d1/KlassischeKeplerKriege
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

png

Browse source
This commit is contained in:
j3d1 2016-10-05 18:16:04 +02:00
parent 756e98fe9f
commit 63b5954631
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/img/background_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.6 MiB

6
game/renderer_polygon_3d/renderer_polygon_3d.cpp
View file

@ -42,7 +42,7 @@ namespace endofthejedi {
addModel("../data/mesh/ship_ufo.stl", &m_shipModel); addModel("../data/mesh/ship_ufo.stl", &m_shipModel);
m_texture = nullptr; m_texture = nullptr;
m_backgroundTexturePath = "../data/img/test.png"; m_backgroundTexturePath = "../data/img/background_3.png";
loadBackgroundTexture(); loadBackgroundTexture();
developer::DeveloperConsole::instance().addCallback("reload_bg", [=](const std::string &) developer::DeveloperConsole::instance().addCallback("reload_bg", [=](const std::string &)
@ -475,7 +475,7 @@ namespace endofthejedi {
exit(-1); exit(-1);
} }
(*dest)->setup(&m_shader_game_objects); (*dest)->setup(&m_shader_game_objects);
(*dest)->uploadToOpenGl(); (*dest)->uploadToOpenGl();
m_models.push_back(*dest); m_models.push_back(*dest);
@ -563,7 +563,7 @@ namespace endofthejedi {
// TODO: use the sun planet color for this! // TODO: use the sun planet color for this!
glm::vec3 c = glm::vec3(1.0, 1.0, 0.8); glm::vec3 c = glm::vec3(1.0, 1.0, 0.8);
glm::vec3 p = glm::vec3(0.3f, 0.4f, 0.0f); glm::vec3 p = glm::vec3(0.3f, 0.4f, 0.0f);
for (const game::Planet *planet : m_state->planets) { for (const game::Planet *planet : m_state->planets) {
if (planet->material == game::Planet::Material::Sun) { if (planet->material == game::Planet::Material::Sun) {