salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More items

Browse Source
This commit is contained in:
Vladislav Khorev 2026-05-11 22:29:26 +03:00
parent be05643b70
commit 001077a1d6
22 changed files with 310701 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
resources/config2/gameobjects_uni_interior.json Normal file
View File

@ -0,0 +1,277 @@
{
"objects": [
{
"name": "Plane",
"texturePath": "resources/w/exterior/Segmented_Plane002.png",
"meshPath": "resources/w/exterior/Segmented_Plane002.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "door",
"texturePath": "resources/w/exterior/door002.png",
"meshPath": "resources/w/exterior/ext_door001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "inai",
"texturePath": "resources/w/exterior/Building_work014.png",
"meshPath": "resources/w/exterior/int_building002.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "Table001",
"texturePath": "resources/w/interior/ikea_table_bake003.png",
"meshPath": "resources/w/interior/ikea_table001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "Chair001",
"texturePath": "resources/w/interior/ikea_chair_bake002.png",
"meshPath": "resources/w/interior/ikea_chair001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "Bookshelf001",
"texturePath": "resources/w/interior/ikea_bookshelf001_tex001.png",
"meshPath": "resources/w/interior/ikea_bookshelf001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "Computer001",
"texturePath": "resources/w/interior/computer_texture001.png",
"meshPath": "resources/w/interior/computer001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "DiningTable001",
"texturePath": "resources/w/interior/dining_table_texture.png",
"meshPath": "resources/w/interior/ikea_dining_table001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "Knife001",
"texturePath": "resources/w/white.png",
"meshPath": "resources/w/interior/Knife.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": -2.26293,
"positionY": 0.91414,
"positionZ": 1.56758,
"scale": 1.0,
"interactive": false
},
{
"name": "Book001",
"texturePath": "resources/w/interior/book_tex002.png",
"meshPath": "resources/w/interior/book001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 1.97952,
"positionY": 0.95746,
"positionZ": 0.786023,
"scale": 1.0,
"interactive": false
},
{
"name": "stairs",
"texturePath": "resources/w/exterior/Staircase001.png",
"meshPath": "resources/w/exterior/int_stairs001.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 0.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree001",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": -1.5707963267948966,
"rotationZ": 0.0,
"positionX": 10.0,
"positionY": -5.0,
"positionZ": 12.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree002",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 1.5707963267948966,
"rotationZ": 0.0,
"positionX": -12,
"positionY": -5.0,
"positionZ": 19.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree003",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": -12.0,
"positionY": -5.0,
"positionZ": 8.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree004",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": -1.5707963267948966,
"rotationZ": 0.0,
"positionX": -12.0,
"positionY": -5.0,
"positionZ": 0.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree005",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 1.5707963267948966,
"rotationZ": 0.0,
"positionX": -12.0,
"positionY": -5.0,
"positionZ": -8.0,
"scale": 1.0,
"interactive": false
},
{
"name": "tree006",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 8.49915,
"positionY": -5.0,
"positionZ": -2.59884,
"scale": 1.0,
"interactive": false
},
{
"name": "tree007",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": -1.5707963267948966,
"rotationZ": 0.0,
"positionX": 14.5936,
"positionY": -5.0,
"positionZ": 5.3401,
"scale": 1.0,
"interactive": false
},
{
"name": "tree008",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 1.5707963267948966,
"rotationZ": 0.0,
"positionX": 23.9295,
"positionY": -5.0,
"positionZ": 9.00583,
"scale": 1.0,
"interactive": false
},
{
"name": "tree009",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": 0.0,
"rotationZ": 0.0,
"positionX": 29.8128,
"positionY": -5.0,
"positionZ": -1.45278,
"scale": 1.0,
"interactive": false
},
{
"name": "tree010",
"texturePath": "resources/w/exterior/tree001.png",
"meshPath": "resources/w/exterior/tree003.txt",
"rotationX": 0.0,
"rotationY": -1.5707963267948966,
"rotationZ": 0.0,
"positionX": 33.1771,
"positionY": -5.0,
"positionZ": 14.609,
"scale": 1.0,
"interactive": false
}
]
}

4
resources/config2/npcs_dorm.json
View File

