Starts to implement into. Removes some unused textures from game folder.

Acknex · Jul 1, 2019 · 396e394 · 396e394
1 parent 279b49d
commit 396e394
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 2 deletions.
diff --git a/game/AckCon19.pro b/game/AckCon19.pro
@@ -31,6 +31,7 @@ SOURCES += \
   main.c \
   src/ai.c \
   src/ang.c \
+  src/briefing.c \
   src/building.c \
   src/camera.c \
   src/credits.c \
@@ -80,6 +81,7 @@ HEADERS += \
   shaders/terrain.fx \
   src/ai.h \
   src/ang.h \
+  src/briefing.h \
   src/building.h \
   src/camera.h \
   src/console.h \

diff --git a/game/main.c b/game/main.c
@@ -60,3 +60,4 @@ function main()
 #include "ini.c"
 #include "settings.c"
 #include "splashscreen.c"
+#include "briefing.c"
diff --git a/game/src/briefing.c b/game/src/briefing.c
@@ -0,0 +1,100 @@
+#include "briefing.h"
+
+BMAP * briefing_background   = "intro_background.png";
+BMAP * briefing_startbtn     = "intro_start.png";
+BMAP * briefing_rotor        = "intro_rotor.png";
+BMAP * briefing_startbtn_dis = "intro_start_inactive.png";
+
+VECTOR briefing_startbutton_min, briefing_startbutton_max;
+
+bool briefing_done;
+
+void briefing_mouseclick()
+{
+    if(mouse_pos.x < briefing_startbutton_min.x)
+        return;
+    if(mouse_pos.y < briefing_startbutton_min.y)
+        return;
+    if(mouse_pos.x >= briefing_startbutton_max.x)
+        return;
+    if(mouse_pos.y >= briefing_startbutton_max.y)
+        return;
+    briefing_done = true;
+}
+
+void briefing_init()
+{
+
+}
+
+void briefing_open()
+{
+    on_mouse_left = briefing_mouseclick;
+    briefing_done = false;
+}
+
+void briefing_update()
+{
+    var scale_x = screen_size.x / bmap_width(briefing_background);
+    var scale_y = screen_size.y / bmap_height(briefing_background);
+    var scale = minv(scale_x, scale_y);
+
+    var pos_x = (screen_size.x - scale * bmap_width(briefing_background)) / 2;
+    var pos_y = (screen_size.y - scale * bmap_height(briefing_background)) / 2;
+
+    draw_quad(
+        briefing_background,
+        vector(pos_x, pos_y, 0),
+        NULL,
+        NULL,
+        vector(scale, scale, 0),
+        NULL,
+        100,
+        0);
+
+    draw_quad(
+        briefing_rotor,
+        vector(pos_x + scale * 1688, pos_y + scale * 764, 0),
+        NULL,
+        NULL,
+        vector(scale, scale, 0),
+        NULL,
+        100,
+        -total_ticks
+    );
+
+    briefing_startbutton_min.x = pos_x + scale * 1613;
+    briefing_startbutton_min.y = pos_y + scale * 59;
+    briefing_startbutton_max.x = briefing_startbutton_min.x + scale * bmap_width(briefing_startbtn);
+    briefing_startbutton_max.y = briefing_startbutton_min.y + scale * bmap_height(briefing_startbtn);
+
+    BMAP * bmp = briefing_startbtn_dis;
+    if(mouse_pos.x >= briefing_startbutton_min.x && mouse_pos.y >= briefing_startbutton_min.y)
+    {
+        if(mouse_pos.x < briefing_startbutton_max.x && mouse_pos.y < briefing_startbutton_max.y)
+        {
+            bmp = briefing_startbtn;
+        }
+    }
+
+    draw_quad(
+        bmp,
+        briefing_startbutton_min,
+        NULL,
+        NULL,
+        vector(scale, scale, 0),
+        NULL,
+        100,
+        0
+    );
+}
+
+void briefing_close()
+{
+    on_mouse_left = NULL;
+}
+
+bool briefing_isDone()
+{
+    return briefing_done;
+}
diff --git a/game/src/briefing.h b/game/src/briefing.h
@@ -0,0 +1,12 @@
+#ifndef BRIEFING_H
+#define BRIEFING_H
+
+#include "global.h"
+
+void briefing_init(void);
+void briefing_open(void);
+void briefing_update(void);
+void briefing_close(void);
+bool briefing_isDone(void);
+
+#endif // BRIEFING_H
diff --git a/game/src/framework.c b/game/src/framework.c
@@ -10,6 +10,7 @@
 #include "materials.h"
 #include "settings.h"
 #include "splashscreen.h"
+#include "briefing.h"
 
 #include <acknex.h>
 #include <windows.h>
@@ -20,6 +21,7 @@
 #define FRAMEWORK_STATE_GAME         2
 #define FRAMEWORK_STATE_CREDITS      3
 #define FRAMEWORK_STATE_SPLASH       4
+#define FRAMEWORK_STATE_BRIEFING     5
 
 typedef struct
 {
@@ -179,6 +181,7 @@ void framework_update()
             game_init();
             credits_init();
             splashscreen_init();
+            briefing_init();
 #ifdef DEBUG_FRAMEWORK_FASTSTART
             if(settings.skipIntro)
                 framework_transfer(FRAMEWORK_STATE_LOAD);
@@ -207,7 +210,7 @@ void framework_update()
             switch(response)
             {
             case MAINMENU_RESPONSE_STARTGAME:
-                framework_transfer(FRAMEWORK_STATE_GAME);
+                framework_transfer(FRAMEWORK_STATE_BRIEFING);
                 break;
             case MAINMENU_RESPONSE_CREDIT:
                 framework_transfer(FRAMEWORK_STATE_CREDITS);
@@ -234,6 +237,12 @@ void framework_update()
             framework_transfer(FRAMEWORK_STATE_MAINMENU);
         break;
 
+    case FRAMEWORK_STATE_BRIEFING:
+        briefing_update();
+        if(briefing_isDone())
+            framework_transfer(FRAMEWORK_STATE_GAME);
+        break;
+
     default:
         error(str_printf(NULL, "framework: unsupported state %d!", framework.state));
 
@@ -268,6 +277,10 @@ void framework_update()
             splashscreen_close();
             break;
 
+        case FRAMEWORK_STATE_BRIEFING:
+            briefing_close();
+            break;
+
         default:
             error(str_printf(NULL, "framework: unsupported state %d!", framework.state));
         }
@@ -301,6 +314,10 @@ void framework_update()
             splashscreen_open();
             break;
 
+        case FRAMEWORK_STATE_BRIEFING:
+            briefing_open();
+            break;
+
         default:
             error(str_printf(NULL, "framework: unsupported state %d!", framework.state));
         }

diff --git a/game/src/splashscreen.c b/game/src/splashscreen.c
@@ -42,7 +42,7 @@ void splashscreen_update()
             0
         ),
         NULL,
-        30,
+        310,
         0
     );
 

diff --git a/game/ui/H5.png b/game/ui/H5.png
diff --git a/game/ui/intro_background.png b/game/ui/intro_background.png
diff --git a/game/ui/intro_rotor.png b/game/ui/intro_rotor.png
diff --git a/game/ui/intro_start.png b/game/ui/intro_start.png
diff --git a/game/ui/intro_start_inactive.png b/game/ui/intro_start_inactive.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ void splashscreen_update() @@
             ),
             NULL,
-,
+,
         );
@@ Expand Down @@