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

Working on web version

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-06 16:37:11 +03:00
1 parent 597ed04fdc
commit 0cc384028f
122 files changed
+7594 -224603
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Character.cpp
+8 -8
View File
@@ -490,10 +490,10 @@ void Character::draw(Renderer& renderer) {
}
if (!enabled) return;
if (!isPlayer && hp <= 0)
/*if (!isPlayer && hp <= 0)
{
return;
}
}*/
if (useGpuSkinning) {
drawGpuSkinning(renderer);
return;
@@ -665,10 +665,10 @@ void Character::drawAttachedWeapon(Renderer& renderer)
void Character::drawShadowDepth(Renderer& renderer) {
if (!enabled) return;
if (!isPlayer && hp <= 0)
/*if (!isPlayer && hp <= 0)
{
return;
}
}*/
if (useGpuSkinning) {
drawShadowDepthGpuSkinning(renderer);
} else {
@@ -764,10 +764,10 @@ void Character::drawWithShadow(Renderer& renderer, const Eigen::Matrix4f& lightF
renderer.RenderUniform1f("uAlpha", 1.0f);
glDisable(GL_BLEND);
if (!isPlayer && hp <= 0)
/*if (!isPlayer && hp <= 0)
{
return;
}
}*/
if (useGpuSkinning) {
drawGpuSkinningWithShadow(renderer, lightFromCamera, shadowMapTex, lightDirCamera);
} else {
@@ -912,7 +912,7 @@ void Character::drawNight(Renderer& renderer, const float* pointLightPosEye, con
renderer.RenderUniform1f("uAlpha", 1.0f);
glDisable(GL_BLEND);
if (!isPlayer && hp <= 0) return;
//if (!isPlayer && hp <= 0) return;
if (useGpuSkinning) {
drawNightGpuSkinning(renderer, pointLightPosEye, pointLightDirEye, pointLightColors, pointLightCount, ambientColor, fogColor);
@@ -1050,7 +1050,7 @@ void Character::drawNightWithShadow(Renderer& renderer,
}
renderer.RenderUniform1f("uAlpha", 1.0f);
glDisable(GL_BLEND);
if (!isPlayer && hp <= 0) return;
//if (!isPlayer && hp <= 0) return;
if (useGpuSkinning) {
drawNightGpuSkinningWithShadow(renderer, plPosEye, plDirEye, plColors, plCount, lightFromCamera, shadowMapTex, ambientColor, fogColor);
src/Game.cpp
+15 -7
View File
@@ -198,10 +198,10 @@ namespace ZL
globalFloats["player_hp"] = 200;
LocationSetup uniInteriorParams;
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior.json";
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior_x.json";
uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_004.json";
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior3_locked.txt", //0
@@ -256,7 +256,7 @@ namespace ZL
uniInteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_interior.json";
uniInteriorParams.lightsJsonPath = "resources/config2/lights_uni_interior.json";
uniInteriorParams.scriptPath = "resources/start_uni_interior.lua";
uniInteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_interior.json";
uniInteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_interior_x.json";
uniInteriorParams.playerPosition = Eigen::Vector3f(0.942694, 0, -9.63104);
locations["uni_interior"] = std::make_shared<Location>(renderer, inventory);
@@ -277,8 +277,8 @@ namespace ZL
LocationSetup uniExteriorParams = uniInteriorParams;
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_exterior.json";
uniExteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_exterior.json";
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_exterior_x.json";
uniExteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_exterior_x.json";
uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior2_all.txt"};
//uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior2_all.json" };
uniExteriorParams.teleportsJsonPath = "resources/config2/teleports_uni_exterior.json";
@@ -302,7 +302,7 @@ namespace ZL
LocationSetup params_dorm;
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm.json";
//params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_trees001.json";
params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_new.json";
params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm_new_x.json";
params_dorm.npcsJsonPath = "resources/config2/npcs_dorm.json";
params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues.json";
@@ -328,9 +328,10 @@ namespace ZL
params_dorm.triggerZonesJsonPath = "resources/config2/trigger_zones_dorm.json";
params_dorm.lightsJsonPath = "resources/config2/lights_dorm.json";
params_dorm.scriptPath = "resources/start_dorm.lua";
params_dorm.interactiveObjectsJsonPath = "resources/config2/interactive_objects_dorm.json";
params_dorm.interactiveObjectsJsonPath = "resources/config2/interactive_objects_dorm_x.json";
params_dorm.playerPosition = Eigen::Vector3f(6.76345, 0, -14.6022);
locations["location_dorm"] = std::make_shared<Location>(renderer, inventory);
locations["location_dorm"]->setup(params_dorm, &menuManager.questJournal);
locations["location_dorm"]->scriptEngine.setGlobalStore(&globalInts);
@@ -757,6 +758,13 @@ namespace ZL
}
break;
case SDLK_0:
if (editorMode == EditorMode::InteractiveObjects && currentLocation) {
currentLocation->editor.selectInteractiveObject(event.key.keysym.sym - SDLK_0);
}
else {
currentLocation->requestDarklandsTransition();
}
break;
case SDLK_1:
case SDLK_2:
case SDLK_3:
src/Location.cpp
-1
View File
@@ -75,7 +75,6 @@ namespace ZL
player->loadBinaryAnimation(AnimationState::ACTION_TO_DEATH, "resources/w/gg/new/gg_die001.anim", CONST_ZIP_FILE);
player->loadBinaryAnimation(AnimationState::DEATH_IDLE, "resources/w/gg/new/gg_die_idle001.anim", CONST_ZIP_FILE);
player->weaponTexture = renderer.textureManager.LoadFromPng("resources/w/white.png", CONST_ZIP_FILE);
player->weaponMesh.data = LoadFromTextFile02("resources/w/gg/knife002.txt", CONST_ZIP_FILE);
player->weaponMesh.data.Scale(0.1f);