Skip to content

Commit

Permalink
Merge pull request #3 from RedstoneMedia/next-level-visual-fix-issues
Browse files Browse the repository at this point in the history
Using a Color Rect instead of TextureRect for the blur shader
  • Loading branch information
b7g authored Jun 28, 2022
2 parents 24d8e9d + d380483 commit f7c7e23
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 50 deletions.
Binary file removed game/app/images/white_square_64.png
Binary file not shown.
35 changes: 0 additions & 35 deletions game/app/images/white_square_64.png.import

This file was deleted.

10 changes: 2 additions & 8 deletions game/app/pause_menu/pause_menu.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=7 format=2]

[ext_resource path="res://shared/fonts/roboto/roboto_regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://app/shader/blur.shader" type="Shader" id=2]
[ext_resource path="res://app/images/alpha_pixel_1.png" type="Texture" id=3]
[ext_resource path="res://app/pause_menu/pause_menu.gd" type="Script" id=4]

[sub_resource type="DynamicFont" id=1]
Expand All @@ -28,15 +27,10 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="BlurShader" type="TextureRect" parent="Control"]
[node name="BlurShader" type="ColorRect" parent="Control"]
material = SubResource( 3 )
anchor_right = 1.0
anchor_bottom = 1.0
texture = ExtResource( 3 )
expand = true
__meta__ = {
"_edit_use_anchors_": false
}

[node name="ColorRect" type="ColorRect" parent="Control"]
anchor_right = 1.0
Expand Down
10 changes: 3 additions & 7 deletions game/app/scenes/game_card.tscn
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[gd_scene load_steps=26 format=2]
[gd_scene load_steps=25 format=2]

[ext_resource path="res://app/scenes/game_card.gd" type="Script" id=1]
[ext_resource path="res://shared/fonts/roboto/roboto_regular.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://icon.png" type="Texture" id=3]
[ext_resource path="res://shared/fonts/roboto/roboto_black.ttf" type="DynamicFontData" id=4]
[ext_resource path="res://app/images/cross_40.png" type="Texture" id=5]
[ext_resource path="res://app/shader/blur.shader" type="Shader" id=6]
[ext_resource path="res://app/images/alpha_pixel_1.png" type="Texture" id=7]

[sub_resource type="DynamicFont" id=1]
font_data = ExtResource( 4 )
Expand Down Expand Up @@ -374,15 +373,12 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="BlurShader" type="TextureRect" parent="PopupDialogInfo/VC/PC"]
[node name="BlurShader" type="ColorRect" parent="PopupDialogInfo/VC/PC"]
material = SubResource( 20 )
margin_right = 650.0
margin_bottom = 96.0
texture = ExtResource( 7 )
expand = true
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
"_edit_lock_": true
}

[node name="MC" type="MarginContainer" parent="PopupDialogInfo/VC/PC"]
Expand Down

0 comments on commit f7c7e23

Please sign in to comment.