salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added android version too

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-01-11 12:08:48 +03:00
1 parent 8089bcc0f3
commit a08ee412a6
54 files changed
+7146 -488
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/planet/PlanetObject.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
namespace ZL {
#ifdef EMSCRIPTEN
#if defined EMSCRIPTEN || defined __ANDROID__
using std::min;
using std::max;
#endif
@@ -75,8 +75,8 @@ namespace ZL {
planetRenderStruct.RefreshVBO();
sandTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/sand2.png", CONST_ZIP_FILE));
stoneTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/rockdark3.png", CONST_ZIP_FILE));
sandTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/sand2.png", CONST_ZIP_FILE));
stoneTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/rockdark3.png", CONST_ZIP_FILE));
// Атмосфера
planetAtmosphereRenderStruct.data = planetData.getAtmosphereLod().vertexData;
src/planet/StoneObject.cpp
+1 -2
View File
@@ -1,7 +1,6 @@
#include "StoneObject.h"
#include "utils/Utils.h"
#include <GL/gl.h>
#include <random>
#include <cmath>
#include "render/Renderer.h"
@@ -9,7 +8,7 @@
namespace ZL {
#ifdef EMSCRIPTEN
#if defined EMSCRIPTEN || defined __ANDROID__
using std::min;
using std::max;
#endif