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

Working on UI part

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-05-26 22:21:05 +03:00
1 parent 6c8fcf17b6
commit 0da1ae124c
17 files changed
+221 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Game.cpp
+13 -3
View File
@@ -286,7 +286,6 @@ namespace ZL
if (locations["uni_exterior"]->player)
locations["uni_exterior"]->player->onDeathAnimComplete = [this]() { startDarklandsTransition(); };
LocationSetup params_dorm;
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm.json";
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_trees001.json";
@@ -436,6 +435,7 @@ namespace ZL
glDisable(GL_DEPTH_TEST);
glDepthMask(GL_FALSE);
renderer.shaderManager.PushShader(defaultShaderName);
renderer.RenderUniform1i(textureUniformName, 0);
glEnable(GL_BLEND);
@@ -697,6 +697,8 @@ namespace ZL
break;
case SDLK_o:
x = x + 1;
std::cout << "current x: " << x << std::endl;
//y = y + 0.002;
//currentLocation->player->hp = 200;
//currentLocation->npcs[0]->walkSpeed += 0.01f;
@@ -704,8 +706,10 @@ namespace ZL
break;
case SDLK_k:
y = y + 1;
std::cout << "current y: " << y << std::endl;
//y = y - 0.002;
std::cout << "Player pos: " << currentLocation->player->position.transpose() << std::endl;
//std::cout << "Player pos: " << currentLocation->player->position.transpose() << std::endl;
//currentLocation->npcs[0]->walkSpeed -= 0.01f;
//std::cout << "Walk speed: " << currentLocation->npcs[0]->walkSpeed << std::endl;
break;
@@ -718,7 +722,8 @@ namespace ZL
break;
case SDLK_l:
x = x - 0.002;
x = x - 1;
std::cout << "current x: " << x << std::endl;
break;
case SDLK_c:
@@ -726,6 +731,11 @@ namespace ZL
activateSlowMoEffect();
break;
case SDLK_i:
y = y - 1;
std::cout << "current y: " << y << std::endl;
break;
case SDLK_b:
if (navigationEditorMode && currentLocation) {
currentLocation->navigationEditorSave();