@ -3,8 +3,8 @@
{ {
"id": "npc_02_woman", "id": "npc_02_woman",
"name": "Студентка", "name": "Студентка",
"animationIdlePath": "resources/w/girl/girl_walk002.txt", "animationIdlePath": "resources/w/girl/girl_walk006.txt",
"animationWalkPath": "resources/w/girl/girl_walk002.txt", "animationWalkPath": "resources/w/girl/girl_walk006.txt",
"meshTextures": { "meshTextures": {
"polySurface1": "resources/w/girl/Chat_02_diff_1.png" "polySurface1": "resources/w/girl/Chat_02_diff_1.png"
}, },

59
resources/dialogue/uni_interior_dialogues.json
View File

@ -30,29 +30,29 @@
"cutscenes": [ "cutscenes": [
{ {
"id": "test_cutscene_01", "id": "test_cutscene_01",
"background": "resources/first_cutscene.png", "background": "resources/test_cutscene1_fix.png",
"durationMs": 20000, "durationMs": 25000,
"fadeOutMs": 2000, "fadeOutMs": 500,
"fadeInMs": 2000, "fadeInMs": 500,
"endFadeOutMs": 2000, "endFadeOutMs": 500,
"endFadeInMs": 2000, "endFadeInMs": 500,
"cameraTrack": [ "cameraTrack": [
{ {
"durationMs": 2400, "durationMs": 6000,
"from": { "focusX": 0.50, "focusY": 0.55, "zoom": 1.00, "rotationDeg": 0.0 }, "from": { "focusX": 0.3, "focusY": 0.50, "zoom": 1.10, "rotationDeg": 0.0 },
"to": { "focusX": 0.63, "focusY": 0.58, "zoom": 1.16, "rotationDeg": -1.0 }, "to": { "focusX": 0.7, "focusY": 0.50, "zoom": 1.00, "rotationDeg": 0.0 },
"easing": "EaseInOutSine" "easing": "EaseInOutSine"
}, },
{ {
"durationMs": 2200, "durationMs": 6000,
"from": { "focusX": 0.63, "focusY": 0.58, "zoom": 1.16, "rotationDeg": -1.0 }, "from": { "focusX": 0.3, "focusY": 0.50, "zoom": 1.0, "rotationDeg": 0.0 },
"to": { "focusX": 0.74, "focusY": 0.52, "zoom": 1.30, "rotationDeg": -2.4 }, "to": { "focusX": 0.7, "focusY": 0.50, "zoom": 1.1, "rotationDeg": 0.0 },
"easing": "EaseInOutCubic" "easing": "EaseInOutCubic"
}, },
{ {
"durationMs": 2200, "durationMs": 6000,
"from": { "focusX": 0.74, "focusY": 0.52, "zoom": 1.30, "rotationDeg": -2.4 }, "from": { "focusX": 0.3, "focusY": 0.50, "zoom": 1.1, "rotationDeg": 0.0 },
"to": { "focusX": 0.58, "focusY": 0.46, "zoom": 1.10, "rotationDeg": -0.6 }, "to": { "focusX": 0.7, "focusY": 0.50, "zoom": 1.0, "rotationDeg": 0.0 },
"easing": "EaseOutSine" "easing": "EaseOutSine"
} }
], ],
@ -61,61 +61,70 @@
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "В эпизоде \"Семетей\" трилогии \"Манас\", изменники Канчоро и Кыяз захватывают власть над кыргызами.", "text": "В эпизоде \"Семетей\" трилогии \"Манас\", изменники Канчоро и Кыяз захватывают власть над кыргызами.",
"durationMs": 2000 "durationMs": 3000
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Чтобы спасти раненого богатыря Семетея, фея Кёкмончок с помощью заклинания уводит его в иной мир.", "text": "Чтобы спасти раненого богатыря Семетея, фея Кёкмончок с помощью заклинания уводит его в иной мир.",
"durationMs": 2000 "durationMs": 3000
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Этот мир описан в эпосе Манас как Кайып или Аль-Гайб, но некоторые ученые называют его миром теней.", "text": "Этот мир описан в эпосе Манас как Кайып или Аль-Гайб, но некоторые ученые называют его миром теней.",
"durationMs": 2000 "durationMs": 3000,
"background": "resources/test_cutscene2_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "В этом мире обитают феи, духи и джинны. Простым смертным в этот мир дорога закрыта.", "text": "В этом мире обитают феи, духи и джинны. Простым смертным в этот мир дорога закрыта.",
"durationMs": 2000 "durationMs": 3000,
"background": "resources/test_cutscene2_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Время там течет по другому - за один день в теневом мире могут пройти годы жизни обычного мира.", "text": "Время там течет по другому - за один день в теневом мире могут пройти годы жизни обычного мира.",
"durationMs": 2000 "durationMs": 3000,
"background": "resources/test_cutscene3_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Обычно, мир теней никак не пересекается с нашим миром живых людей.", "text": "Обычно, мир теней никак не пересекается с нашим миром живых людей.",
"durationMs": 2000 "durationMs": 2000,
"background": "resources/test_cutscene3_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Но в критические моменты для народа, обитатели теневого мира могут приходить в наш мир.", "text": "Но в критические моменты для народа, обитатели теневого мира могут приходить в наш мир.",
"durationMs": 2000 "durationMs": 2000,
"background": "resources/test_cutscene3_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "Совсем недавно закончилась пандемия, а сегодня мир захлестнули кровавые войны.", "text": "Совсем недавно закончилась пандемия, а сегодня мир захлестнули кровавые войны.",
"durationMs": 2000 "durationMs": 2000,
"background": "resources/test_cutscene1_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "В такие кризисные моменты истории, грань между мирами становится особенно тонкой.", "text": "В такие кризисные моменты истории, грань между мирами становится особенно тонкой.",
"durationMs": 2000 "durationMs": 2000,
"background": "resources/test_cutscene1_fix.png"
}, },
{ {
"speaker": "Аида Дженибековна", "speaker": "Аида Дженибековна",
"portrait": "resources/hero.png", "portrait": "resources/hero.png",
"text": "На сегодня лекция завершена. Домашнее задание - к практическому занятию вы должны подготовить презентации, каждый по своей теме.", "text": "На сегодня лекция завершена. Домашнее задание - к практическому занятию вы должны подготовить презентации, каждый по своей теме.",
"durationMs": 2000 "durationMs": 2000,
"background": "resources/test_cutscene3_fix.png"
} }
] ]
}, },

BIN
resources/test_cutscene1_fix.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
resources/test_cutscene2_fix.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
resources/test_cutscene3_fix.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

76016
resources/w/girl/girl_walk006.txt Normal file
View File

File diff suppressed because it is too large Load Diff

76016
resources/w/girl/girl_walk008.txt Normal file
View File

File diff suppressed because it is too large Load Diff

64
resources/w/interior/Knife.txt Normal file
View File

