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

Working on optimizations and navigation

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-06 14:24:16 +03:00
1 parent e96c9f171f
commit 597ed04fdc
78 files changed
+4393 -931340
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Game.cpp
+36 -78
View File
@@ -201,63 +201,39 @@ namespace ZL
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior.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
"resources/navigation/uni_interior3_hall.txt",
"resources/navigation/uni_interior3_lr_hall.txt",
"resources/navigation/uni_interior3_lr_tr_hall.txt",
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.txt",
"resources/navigation/uni_interior3_darklands_all_open.txt",
"resources/navigation/uni_interior3_unlocked_hall.txt",
"resources/navigation/uni_interior3_unlocked_n3.txt",
"resources/navigation/uni_interior3_unlocked_s1.txt",
"resources/navigation/uni_interior3_unlocked_s2.txt",
"resources/navigation/uni_interior3_unlocked_s3.txt",
"resources/navigation/uni_interior3_unlocked_n2.txt"
};
/*
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior0_all_locked.txt",
"resources/navigation/uni_interior0_hall.txt",
"resources/navigation/uni_interior0_lr_hall.txt",
"resources/navigation/uni_interior_basic0_objects_opendoors.txt",
"resources/navigation/uni_interior0_aiperi_lr_tr_hall.txt",
"resources/navigation/uni_interior1_night.txt",
"resources/navigation/uni_interior1_darklands_open.txt", //6
"resources/navigation/uni_interior2_locked.txt",
"resources/navigation/uni_interior2_unlocked_s1.txt",
"resources/navigation/uni_interior2_unlocked_s2.txt",
"resources/navigation/uni_interior2_unlocked_s3.txt",
"resources/navigation/uni_interior2_unlocked_n2.txt",
"resources/navigation/uni_interior2_unlocked_n3.txt",
"resources/navigation/uni_interior2_unlocked_hall.txt"
};
*/
/*
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior0_all_locked.json",
"resources/navigation/uni_interior0_hall.json",
"resources/navigation/uni_interior0_lr_hall.json",
"resources/navigation/uni_interior_basic0_objects_opendoors.json",
"resources/navigation/uni_interior0_aiperi_lr_tr_hall.json",
"resources/navigation/uni_interior1_night.json",
"resources/navigation/uni_interior1_darklands_open.json", //6
"resources/navigation/uni_interior2_locked.json",
"resources/navigation/uni_interior2_unlocked_s1.json",
"resources/navigation/uni_interior2_unlocked_s2.json",
"resources/navigation/uni_interior2_unlocked_s3.json",
"resources/navigation/uni_interior2_unlocked_n2.json",
"resources/navigation/uni_interior2_unlocked_n3.json",
"resources/navigation/uni_interior2_unlocked_hall.json"
};
*/
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior3_all_locked.json",
"resources/navigation/uni_interior3_locked.json", //0
"resources/navigation/uni_interior3_hall.json",
"resources/navigation/uni_interior3_lr_hall.json",
"resources/navigation/uni_interior3_lr_tr_hall.json",
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.json",
"resources/navigation/uni_interior3_night.json",
"resources/navigation/uni_interior3_darklands_all_open.json", //6
"resources/navigation/uni_interior3_locked.json",
"resources/navigation/uni_interior3_darklands_all_open.json",
"resources/navigation/uni_interior3_unlocked_hall.json",
"resources/navigation/uni_interior3_unlocked_n3.json",
"resources/navigation/uni_interior3_unlocked_s1.json",
"resources/navigation/uni_interior3_unlocked_s2.json",
"resources/navigation/uni_interior3_unlocked_s3.json",
"resources/navigation/uni_interior3_unlocked_n2.json",
"resources/navigation/uni_interior3_unlocked_n3.json",
"resources/navigation/uni_interior3_unlocked_hall.json"
};
"resources/navigation/uni_interior3_unlocked_n2.json"
};*/
/*
uniInteriorParams.navigationJsonPaths = {
"resources/navigation/uni_interior3_darklands_all_open.json",
@@ -331,42 +307,22 @@ namespace ZL
params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues.json";
params_dorm.navigationJsonPaths = {
/*params_dorm.navigationJsonPaths = {
"resources/navigation/dorm3_bca.json",
"resources/navigation/dorm3_ca.json",
"resources/navigation/dorm3_ba.json",
"resources/navigation/dorm3_a.json",
"resources/navigation/dorm3_b.json",
"resources/navigation/dorm3_all_open.json",
};*/
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm3_bca.txt",
"resources/navigation/dorm3_ca.txt",
"resources/navigation/dorm3_ba.txt",
"resources/navigation/dorm3_a.txt",
"resources/navigation/dorm3_b.txt",
"resources/navigation/dorm3_all_open.txt",
};
/*
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm2_bca2.json",
"resources/navigation/dorm2_ca.json",
"resources/navigation/dorm2_ba.json",
"resources/navigation/dorm2_a.json",
"resources/navigation/dorm2_b.json",
"resources/navigation/dorm2_all_open.json",
};*/
/*
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm2_bca2.txt",
"resources/navigation/dorm2_ca.txt",
"resources/navigation/dorm2_ba.txt",
"resources/navigation/dorm2_a.txt",
"resources/navigation/dorm2_b.txt",
"resources/navigation/dorm2_all_open.txt",
};*/
/* params_dorm.navigationJsonPaths = {
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
};*/
params_dorm.teleportsJsonPath = "resources/config2/teleports_dorm.json";
params_dorm.triggerZonesJsonPath = "resources/config2/trigger_zones_dorm.json";
@@ -808,10 +764,12 @@ namespace ZL
case SDLK_5:
case SDLK_6:
case SDLK_7:
if (editorMode == EditorMode::InteractiveObjects && currentLocation) {
currentLocation->editor.selectInteractiveObject(event.key.keysym.sym - SDLK_0);
} else if (event.key.keysym.sym == SDLK_0) {
startDarklandsTransition();
} else {
currentLocation->switchNavigation(event.key.keysym.sym - SDLK_0);
std::cout << "Switched to nav mesh " << (event.key.keysym.sym - SDLK_0) << std::endl;
}
break;
case SDLK_f: