Merge branch 'escape001' of gitea.fishrungames.com:salmon-engine-projects/space-game001 into escape001

proj-web/CMakeLists.txt

@@ -77,6 +77,8 @@ set(SOURCES
     ../src/AudioPlayerAsync.h
     ../src/BoneAnimatedModel.cpp
     ../src/BoneAnimatedModel.h
+    ../src/BoneAnimatedModelNew.cpp
+    ../src/BoneAnimatedModelNew.h
     ../src/render/OpenGlExtensions.cpp
     ../src/render/OpenGlExtensions.h
     ../src/utils/Utils.cpp

resources/config2/about.json

@@ -13,19 +13,19 @@
             {
                 "type": "StaticImage",
                 "name": "aboutImage",
-                "width": 400,
-                "height": 300,
-                "texture": "resources/loading.png"
+                "width": 512,
+                "height": 512,
+                "texture": "resources/e/menu/about.png"
             },
             {
                 "type": "Button",
                 "name": "backButton",
-                "width": 200,
-                "height": 60,
+                "width": 512,
+                "height": 128,
                 "textures": {
-                    "normal": "resources/loading.png",
-                    "hover": "resources/loading.png",
-                    "pressed": "resources/loading.png"
+                    "normal": "resources/e/menu/button_back.png",
+                    "hover": "resources/e/menu/button_back.png",
+                    "pressed": "resources/e/menu/button_back.png"
                 }
             }
         ]

resources/config2/help.json

@@ -13,19 +13,19 @@
             {
                 "type": "StaticImage",
                 "name": "helpImage",
-                "width": 400,
-                "height": 300,
-                "texture": "resources/loading.png"
+                "width": 512,
+                "height": 512,
+                "texture": "resources/e/menu/help.png"
             },
             {
                 "type": "Button",
                 "name": "backButton",
-                "width": 200,
-                "height": 60,
+                "width": 512,
+                "height": 128,
                 "textures": {
-                    "normal": "resources/loading.png",
-                    "hover": "resources/loading.png",
-                    "pressed": "resources/loading.png"
+                    "normal": "resources/e/menu/button_back.png",
+                    "hover": "resources/e/menu/button_back.png",
+                    "pressed": "resources/e/menu/button_back.png"
                 }
             }
         ]

resources/config2/main_menu.json

@@ -13,41 +13,41 @@
             {
                 "type": "StaticImage",
                 "name": "title",
-                "width": 300,
-                "height": 100,
-                "texture": "resources/loading.png"
+                "width": 512,
+                "height": 128,
+                "texture": "resources/e/menu/title.png"
             },
             {
                 "type": "Button",
                 "name": "startButton",
-                "width": 300,
-                "height": 60,
+                "width": 512,
+                "height": 128,
                 "textures": {
-                    "normal": "resources/loading.png",
-                    "hover": "resources/loading.png",
-                    "pressed": "resources/loading.png"
+                    "normal": "resources/e/menu/button_start.png",
+                    "hover": "resources/e/menu/button_start.png",
+                    "pressed": "resources/e/menu/button_start.png"
                 }
             },
             {
                 "type": "Button",
                 "name": "helpButton",
-                "width": 300,
-                "height": 60,
+                "width": 512,
+                "height": 128,
                 "textures": {
-                    "normal": "resources/loading.png",
-                    "hover": "resources/loading.png",
-                    "pressed": "resources/loading.png"
+                    "normal": "resources/e/menu/button_help.png",
+                    "hover": "resources/e/menu/button_help.png",
+                    "pressed": "resources/e/menu/button_help.png"
                 }
             },
             {
                 "type": "Button",
                 "name": "aboutButton",
-                "width": 300,
-                "height": 60,
+                "width": 512,
+                "height": 128,
                 "textures": {
-                    "normal": "resources/loading.png",
-                    "hover": "resources/loading.png",
-                    "pressed": "resources/loading.png"
+                    "normal": "resources/e/menu/button_about.png",
+                    "hover": "resources/e/menu/button_about.png",
+                    "pressed": "resources/e/menu/button_about.png"
                 }
             }
         ]

resources/dialogue/sample_dialogues.json

@@ -26,7 +26,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Первая колонка, полный бак пожалуйста.",
           "next": "line_2"
         },
@@ -42,7 +42,7 @@
           "id": "line_3",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Что вы на меня так смотрите, со мной что-то не так?",
           "next": "line_4"
         },
@@ -66,7 +66,7 @@
           "id": "line_6",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Да.",
           "next": "line_7"
         },
@@ -100,7 +100,7 @@
           "id": "line_3",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Что-то случилось?",
           "next": "line_4"
         },
@@ -134,7 +134,7 @@
           "id": "line_3",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Что-то случилось?",
           "next": "line_4"
         },
@@ -160,7 +160,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Ну капец, мы застряли!",
           "next": "line_2"
         },
@@ -168,7 +168,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Теперь только пешком.",
           "next": "end_1"
         },
@@ -186,7 +186,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Все, приехали! Машина в хлам!",
           "next": "end_1"
         },
@@ -204,7 +204,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Все, приехали! Бензин закончился!",
           "next": "end_1"
         },
@@ -222,7 +222,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "До Таласской области осталось ехать примерно 7 километров.",
           "next": "end_1"
         },
@@ -240,7 +240,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "До Таласской области осталось ехать примерно 5 километров.",
           "next": "end_1"
         },
@@ -258,7 +258,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "До Таласской области осталось ехать примерно 2 километра.",
           "next": "end_1"
         },