@ -0,0 +1,64 @@
===Vertices (Split by UV/Normal): 41
V 0: Pos(0.222169, -0.085121, 0.008504) Norm(0.804101, 0.141784, 0.577338) UV(0.77503, 0.750033)
V 1: Pos(0.149006, -0.189608, -0.008504) Norm(0.141785, -0.804101, -0.577338) UV(0.808365, 0.500022)
V 2: Pos(0.222169, -0.085121, -0.008504) Norm(0.804093, 0.141791, -0.577347) UV(0.808365, 0.750033)
V 3: Pos(-0.059967, -0.043283, 0.008504) Norm(-0.804101, -0.141784, 0.577338) UV(0.866701, 0.496276)
V 4: Pos(0.013195, 0.061204, -0.008504) Norm(-0.141785, 0.804101, -0.577338) UV(0.833366, 0.746287)
V 5: Pos(-0.059967, -0.043283, -0.008504) Norm(-0.804093, -0.141791, -0.577347) UV(0.833366, 0.496276)
V 6: Pos(0.149006, -0.189608, 0.008504) Norm(0.141776, -0.804096, 0.577347) UV(0.833366, 0.496276)
V 7: Pos(-0.059967, -0.043283, -0.008504) Norm(-0.804093, -0.141791, -0.577347) UV(0.866701, 0.0)
V 8: Pos(0.149006, -0.189608, -0.008504) Norm(0.141785, -0.804101, -0.577338) UV(0.866701, 0.496276)
V 9: Pos(0.222169, -0.085121, 0.008504) Norm(0.804101, 0.141784, 0.577338) UV(0.500022, 0.5)
V 10: Pos(-0.059967, -0.043283, 0.008504) Norm(-0.804101, -0.141784, 0.577338) UV(0.750033, 0.0)
V 11: Pos(0.149006, -0.189608, 0.008504) Norm(0.141776, -0.804096, 0.577347) UV(0.750033, 0.5)
V 12: Pos(0.222169, -0.085121, -0.008504) Norm(0.804093, 0.141791, -0.577347) UV(0.77503, 0.500022)
V 13: Pos(0.013195, 0.061204, 0.008504) Norm(-0.141776, 0.804096, 0.577347) UV(0.808365, 0.0)
V 14: Pos(0.222169, -0.085121, 0.008504) Norm(0.804101, 0.141784, 0.577338) UV(0.808365, 0.500022)
V 15: Pos(0.149006, -0.189608, -0.008504) Norm(0.141785, -0.804101, -0.577338) UV(0.500022, 1.0)
V 16: Pos(0.013195, 0.061204, -0.008504) Norm(-0.141785, 0.804101, -0.577338) UV(0.750033, 0.5)
V 17: Pos(0.222169, -0.085121, -0.008504) Norm(0.804093, 0.141791, -0.577347) UV(0.750033, 1.0)
V 18: Pos(0.013195, 0.061204, 0.006378) Norm(0.799475, 0.143823, 0.583227) UV(0.8667, 0.250011)
V 19: Pos(-0.059967, -0.043283, -0.006378) Norm(0.040453, -0.820098, -0.570792) UV(0.891702, 0.0)
V 20: Pos(0.013195, 0.061204, -0.006378) Norm(0.799473, 0.143827, -0.583229) UV(0.891702, 0.250011)
V 21: Pos(-0.289824, 0.221475, -0.0) Norm(-0.983715, 0.179735, 3e-06) UV(0.166674, 0.0)
V 22: Pos(0.013195, 0.061204, -0.006378) Norm(0.799473, 0.143827, -0.583229) UV(0.250011, 0.666784)
V 23: Pos(-0.059967, -0.043283, -0.006378) Norm(0.040453, -0.820098, -0.570792) UV(0.0, 0.666784)
V 24: Pos(0.013195, 0.061204, 0.006378) Norm(0.799475, 0.143823, 0.583227) UV(0.250011, 0.666784)
V 25: Pos(-0.289824, 0.221475, -0.0) Norm(-0.983715, 0.179735, 3e-06) UV(0.333348, 0.0)
V 26: Pos(-0.059967, -0.043283, 0.006378) Norm(0.040447, -0.820097, 0.570794) UV(0.500022, 0.666784)
V 27: Pos(-0.059967, -0.043283, -0.006378) Norm(0.040453, -0.820098, -0.570792) UV(0.77503, 0.68218)
V 28: Pos(-0.059967, -0.043283, 0.006378) Norm(0.040447, -0.820097, 0.570794) UV(0.750033, 0.681722)
V 29: Pos(-0.289824, 0.221475, -0.0) Norm(-0.983715, 0.179735, 3e-06) UV(0.77503, 0.0)
V 30: Pos(0.013195, 0.061204, -0.006378) Norm(0.799473, 0.143827, -0.583229) UV(0.808365, 0.666696)
V 31: Pos(-0.265437, 0.256304, -0.0) Norm(-0.383072, 0.923719, 2e-06) UV(0.820865, 0.0)
V 32: Pos(0.013195, 0.061204, 0.006378) Norm(0.799475, 0.143823, 0.583227) UV(0.833366, 0.666696)
V 33: Pos(0.149006, -0.189608, 0.008504) Norm(0.141776, -0.804096, 0.577347) UV(0.77503, 0.500022)
V 34: Pos(0.013195, 0.061204, 0.008504) Norm(-0.141776, 0.804096, 0.577347) UV(0.866701, 0.746287)
V 35: Pos(-0.059967, -0.043283, 0.008504) Norm(-0.804101, -0.141784, 0.577338) UV(0.833366, 0.0)
V 36: Pos(0.013195, 0.061204, 0.008504) Norm(-0.141776, 0.804096, 0.577347) UV(0.500022, 0.0)
V 37: Pos(0.013195, 0.061204, -0.008504) Norm(-0.141785, 0.804101, -0.577338) UV(0.77503, 0.0)
V 38: Pos(-0.059967, -0.043283, -0.008504) Norm(-0.804093, -0.141791, -0.577347) UV(0.500022, 0.5)
V 39: Pos(-0.059967, -0.043283, 0.006378) Norm(0.040447, -0.820097, 0.570794) UV(0.8667, 0.0)
V 40: Pos(-0.265437, 0.256304, -0.0) Norm(-0.383072, 0.923719, 2e-06) UV(0.250011, 0.0)
===Triangles (Indices): 20
Tri: 0 1 2
Tri: 3 4 5
Tri: 6 7 8
Tri: 9 10 11
Tri: 12 13 14
Tri: 15 16 17
Tri: 18 19 20
Tri: 21 22 23
Tri: 24 25 26
Tri: 27 28 29
Tri: 30 31 32
Tri: 0 33 1
Tri: 3 34 4
Tri: 6 35 7
Tri: 9 36 10
Tri: 12 37 13
Tri: 15 38 16
Tri: 18 39 19
Tri: 21 40 22
Tri: 24 40 25

