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

New meshes and new trees

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-21 15:15:40 +03:00
1 parent d7db0faea3
commit 130e4411cb
45 files changed
+36847 -256
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Game.cpp
+10 -7
View File
@@ -452,8 +452,8 @@ namespace ZL
LocationSetup uniExteriorParams = uniInteriorParams;
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.navigationJsonPaths = {"resources/navigation/uni_exterior2_all.txt"};
uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior2_all.json" };
uniExteriorParams.teleportsJsonPath = "resources/config2/teleports_uni_exterior.json";
uniExteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_exterior.json";
uniExteriorParams.lightsJsonPath = "resources/config2/lights_uni_exterior.json";
@@ -488,7 +488,8 @@ 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",
@@ -496,7 +497,7 @@ namespace ZL
"resources/navigation/dorm3_b.json",
"resources/navigation/dorm3_all_open.json",
};*/
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm3_bca.txt", //0
"resources/navigation/dorm3_ca.txt", //1
@@ -506,7 +507,8 @@ namespace ZL
"resources/navigation/dorm3_all_open.txt", //5
};
/*params_dorm.navigationJsonPaths = {
/*
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
"resources/navigation/dorm0_large.json",
@@ -1116,7 +1118,6 @@ namespace ZL
case SDLK_l:
//x = x - 1;
//std::cout << "current x: " << x << std::endl;
std::cout << "Azimuth: " << currentLocation()->state.cameraAzimuth << std::endl;
std::cout << "Inclination: " << currentLocation()->state.cameraInclination << std::endl;
break;
@@ -1138,11 +1139,13 @@ namespace ZL
break;
case SDLK_j:
/*
if (editorMode != EditorMode::None && currentLocation()) {
currentLocation()->editor.placeTree();
} else {
menuManager.toggleQuestJournal();
}
}*/
currentLocation()->editor.placeTree();
break;
case SDLK_v: