Re-import bgm as ogg, fix teleport bug (hopefully)

This commit is contained in:
2023-09-08 08:56:44 -07:00
parent 4309111382
commit 9256c0a09e
31 changed files with 202 additions and 130 deletions

View File

@@ -68,8 +68,8 @@ public partial class GameManager : Node
if (player.CharactersLeftOnStage.Any())
{
player.SelectedCharacter = player.CharactersLeftOnStage[player.CharacterIndex];
GetTree().Root.AddChild(player.SelectedCharacter);
player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
GetTree().Root.AddChild(player.SelectedCharacter);
}
}

View File

@@ -28,7 +28,7 @@ public partial class Main : Node
var bgmPlayer = GetTree().Root.GetNode<BGMPlayer>("BgmPlayer");
bgmPlayer.ProcessMode = ProcessModeEnum.Always;
bgmPlayer.SetBGMFromFilepath("Audio/BGM/LevelTheme.wav");
bgmPlayer.SetBGMFromFilepath("Audio/BGM/LevelTheme.ogg");
bgmPlayer.PlayBGM();
GetTree().Paused = true;

22
GameLogic/Main.gdshader Normal file
View File

@@ -0,0 +1,22 @@
shader_type sky;
uniform vec3 color_top : source_color = vec3(0.91, 0.14, 1);
uniform vec3 color_horizon : source_color = vec3(1, 0.4, 0.42);
uniform vec3 color_bottom : source_color = vec3(1, 0.74, 0.39);
uniform float exponent_factor_top : hint_range(0, 100) = 1.0;
uniform float exponent_factor_bottom : hint_range(0, 100) = 1.0;
uniform float intensity_amp : hint_range(0, 1) = 1.0;
void sky() {
float p = EYEDIR.y;
float p1 = 1.0f - pow(min(1.0f, 1.0f - p), exponent_factor_top);
float p3 = 1.0f - pow(min(1.0f, 1.0f + p), exponent_factor_bottom);
float p2 = 1.0f - p1 - p3;
COLOR = (
color_top * p1 +
color_horizon * p2 +
color_bottom * p3
) * intensity_amp;
}

View File

@@ -1,13 +1,13 @@
[gd_scene load_steps=5 format=3 uid="uid://vwrw05ob2caq"]
[ext_resource type="Script" path="res://GameLogic/Main.cs" id="1_g4hua"]
[ext_resource type="PackedScene" uid="uid://btl5fdyjewnwc" path="res://Levels/Scenes/Level3.tscn" id="2_0yhby"]
[ext_resource type="PackedScene" uid="uid://b12gq4yqc3d8i" path="res://UI/MainMenu.tscn" id="2_kvovw"]
[ext_resource type="PackedScene" uid="uid://0hdnmilwrsq6" path="res://Levels/Scenes/Level10.tscn" id="2_tfrgb"]
[ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://GameLogic/GameManager.tscn" id="11_wiyvp"]
[node name="Main" type="Node3D"]
script = ExtResource("1_g4hua")
Levels = Array[PackedScene]([ExtResource("2_tfrgb")])
Levels = Array[PackedScene]([ExtResource("2_0yhby")])
GameManager = ExtResource("11_wiyvp")
[node name="MainMenu" parent="." instance=ExtResource("2_kvovw")]