39
resources/w/interior/book001.txt Normal file
View File

@ -0,0 +1,39 @@
===Vertices (Split by UV/Normal): 24
V 0: Pos(-0.141252, -0.06713, 0.028763) Norm(-0.788662, -0.211335, 0.577364) UV(0.755263, 0.547807)
V 1: Pos(-0.012489, 0.155893, -0.028762) Norm(-0.211308, 0.788674, -0.577357) UV(0.877631, 0.0)
V 2: Pos(-0.141252, -0.06713, -0.028762) Norm(-0.788668, -0.211302, -0.577368) UV(0.877631, 0.547807)
V 3: Pos(-0.012489, 0.155893, 0.028763) Norm(-0.211344, 0.788662, 0.577361) UV(0.632894, 0.925439)
V 4: Pos(0.141252, 0.06713, -0.028762) Norm(0.788668, 0.211301, -0.577368) UV(0.755263, 0.547807)
V 5: Pos(-0.012489, 0.155893, -0.028762) Norm(-0.211308, 0.788674, -0.577357) UV(0.755263, 0.925439)
V 6: Pos(0.141252, 0.06713, 0.028763) Norm(0.788661, 0.211336, 0.577365) UV(0.877631, 0.547807)
V 7: Pos(0.012489, -0.155893, -0.028762) Norm(0.211313, -0.788675, -0.577356) UV(1.0, -0.0)
V 8: Pos(0.141252, 0.06713, -0.028762) Norm(0.788668, 0.211301, -0.577368) UV(1.0, 0.547807)
V 9: Pos(0.012489, -0.155893, 0.028763) Norm(0.211344, -0.788663, 0.577359) UV(0.510526, 0.925438)
V 10: Pos(-0.141252, -0.06713, -0.028762) Norm(-0.788668, -0.211302, -0.577368) UV(0.632894, 0.547807)
V 11: Pos(0.012489, -0.155893, -0.028762) Norm(0.211313, -0.788675, -0.577356) UV(0.632894, 0.925438)
V 12: Pos(0.141252, 0.06713, -0.028762) Norm(0.788668, 0.211301, -0.577368) UV(0.0, 0.547807)
V 13: Pos(-0.141252, -0.06713, -0.028762) Norm(-0.788668, -0.211302, -0.577368) UV(0.377632, 0.0)
V 14: Pos(-0.012489, 0.155893, -0.028762) Norm(-0.211308, 0.788674, -0.577357) UV(0.377632, 0.547808)
V 15: Pos(0.141252, 0.06713, 0.028763) Norm(0.788661, 0.211336, 0.577365) UV(0.755263, 0.547807)
V 16: Pos(-0.141252, -0.06713, 0.028763) Norm(-0.788662, -0.211335, 0.577364) UV(0.377632, -0.0)
V 17: Pos(0.012489, -0.155893, 0.028763) Norm(0.211344, -0.788663, 0.577359) UV(0.755263, -0.0)
V 18: Pos(-0.012489, 0.155893, 0.028763) Norm(-0.211344, 0.788662, 0.577361) UV(0.755263, 0.0)
V 19: Pos(0.141252, 0.06713, 0.028763) Norm(0.788661, 0.211336, 0.577365) UV(0.632894, 0.547807)
V 20: Pos(0.012489, -0.155893, 0.028763) Norm(0.211344, -0.788663, 0.577359) UV(0.877631, -0.0)
V 21: Pos(-0.141252, -0.06713, 0.028763) Norm(-0.788662, -0.211335, 0.577364) UV(0.510526, 0.547807)
V 22: Pos(0.012489, -0.155893, -0.028762) Norm(0.211313, -0.788675, -0.577356) UV(0.0, 0.0)
V 23: Pos(-0.012489, 0.155893, 0.028763) Norm(-0.211344, 0.788662, 0.577361) UV(0.377632, 0.547807)
===Triangles (Indices): 12
Tri: 0 1 2
Tri: 3 4 5
Tri: 6 7 8
Tri: 9 10 11
Tri: 12 13 14
Tri: 15 16 17
Tri: 0 18 1
Tri: 3 19 4
Tri: 6 20 7
Tri: 9 21 10
Tri: 12 22 13
Tri: 15 23 16

