quantumde1 vor 12 Stunden
Ursprung
Commit
9ca5cca122
5 geänderte Dateien mit 10 neuen und 16 gelöschten Zeilen
  1. 3 0
      .gitignore
  2. 1 1
      conf/settings.conf
  3. 2 2
      source/graphics/gamelogic.d
  4. 1 0
      source/graphics/playback.d
  5. 3 13
      source/ui/menu.d

+ 3 - 0
.gitignore

@@ -21,7 +21,10 @@ himmel-engine-test-*
 .ldc2_cache
 sky.sh
 a.out
+*.dll
+*.core
 *.so*
+/plugins/
 sky
 *.dylib*
 res/

+ 1 - 1
conf/settings.conf

@@ -5,5 +5,5 @@ LEFT:A
 RIGHT:D
 DIALOG:K
 OPMENU:M
-SCRIPT:scripts/SA00.lua
+SCRIPT:scripts/SA02.lua
 FULLSCREEN:0

+ 2 - 2
source/graphics/gamelogic.d

@@ -24,8 +24,8 @@ import std.file;
 void gameInit()
 {
     circle = LoadTexture("res/misc/circle.png");
-    dialogBackgroundTex = LoadTexture("res/misc/TEX#win_01d.PNG");
-    choiceWindowTex = LoadTexture("res/misc/TEX#win_00d.PNG");
+    dialogBackgroundTex = LoadTexture("res/misc/TEX#win_01b.PNG");
+    choiceWindowTex = LoadTexture("res/misc/TEX#win_00b.PNG");
     if (WindowShouldClose()) {
         currentGameState = GameState.Exit;
     } else {

+ 1 - 0
source/graphics/playback.d

@@ -309,6 +309,7 @@ extern (C) int playVideoInternal(char* argv)
                     (GetScreenWidth() - video.texW * video.scale) * 0.5f, (
                         GetScreenHeight() - video.texH * video.scale) * 0.5f
                 };
+                SetTextureFilter(video.texture, TextureFilter.TEXTURE_FILTER_BILINEAR);
                 DrawTextureEx(video.texture, position, 0, video.scale, Colors.WHITE);
             }
         }

+ 3 - 13
source/ui/menu.d

@@ -65,17 +65,6 @@ void helloScreen()
         });
         */
         // Play Opening Video
-        BeginDrawing();
-        debug debugWriteln("searching for video");
-        if (std.file.exists(getcwd() ~ "/res/videos/op.mp4"))
-        {
-            debug debugWriteln("video found, playing");
-            playVideo("/res/videos/op.mp4");
-        }
-        else {
-            debug debugWriteln("video not found, skipping");
-            videoFinished = true;
-        }
     }
 }
 
@@ -90,15 +79,16 @@ int showMainMenu() {
     luaReload = false;
     while (currentGameState == GameState.MainMenu)
     {
+        ClearBackground(Colors.WHITE);
         if (IsKeyPressed(KeyboardKey.KEY_F11)) {
             ToggleFullscreen();
         }
         UpdateMusicStream(music);
-        effectsLogic();
-        luaEventLoop();
         BeginDrawing();
         BeginMode2D(camera);
         backgroundLogic();
+        effectsLogic();
+        luaEventLoop();
         EndMode2D();
         EndDrawing();
     }