Remove possibly AI background, use shader for BG instead. Remove placeholder Rare Sword, fix missing Avarice name

This commit is contained in:
2024-09-09 10:43:50 -07:00
parent 2ac4660d1b
commit ca9ba8c81f
8 changed files with 195 additions and 115 deletions

View File

@@ -0,0 +1,99 @@
shader_type canvas_item;
#define iTime TIME
#define iResolution 1.0/SCREEN_PIXEL_SIZE
uniform vec3 color1 = vec3(0.5, 0.5, 0.5);
uniform vec3 color2 = vec3(0.5, 0.5, 0.5);
uniform vec3 color3 = vec3(1., 1., 1.);
uniform vec3 color4 = vec3(0., 0.1, 0.2);
uniform float grandient : hint_range(0.01, 2.0, 0.01) = 0.04;
uniform float zoom : hint_range(0, 2., 0.1) = 1.0;
uniform vec2 disp = vec2(0.0);
uniform vec2 rot_angle = vec2(1.0);
uniform float wiggle : hint_range(0.0, 5.0, 0.1) = 0.35;
uniform float speed1 : hint_range(0.0, 10.0, 0.1) = 0.2;
uniform float speed2 : hint_range(0.0, 10.0, 0.1) = 0.2;
uniform float speed3 : hint_range(0.0, 5.0, 0.1) = 0.4;
// Box sdf function
float sdBox ( vec3 p, vec3 b ) {
vec3 q = abs(p) - b;
return length(max(q, 0.0)) + min(max(q.x, max(q.y, q.z)), 0.0);
}
//Octahedron
float sdOctahedron( vec3 p, float s) {
p = abs(p);
return (p.x+p.y+p.z-s)*0.57735027;
}
float map(vec3 p) {
p.z += iTime * speed3; // Move effect
// Space Repetition
p.xy = (fract(p.xy) - .5); // Spacing by 1
p.z = mod(p.z, .25) - 0.125; // Spacing by .25
float box = sdOctahedron(p, .15); // SDF
return box;
}
// Coloring
vec3 palette(float t) {
vec3 a = color1;
vec3 b = color2;
vec3 c = color3;
vec3 d = color4;
return a + b * cos(6.28318 * (c * t + d));
}
// 2D Rotation
mat2 rot2D(float angle) {
float s = sin(angle * rot_angle.x);
float c = cos(angle * rot_angle.y);
return mat2(vec2(c, -s), vec2(s, c));
}
void fragment() {
vec2 uv = UV * 2.0 - 1.0;
//vec2 m = (iMouse.xy * 2. - iResolution.xy) / iResolution.y;
vec2 m = uv;
// Initialization
vec3 ro = vec3(disp.x, disp.y, -0); // Ray origin
vec3 rd = normalize(vec3(uv, 1)) * zoom; // Ray zoom
vec3 col = vec3(0);
float t = 0.0; // Total distance travelled
// Default circular motion if mouse is not clicked
m = vec2(cos(iTime * speed1), sin(iTime * speed2));
// Raymarching
int i;
for (int i = 0; i < 80; i++) {
vec3 p = ro + rd * t; // Posiiton along the ray
p.xy *= rot2D(t * 0.2 * m.x); // Rotate ray around z-axis
p.y += sin(t * (m.y + 1.) * 0.5) * wiggle; // Wiggle
float d = map(p); // Current distance to the scene
t += d; // March the rays
col = vec3(float(i)) / 80.;
if (d < .001 || t > 100.) break; // Early Stop
}
// Coloring
col = palette(t * grandient + float(i) * 0.005); // Lower the float value to see further away
COLOR = vec4(col, 1);
}

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=19 format=3 uid="uid://dlj8qdg1c5048"] [gd_scene load_steps=21 format=3 uid="uid://dlj8qdg1c5048"]
[ext_resource type="Script" path="res://src/inventory_menu/InventoryMenu.cs" id="1_l64wl"] [ext_resource type="Script" path="res://src/inventory_menu/InventoryMenu.cs" id="1_l64wl"]
[ext_resource type="Texture2D" uid="uid://c8tnq16qgjurc" path="res://src/ui/textures/INVENTORY-BACKGROUND.png" id="2_plijd"] [ext_resource type="Shader" path="res://src/inventory_menu/InventoryMenu.gdshader" id="2_0fvsh"]
[ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="3_lm4o1"] [ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="3_lm4o1"]
[ext_resource type="FontFile" uid="uid://cb41qqmxqurj8" path="res://src/ui/fonts/FT88-Bold.ttf" id="4_rg5yb"] [ext_resource type="FontFile" uid="uid://cb41qqmxqurj8" path="res://src/ui/fonts/FT88-Bold.ttf" id="4_rg5yb"]
[ext_resource type="FontFile" uid="uid://dit3vylt7hmmx" path="res://src/ui/fonts/FT88-Regular.ttf" id="5_2qnnx"] [ext_resource type="FontFile" uid="uid://dit3vylt7hmmx" path="res://src/ui/fonts/FT88-Regular.ttf" id="5_2qnnx"]
@@ -9,6 +9,23 @@
[ext_resource type="LabelSettings" uid="uid://c4wbba5mo7qcp" path="res://src/ui/label_settings/MainTextFontItalicized.tres" id="6_q3oua"] [ext_resource type="LabelSettings" uid="uid://c4wbba5mo7qcp" path="res://src/ui/label_settings/MainTextFontItalicized.tres" id="6_q3oua"]
[ext_resource type="LabelSettings" uid="uid://ca1q6yu8blwxf" path="res://src/ui/label_settings/InventoryMainTextBold.tres" id="6_tmdno"] [ext_resource type="LabelSettings" uid="uid://ca1q6yu8blwxf" path="res://src/ui/label_settings/InventoryMainTextBold.tres" id="6_tmdno"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_i55tv"]
shader = ExtResource("2_0fvsh")
shader_parameter/color1 = Vector3(-1.635, -0.665, 0.005)
shader_parameter/color2 = Vector3(-0.275, 0.91, 1.005)
shader_parameter/color3 = Vector3(1, 1, 1)
shader_parameter/color4 = Vector3(0, 0.1, 0.2)
shader_parameter/grandient = 0.01
shader_parameter/zoom = 2.0
shader_parameter/disp = Vector2(0, 0)
shader_parameter/rot_angle = Vector2(1, 1)
shader_parameter/wiggle = 0.35
shader_parameter/speed1 = 0.1
shader_parameter/speed2 = 0.1
shader_parameter/speed3 = 0.1
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_3ynpe"]
[sub_resource type="LabelSettings" id="LabelSettings_q0afw"] [sub_resource type="LabelSettings" id="LabelSettings_q0afw"]
font = ExtResource("3_lm4o1") font = ExtResource("3_lm4o1")
font_size = 48 font_size = 48
@@ -71,13 +88,16 @@ size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
script = ExtResource("1_l64wl") script = ExtResource("1_l64wl")
[node name="TextureRect" type="TextureRect" parent="."] [node name="BG" type="TextureRect" parent="."]
material = SubResource("ShaderMaterial_i55tv")
layout_mode = 1 layout_mode = 1
anchors_preset = 10 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
offset_bottom = 1536.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
texture = ExtResource("2_plijd") grow_vertical = 2
texture = SubResource("PlaceholderTexture2D_3ynpe")
expand_mode = 2
[node name="InventoryInfo" type="MarginContainer" parent="."] [node name="InventoryInfo" type="MarginContainer" parent="."]
layout_mode = 1 layout_mode = 1

View File

@@ -10,7 +10,7 @@ DEFUp = 0
LUCKUp = 0.0 LUCKUp = 0.0
MaxHPUp = 0 MaxHPUp = 0
MaxVTUp = 0 MaxVTUp = 0
AccessoryTags = Array[int]([]) AccessoryTags = []
Name = "" Name = "Mask of the Goddess of Avarice"
Description = "" Description = ""
Texture = ExtResource("1_578a0") Texture = ExtResource("1_578a0")

View File

@@ -1,88 +0,0 @@
[gd_scene load_steps=9 format=3 uid="uid://c10nhqq8su6pp"]
[ext_resource type="Script" path="res://src/items/weapons/Weapon.cs" id="1_f8v7v"]
[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="3_meaac"]
[ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="3_o6dnw"]
[sub_resource type="Resource" id="Resource_s6hhf"]
script = ExtResource("3_o6dnw")
Damage = 7
Luck = 0.05
AttackSpeed = 1.0
TelluricDamageBonus = 0.0
AeolicDamageBonus = 0.0
BaseHydricDamageBonus = 0.0
IgneousDamageBonus = 0.0
FerrumDamageBonus = 0.0
WeaponTags = []
Name = ""
Description = ""
Texture = ExtResource("3_meaac")
[sub_resource type="Animation" id="Animation_w4iur"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_gkdye"]
resource_name = "drop"
length = 0.75
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.0333333, 0.3, 0.733333),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 0,
"values": [Vector3(0, 0, 0), Vector3(0, 2, 0), Vector3(0, 1, -2), Vector3(0, 0, -4)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s2htf"]
_data = {
"RESET": SubResource("Animation_w4iur"),
"drop": SubResource("Animation_gkdye")
}
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_4ic28"]
radius = 0.470016
[node name="RareSword" type="Node3D"]
script = ExtResource("1_f8v7v")
WeaponInfo = SubResource("Resource_s6hhf")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_s2htf")
}
[node name="Pickup" type="Area3D" parent="."]
unique_name_in_owner = true
collision_layer = 4
collision_mask = 4
[node name="Sprite" type="Sprite3D" parent="Pickup"]
unique_name_in_owner = true
billboard = 2
double_sided = false
alpha_cut = 1
alpha_scissor_threshold = 0.511
alpha_antialiasing_mode = 1
texture_filter = 0
texture = ExtResource("3_meaac")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
shape = SubResource("CapsuleShape3D_4ic28")

View File

@@ -1,19 +0,0 @@
[gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://b4oxsf4k3nr43"]
[ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_oqgv2"]
[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_rlq8c"]
[resource]
script = ExtResource("1_oqgv2")
Damage = 7
Luck = 0.05
AttackSpeed = 1.0
TelluricDamageBonus = 0.0
AeolicDamageBonus = 0.0
BaseHydricDamageBonus = 0.0
IgneousDamageBonus = 0.0
FerrumDamageBonus = 0.0
WeaponTags = Array[int]([])
Name = "Rare sword"
Description = "Rare"
Texture = ExtResource("1_rlq8c")

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://v0i7rwj05ijp"
path="res://.godot/imported/GettyImages-2148610352.jpg-20858bb3a3415a6fd3642a86aed2be9b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/ui/textures/GettyImages-2148610352.jpg"
dest_files=["res://.godot/imported/GettyImages-2148610352.jpg-20858bb3a3415a6fd3642a86aed2be9b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 MiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://0f0krskc3lfb"
path="res://.godot/imported/inventory_background.png-d8cc6b5ec52e3c266040bf16e4b5e553.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/ui/textures/inventory_background.png"
dest_files=["res://.godot/imported/inventory_background.png-d8cc6b5ec52e3c266040bf16e4b5e553.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1