BIN
resources/w/interior/book_tex002.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

182
resources/w/interior/computer001.txt Normal file
View File

@ -0,0 +1,182 @@
===Vertices (Split by UV/Normal): 119
V 0: Pos(0.735579, 4.710862, 6.186687) Norm(-0.577341, -0.577355, 0.577355) UV(0.622728, 0.985786)
V 1: Pos(0.735579, 5.010581, 6.026967) Norm(-0.577341, 0.577355, -0.577355) UV(0.701365, 0.838077)
V 2: Pos(0.735579, 4.710862, 6.026967) Norm(-0.57735, -0.577325, -0.577377) UV(0.701365, 0.985786)
V 3: Pos(0.735579, 5.010581, 6.186687) Norm(-0.57735, 0.577325, 0.577377) UV(0.84347, 0.785241)
V 4: Pos(1.095298, 5.010581, 6.026967) Norm(0.57735, 0.577325, -0.577377) UV(0.764763, 0.962461)
V 5: Pos(0.735579, 5.010581, 6.026967) Norm(-0.577341, 0.577355, -0.577355) UV(0.764763, 0.785276)
V 6: Pos(1.095298, 5.010581, 6.186687) Norm(0.577341, 0.577355, 0.577355) UV(-0.0, 0.985999)
V 7: Pos(1.095298, 4.710862, 6.026967) Norm(0.577341, -0.577355, -0.577355) UV(0.078326, 0.83829)
V 8: Pos(1.095298, 5.010581, 6.026967) Norm(0.57735, 0.577325, -0.577377) UV(0.078326, 0.985999)
V 9: Pos(1.095298, 4.710862, 6.186687) Norm(0.57735, -0.577325, 0.577377) UV(0.843469, 0.962426)
V 10: Pos(0.735579, 4.710862, 6.026967) Norm(-0.57735, -0.577325, -0.577377) UV(0.922175, 0.785276)
V 11: Pos(1.095298, 4.710862, 6.026967) Norm(0.577341, -0.577355, -0.577355) UV(0.922175, 0.962461)
V 12: Pos(1.095298, 5.010581, 6.026967) Norm(0.57735, 0.577325, -0.577377) UV(0.717688, 0.0)
V 13: Pos(0.735579, 4.710862, 6.026967) Norm(-0.57735, -0.577325, -0.577377) UV(0.865397, 0.17727)
V 14: Pos(0.735579, 5.010581, 6.026967) Norm(-0.577341, 0.577355, -0.577355) UV(0.717688, 0.17727)
V 15: Pos(0.735579, 5.010581, 6.186687) Norm(-0.57735, 0.577325, 0.577377) UV(0.764763, 0.60813)
V 16: Pos(1.095298, 4.710862, 6.186687) Norm(0.57735, -0.577325, 0.577377) UV(0.912472, 0.785241)
V 17: Pos(1.095298, 5.010581, 6.186687) Norm(0.577341, 0.577355, 0.577355) UV(0.764763, 0.785241)
V 18: Pos(0.441861, 5.434348, 6.437831) Norm(-0.57734, -0.577355, 0.577355) UV(0.865397, 0.0)
V 19: Pos(0.441861, 5.653039, 6.019138) Norm(-0.57734, 0.577355, -0.577355) UV(0.973174, 0.206141)
V 20: Pos(0.441861, 5.434348, 6.019138) Norm(-0.577355, -0.577371, -0.577325) UV(0.865397, 0.206141)
V 21: Pos(0.441861, 5.653039, 6.437831) Norm(-0.577355, 0.577371, 0.577325) UV(0.206323, 0.553153)
V 22: Pos(1.020553, 5.653039, 6.019138) Norm(0.577355, 0.577371, -0.577325) UV(0.0, 0.83829)
V 23: Pos(0.441861, 5.653039, 6.019138) Norm(-0.57734, 0.577355, -0.577355) UV(0.0, 0.553246)
V 24: Pos(1.020553, 5.653039, 6.437831) Norm(0.57734, 0.577355, 0.577355) UV(0.867943, 0.277359)
V 25: Pos(1.020553, 5.434348, 6.019138) Norm(0.57734, -0.577355, -0.577355) UV(0.97572, 0.482684)
V 26: Pos(1.020553, 5.653039, 6.019138) Norm(0.577355, 0.577371, -0.577325) UV(0.867943, 0.482684)
V 27: Pos(1.020553, 5.434348, 6.437831) Norm(0.577355, -0.577371, 0.577325) UV(0.206322, 0.838197)
V 28: Pos(0.441861, 5.434348, 6.019138) Norm(-0.577355, -0.577371, -0.577325) UV(0.412645, 0.553246)
V 29: Pos(1.020553, 5.434348, 6.019138) Norm(0.57734, -0.577355, -0.577355) UV(0.412645, 0.83829)
V 30: Pos(1.020553, 5.653039, 6.019138) Norm(0.577355, 0.577371, -0.577325) UV(0.514952, 0.553153)
V 31: Pos(0.441861, 5.434348, 6.019138) Norm(-0.577355, -0.577371, -0.577325) UV(0.622728, 0.838334)
V 32: Pos(0.441861, 5.653039, 6.019138) Norm(-0.57734, 0.577355, -0.577355) UV(0.514952, 0.838334)
V 33: Pos(0.441861, 5.653039, 6.437831) Norm(-0.577355, 0.577371, 0.577325) UV(0.622728, 0.553153)
V 34: Pos(1.020553, 5.434348, 6.437831) Norm(0.577355, -0.577371, 0.577325) UV(0.730505, 0.838077)
V 35: Pos(1.020553, 5.653039, 6.437831) Norm(0.57734, 0.577355, 0.577355) UV(0.622728, 0.838077)
V 36: Pos(0.53154, 4.669188, 6.377977) Norm(-0.820942, -0.525784, 0.222722) UV(0.551589, 0.17729)
V 37: Pos(0.672102, 5.02893, 6.046834) Norm(-0.410063, 0.525784, -0.745251) UV(0.717688, 0.0)
V 38: Pos(0.672102, 4.669188, 6.046834) Norm(-0.41003, -0.525802, -0.745257) UV(0.717688, 0.17729)
V 39: Pos(0.53154, 5.02893, 6.377977) Norm(-0.820924, 0.525802, 0.222749) UV(0.049252, 0.277359)
V 40: Pos(1.226283, 5.128869, 6.1735) Norm(0.688382, 0.618212, -0.379399) UV(0.275794, -0.0)
V 41: Pos(0.672102, 5.02893, 6.046834) Norm(-0.410063, 0.525784, -0.745251) UV(0.226542, 0.277359)
V 42: Pos(1.007622, 5.128869, 6.688632) Norm(0.20531, 0.618198, 0.758735) UV(0.27372, 0.553153)
V 43: Pos(1.226283, 4.56925, 6.1735) Norm(0.688409, -0.618198, -0.379374) UV(0.537026, 0.277359)
V 44: Pos(1.226283, 5.128869, 6.1735) Norm(0.688382, 0.618212, -0.379399) UV(0.537026, 0.553153)
V 45: Pos(1.007622, 4.56925, 6.688632) Norm(0.205273, -0.618211, 0.758734) UV(0.551589, -0.0)
V 46: Pos(0.672102, 4.669188, 6.046834) Norm(-0.41003, -0.525802, -0.745257) UV(0.325047, 0.277359)
V 47: Pos(1.226283, 4.56925, 6.1735) Norm(0.688409, -0.618198, -0.379374) UV(0.275794, -0.0)
V 48: Pos(1.226283, 5.128869, 6.1735) Norm(0.688382, 0.618212, -0.379399) UV(-0.0, 0.553153)
V 49: Pos(0.672102, 4.669188, 6.046834) Norm(-0.41003, -0.525802, -0.745257) UV(0.27372, 0.326611)
V 50: Pos(0.672102, 5.02893, 6.046834) Norm(-0.410063, 0.525784, -0.745251) UV(0.27372, 0.503901)
V 51: Pos(0.53154, 5.02893, 6.377977) Norm(-0.820924, 0.525802, 0.222749) UV(0.537025, 0.503901)
V 52: Pos(1.007622, 4.56925, 6.688632) Norm(0.205273, -0.618211, 0.758734) UV(0.764763, 0.277359)
V 53: Pos(1.007622, 5.128869, 6.688632) Norm(0.20531, 0.618198, 0.758735) UV(0.764763, 0.553154)
V 54: Pos(1.326249, 4.523787, 6.105271) Norm(-0.468337, -0.577333, 0.66884) UV(0.730505, 0.883925)
V 55: Pos(1.317363, 5.19496, 6.054874) Norm(-0.668842, 0.577346, -0.468318) UV(0.755124, 0.553154)
V 56: Pos(1.317363, 4.523787, 6.054874) Norm(-0.66884, -0.577359, -0.468305) UV(0.755124, 0.883925)
V 57: Pos(1.326249, 5.19496, 6.105271) Norm(-0.468341, 0.577346, 0.668826) UV(0.893159, 0.482684)
V 58: Pos(1.525328, 5.19496, 6.018205) Norm(0.468341, 0.577347, -0.668826) UV(0.867943, 0.586724)
V 59: Pos(1.317363, 5.19496, 6.054874) Norm(-0.668842, 0.577346, -0.468318) UV(0.867943, 0.482698)
V 60: Pos(1.534214, 5.19496, 6.068602) Norm(0.668842, 0.577346, 0.468319) UV(0.97572, 0.60813)
V 61: Pos(1.525328, 4.523787, 6.018205) Norm(0.468338, -0.577334, -0.668838) UV(1.0, 0.277359)
V 62: Pos(1.525328, 5.19496, 6.018205) Norm(0.468341, 0.577347, -0.668826) UV(1.0, 0.60813)
V 63: Pos(1.525328, 4.523787, 6.018205) Norm(0.468338, -0.577334, -0.668838) UV(0.918374, 0.586724)
V 64: Pos(1.326249, 4.523787, 6.105271) Norm(-0.468337, -0.577333, 0.66884) UV(0.893159, 0.482684)
V 65: Pos(1.317363, 4.523787, 6.054874) Norm(-0.66884, -0.577359, -0.468305) UV(0.918374, 0.482698)
V 66: Pos(1.525328, 5.19496, 6.018205) Norm(0.468341, 0.577347, -0.668826) UV(0.412645, 0.883924)
V 67: Pos(1.317363, 4.523787, 6.054874) Norm(-0.66884, -0.577359, -0.468305) UV(0.514952, 0.553153)
V 68: Pos(1.317363, 5.19496, 6.054874) Norm(-0.668842, 0.577346, -0.468318) UV(0.514952, 0.883924)
V 69: Pos(1.326249, 5.19496, 6.105271) Norm(-0.468341, 0.577346, 0.668826) UV(0.764763, 0.60813)
V 70: Pos(1.534214, 4.523787, 6.068602) Norm(0.668839, -0.577358, 0.468307) UV(0.867943, 0.277359)
V 71: Pos(1.534214, 5.19496, 6.068602) Norm(0.668842, 0.577346, 0.468319) UV(0.867943, 0.60813)
V 72: Pos(1.299895, 5.312884, 6.070292) Norm(-0.577358, -0.577347, 0.577347) UV(0.551589, 0.260175)
V 73: Pos(1.299895, 5.376978, 6.026197) Norm(-0.577358, 0.577347, -0.577347) UV(0.573298, 0.228587)
V 74: Pos(1.299895, 5.312884, 6.026197) Norm(-0.577359, -0.577332, -0.577359) UV(0.573298, 0.260175)
V 75: Pos(1.299895, 5.376978, 6.070292) Norm(-0.577359, 0.577332, 0.577359) UV(0.658221, 0.17729)
V 76: Pos(1.40399, 5.376978, 6.026197) Norm(0.577359, 0.577332, -0.577359) UV(0.636492, 0.228573)
V 77: Pos(1.299895, 5.376978, 6.026197) Norm(-0.577358, 0.577347, -0.577347) UV(0.636492, 0.177299)
V 78: Pos(1.40399, 5.376978, 6.070292) Norm(0.577358, 0.577347, 0.577347) UV(0.573298, 0.260175)
V 79: Pos(1.40399, 5.312884, 6.026197) Norm(0.577358, -0.577347, -0.577347) UV(0.594921, 0.228588)
V 80: Pos(1.40399, 5.376978, 6.026197) Norm(0.577359, 0.577332, -0.577359) UV(0.594921, 0.260175)
V 81: Pos(1.40399, 5.312884, 6.070292) Norm(0.577359, -0.577332, 0.577359) UV(0.614763, 0.228563)
V 82: Pos(1.299895, 5.312884, 6.026197) Norm(-0.577359, -0.577332, -0.577359) UV(0.636492, 0.177299)
V 83: Pos(1.40399, 5.312884, 6.026197) Norm(0.577358, -0.577347, -0.577347) UV(0.636492, 0.228573)
V 84: Pos(1.40399, 5.376978, 6.026197) Norm(0.577359, 0.577332, -0.577359) UV(0.551589, 0.17729)
V 85: Pos(1.299895, 5.312884, 6.026197) Norm(-0.577359, -0.577332, -0.577359) UV(0.583176, 0.228588)
V 86: Pos(1.299895, 5.376978, 6.026197) Norm(-0.577358, 0.577347, -0.577347) UV(0.551589, 0.228588)
V 87: Pos(1.299895, 5.376978, 6.070292) Norm(-0.577359, 0.577332, 0.577359) UV(0.583176, 0.17729)
V 88: Pos(1.40399, 5.312884, 6.070292) Norm(0.577359, -0.577332, 0.577359) UV(0.614763, 0.228541)
V 89: Pos(1.40399, 5.376978, 6.070292) Norm(0.577358, 0.577347, 0.577347) UV(0.583176, 0.228541)
V 90: Pos(0.735579, 5.010581, 6.186687) Norm(-0.57735, 0.577325, 0.577377) UV(0.622728, 0.838077)
V 91: Pos(1.095298, 5.010581, 6.186687) Norm(0.577341, 0.577355, 0.577355) UV(0.84347, 0.962426)
V 92: Pos(1.095298, 4.710862, 6.186687) Norm(0.57735, -0.577325, 0.577377) UV(-0.0, 0.83829)
V 93: Pos(0.735579, 4.710862, 6.186687) Norm(-0.577341, -0.577355, 0.577355) UV(0.843469, 0.785241)
V 94: Pos(1.095298, 4.710862, 6.026967) Norm(0.577341, -0.577355, -0.577355) UV(0.865397, 0.0)
V 95: Pos(0.735579, 4.710862, 6.186687) Norm(-0.577341, -0.577355, 0.577355) UV(0.912472, 0.60813)
V 96: Pos(0.441861, 5.653039, 6.437831) Norm(-0.577355, 0.577371, 0.577325) UV(0.973174, 0.0)
V 97: Pos(1.020553, 5.653039, 6.437831) Norm(0.57734, 0.577355, 0.577355) UV(0.206323, 0.838198)
V 98: Pos(1.020553, 5.434348, 6.437831) Norm(0.577355, -0.577371, 0.577325) UV(0.97572, 0.277359)
V 99: Pos(0.441861, 5.434348, 6.437831) Norm(-0.57734, -0.577355, 0.577355) UV(0.206322, 0.553153)
V 100: Pos(1.020553, 5.434348, 6.019138) Norm(0.57734, -0.577355, -0.577355) UV(0.622728, 0.553153)
V 101: Pos(0.441861, 5.434348, 6.437831) Norm(-0.57734, -0.577355, 0.577355) UV(0.730505, 0.553153)
V 102: Pos(0.53154, 5.02893, 6.377977) Norm(-0.820924, 0.525802, 0.222749) UV(0.551589, 0.0)
V 103: Pos(1.007622, 5.128869, 6.688632) Norm(0.20531, 0.618198, 0.758735) UV(-0.0, -0.0)
V 104: Pos(1.007622, 4.56925, 6.688632) Norm(0.205273, -0.618211, 0.758734) UV(0.27372, 0.277359)
V 105: Pos(0.53154, 4.669188, 6.377977) Norm(-0.820942, -0.525784, 0.222722) UV(0.502336, 0.277359)
V 106: Pos(1.226283, 4.56925, 6.1735) Norm(0.688409, -0.618198, -0.379374) UV(-0.0, 0.277359)
V 107: Pos(0.53154, 4.669188, 6.377977) Norm(-0.820942, -0.525784, 0.222722) UV(0.537025, 0.326611)
V 108: Pos(1.326249, 5.19496, 6.105271) Norm(-0.468341, 0.577346, 0.668826) UV(0.730505, 0.553154)
V 109: Pos(1.534214, 5.19496, 6.068602) Norm(0.668842, 0.577346, 0.468319) UV(0.893159, 0.58671)
V 110: Pos(1.534214, 4.523787, 6.068602) Norm(0.668839, -0.577358, 0.468307) UV(0.97572, 0.277359)
V 111: Pos(1.534214, 4.523787, 6.068602) Norm(0.668839, -0.577358, 0.468307) UV(0.893159, 0.58671)
V 112: Pos(1.525328, 4.523787, 6.018205) Norm(0.468338, -0.577334, -0.668838) UV(0.412645, 0.553153)
V 113: Pos(1.326249, 4.523787, 6.105271) Norm(-0.468337, -0.577333, 0.66884) UV(0.764763, 0.277359)
V 114: Pos(1.299895, 5.376978, 6.070292) Norm(-0.577359, 0.577332, 0.577359) UV(0.551589, 0.228587)
V 115: Pos(1.40399, 5.376978, 6.070292) Norm(0.577358, 0.577347, 0.577347) UV(0.658221, 0.228563)
V 116: Pos(1.40399, 5.312884, 6.070292) Norm(0.577359, -0.577332, 0.577359) UV(0.573298, 0.228588)
V 117: Pos(1.299895, 5.312884, 6.070292) Norm(-0.577358, -0.577347, 0.577347) UV(0.614763, 0.17729)
V 118: Pos(1.40399, 5.312884, 6.026197) Norm(0.577358, -0.577347, -0.577347) UV(0.583176, 0.17729)
===Triangles (Indices): 60
Tri: 0 1 2
Tri: 3 4 5
Tri: 6 7 8
Tri: 9 10 11
Tri: 12 13 14
Tri: 15 16 17
Tri: 18 19 20
Tri: 21 22 23
Tri: 24 25 26
Tri: 27 28 29
Tri: 30 31 32
Tri: 33 34 35
Tri: 36 37 38
Tri: 39 40 41
Tri: 42 43 44
Tri: 45 46 47
Tri: 48 49 50
Tri: 51 52 53
Tri: 54 55 56
Tri: 57 58 59
Tri: 60 61 62
Tri: 63 64 65
Tri: 66 67 68
Tri: 69 70 71
Tri: 72 73 74
Tri: 75 76 77
Tri: 78 79 80
Tri: 81 82 83
Tri: 84 85 86
Tri: 87 88 89
Tri: 0 90 1
Tri: 3 91 4
Tri: 6 92 7
Tri: 9 93 10
Tri: 12 94 13
Tri: 15 95 16
Tri: 18 96 19
Tri: 21 97 22
Tri: 24 98 25
Tri: 27 99 28
Tri: 30 100 31
Tri: 33 101 34
Tri: 36 102 37
Tri: 39 103 40
Tri: 42 104 43
Tri: 45 105 46
Tri: 48 106 49
Tri: 51 107 52
Tri: 54 108 55
Tri: 57 109 58
Tri: 60 110 61
Tri: 63 111 64
Tri: 66 112 67
Tri: 69 113 70
Tri: 72 114 73
Tri: 75 115 76
Tri: 78 116 79
Tri: 81 117 82
Tri: 84 118 85
Tri: 87 117 88