@@ -276,7 +276,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Все, мы в Таласской области.",
           "next": "line_2"
         },
@@ -284,7 +284,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Здесь должен быть сигнал, дай мне телефон.",
           "next": "line_3"
         },
@@ -292,7 +292,7 @@
           "id": "line_3",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Я позвоню дяде.",
           "next": "line_4"
         },
@@ -300,7 +300,7 @@
           "id": "line_4",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Держи.",
           "next": "line_5"
         },
@@ -308,14 +308,14 @@
           "id": "line_5",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Ало, Акыл байке! Это Алтынай.",
           "next": "line_6"
         },{
           "id": "line_6",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "У меня проблемы, меня преследуют бандиты.",
           "next": "line_7"
         },
@@ -323,7 +323,7 @@
           "id": "line_7",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Я сейчас еду с другом в сторону Таласа.",
           "next": "line_8"
         },
@@ -331,7 +331,7 @@
           "id": "line_8",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Пришли пожалуйста патруль мне на встречу.",
           "next": "line_9"
         },
@@ -339,7 +339,7 @@
           "id": "line_9",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Белый седан, номер 256.",
           "next": "line_10"
         },
@@ -347,7 +347,7 @@
           "id": "line_10",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Спасибо! Пока!",
           "next": "end_1"
         },
@@ -365,7 +365,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "У нас бензин кончается.",
           "next": "line_2"
         },
@@ -373,7 +373,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Надо заправиться.",
           "next": "line_3"
         },
@@ -415,7 +415,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Что-то мне стремно, давай поедем отсюда быстрее",
           "next": "end_1"
         },
@@ -433,7 +433,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "[Телефон звонит]",
           "next": "line_2"
         },
@@ -441,7 +441,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Да, слушаю.",
           "next": "line_3"
         },
@@ -555,7 +555,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Я задержан?",
           "next": "end_1"
         },
@@ -573,7 +573,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Попался красавчик.",
           "next": "end_1"
         },
@@ -591,7 +591,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Эй, парень! Остановись и выйди!",
           "next": "end_1"
         },
@@ -609,7 +609,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Попались воробушки.",
           "next": "end_1"
         },
@@ -627,7 +627,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Ну все, вам конец!",
           "next": "end_1"
         },
@@ -645,7 +645,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Быстро прыгай в окно, я открою.",
           "next": "end_1"
         },
@@ -663,7 +663,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Мне лучше поехать туда на авто.",
           "next": "end_1"
         },
@@ -681,7 +681,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Да, похоже это как раз тот дом.",
           "next": "end_1"
         },
@@ -699,7 +699,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Финал 1",
           "next": "end_1"
         },
@@ -717,7 +717,7 @@
           "id": "line_1",
           "type": "Line",
           "speaker": "Игрок",
-          "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+          "portrait": "resources/hero.png",
           "text": "Финал 2",
           "next": "end_1"
         },
@@ -743,7 +743,7 @@
           "id": "line_2",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Ты сделан из дыма?",
           "next": "line_3"
         },
@@ -759,7 +759,7 @@
           "id": "line_4",
           "type": "Line",
           "speaker": "Hero",
-		  "portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
+		  "portrait": "resources/hero.png",
           "text": "Я думаю что ты пахнешь как выхлоп от Камаза.",
           "next": "end_1"
         },

resources/start.lua

@@ -15,7 +15,7 @@ function step1()
     game_api.npc_walk_to(0, 2.0, 0.0, -2.0, step2)
 end
 
-step1()
+--step1()
 
 -- ============================================
 -- ITEM PICKUP HANDLER

resources/w/firebox.txt

@@ -1,29 +0,0 @@
-===Vertices (Split by UV/Normal): 14
-V 0: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 0.0)
-V 1: Pos(-2.494679, 32.87888, 0.161349) Norm(-0.577372, 0.577339, -0.577339) UV(0.375, 0.25)
-V 2: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.375, 0.0)
-V 3: Pos(-2.494679, 32.87888, 1.524048) Norm(-0.57737, 0.57734, 0.57734) UV(0.625, 0.25)
-V 4: Pos(-2.057763, 32.87888, 0.161349) Norm(0.57737, 0.57734, -0.57734) UV(0.375, 0.5)
-V 5: Pos(-2.057763, 32.87888, 1.524048) Norm(0.577372, 0.577339, 0.577339) UV(0.625, 0.5)
-V 6: Pos(-2.057763, 31.51618, 0.161349) Norm(0.577372, -0.577339, -0.577339) UV(0.375, 0.75)
-V 7: Pos(-2.057763, 31.51618, 1.524048) Norm(0.57737, -0.57734, 0.57734) UV(0.625, 0.75)
-V 8: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.375, 1.0)
-V 9: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.125, 0.75)
-V 10: Pos(-2.494679, 32.87888, 0.161349) Norm(-0.577372, 0.577339, -0.577339) UV(0.125, 0.5)
-V 11: Pos(-2.494679, 32.87888, 1.524048) Norm(-0.57737, 0.57734, 0.57734) UV(0.875, 0.5)
-V 12: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 1.0)
-V 13: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.875, 0.75)
-
-===Triangles (Indices): 12
-Tri: 0 1 2
-Tri: 3 4 1
-Tri: 5 6 4
-Tri: 7 8 6
-Tri: 4 9 10
-Tri: 11 7 5
-Tri: 0 3 1
-Tri: 3 5 4
-Tri: 5 7 6
-Tri: 7 12 8
-Tri: 4 6 9
-Tri: 11 13 7