BIN
resources/w/interior/computer_texture001.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
resources/w/interior/dining_table_texture.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

37892
resources/w/interior/ikea_bookshelf001.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
resources/w/interior/ikea_bookshelf001_tex001.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

29219
resources/w/interior/ikea_chair001.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
resources/w/interior/ikea_chair_bake002.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

6321
resources/w/interior/ikea_dining_table001.txt Normal file
View File

File diff suppressed because it is too large Load Diff

84609
resources/w/interior/ikea_table001.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
resources/w/interior/ikea_table_bake003.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
src/Game.cpp
View File

@ -159,7 +159,7 @@ namespace ZL
std::cout << "Load resurces step 4" << std::endl; std::cout << "Load resurces step 4" << std::endl;
LocationSetup uniInteriorParams; LocationSetup uniInteriorParams;
uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects.json"; uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior.json";
uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json"; uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues.json"; uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues.json";
//uniInteriorParams.navigationJsonPaths = {"resources/config2/navigation.json"}; //uniInteriorParams.navigationJsonPaths = {"resources/config2/navigation.json"};
@ -806,6 +806,7 @@ namespace ZL
return; return;
} }
// Only the primary, non-UI-captured pointer can promote itself into a // Only the primary, non-UI-captured pointer can promote itself into a
// camera-rotation drag once it crosses the movement threshold. // camera-rotation drag once it crosses the movement threshold.
if (hasPrimaryPointer && fingerId == primaryPointerId && it != activePointers.end() if (hasPrimaryPointer && fingerId == primaryPointerId && it != activePointers.end()
@ -817,6 +818,7 @@ namespace ZL
} }
} }
if (currentLocation) { if (currentLocation) {
// Forwarded for dialogue hover and (when cameraDragging) camera rotation. // Forwarded for dialogue hover and (when cameraDragging) camera rotation.
currentLocation->handleMotion(fingerId, eventX, eventY, mx, my); currentLocation->handleMotion(fingerId, eventX, eventY, mx, my);