Convert most demos to GLES 2

Also fix Viewport error in 3D scaling demo, add an icon to Multiplayer Bomber, and rename BPM sync files.
This commit is contained in:
Aaron Franke
2020-03-04 20:30:41 -05:00
parent db7c9f162f
commit aea4010bc8
49 changed files with 190 additions and 76 deletions

File diff suppressed because one or more lines are too long

View File

@@ -69,4 +69,5 @@ shadow_filter=3
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://Control.gd" type="Script" id=1]
[ext_resource path="res://lcd.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://play_system_button_hl.png" type="Texture" id=1]
[ext_resource path="res://play_sound_button.png" type="Texture" id=2]
[ext_resource path="res://the_comeback2.ogg" type="AudioStream" id=3]
[ext_resource path="res://play_system_button.png" type="Texture" id=4]
[ext_resource path="res://play_system_button_hl.png" type="Texture" id=5]
[ext_resource path="res://play_sound_button.png" type="Texture" id=6]
[ext_resource path="res://play_sound_button_hl.png" type="Texture" id=7]
[ext_resource path="res://play_sound_button_hl.png" type="Texture" id=4]
[ext_resource path="res://play_system_button.png" type="Texture" id=5]
[ext_resource path="res://lcd.ttf" type="DynamicFontData" id=6]
[ext_resource path="res://bpm_sync.gd" type="Script" id=7]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0, 0, 0, 1 )
@@ -15,13 +15,13 @@ bg_color = Color( 0, 0, 0, 1 )
size = 40
outline_size = 2
outline_color = Color( 0.588235, 0.886275, 0.435294, 0.239216 )
font_data = ExtResource( 2 )
font_data = ExtResource( 6 )
[node name="Control" type="Panel"]
[node name="BPMSync" type="Panel"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_styles/panel = SubResource( 1 )
script = ExtResource( 1 )
script = ExtResource( 7 )
__meta__ = {
"_edit_use_anchors_": false
}
@@ -43,17 +43,17 @@ margin_left = 214.737
margin_top = 187.368
margin_right = 342.737
margin_bottom = 315.368
texture_normal = ExtResource( 4 )
texture_pressed = ExtResource( 4 )
texture_hover = ExtResource( 5 )
texture_normal = ExtResource( 5 )
texture_pressed = ExtResource( 5 )
texture_hover = ExtResource( 1 )
[node name="PlaySound" type="TextureButton" parent="."]
margin_left = 622.105
margin_top = 183.158
margin_right = 750.105
margin_bottom = 311.158
texture_normal = ExtResource( 6 )
texture_pressed = ExtResource( 6 )
texture_hover = ExtResource( 7 )
texture_normal = ExtResource( 2 )
texture_pressed = ExtResource( 2 )
texture_hover = ExtResource( 4 )
[connection signal="pressed" from="PlaySystem" to="." method="_on_PlaySystem_pressed"]
[connection signal="pressed" from="PlaySound" to="." method="_on_PlaySound_pressed"]

View File

@@ -16,4 +16,8 @@ _global_script_class_icons={
[application]
config/name="BPM Sync Demo"
run/main_scene="res://player.tscn"
run/main_scene="res://bpm_sync.tscn"
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -98,4 +98,5 @@ ui_end={
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -17,3 +17,7 @@ _global_script_class_icons={
config/name="Audio Generator Demo"
run/main_scene="res://generator.tscn"
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -32,4 +32,5 @@ window/stretch/aspect="expand"
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -17,3 +17,7 @@ _global_script_class_icons={
config/name="Audio Spectrum Demo"
run/main_scene="res://show_spectrum.tscn"
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -27,3 +27,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -57,3 +57,7 @@ dash={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null)
]
}
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -34,4 +34,5 @@ multithread/thread_rid_pool_prealloc=60
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 )

View File

@@ -42,4 +42,5 @@ multithread/thread_rid_pool_prealloc=60
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 )

View File

@@ -34,3 +34,7 @@ singletons=[ ]
[memory]
multithread/thread_rid_pool_prealloc=60
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -103,3 +103,7 @@ ui_end={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777230,"unicode":0,"echo":false,"script":null)
]
}
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -30,3 +30,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -30,3 +30,7 @@ singletons=[ ]
[memory]
multithread/thread_rid_pool_prealloc=60
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -39,3 +39,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -35,4 +35,5 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 )

View File

@@ -33,3 +33,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -32,4 +32,5 @@ config/icon="res://icon.png"
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -25,5 +25,6 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 )
environment/default_environment="res://default_env.tres"

View File

@@ -29,5 +29,6 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 )
environment/default_environment="res://default_env.tres"

View File

@@ -30,5 +30,6 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=3
quality/filters/msaa=2

View File

@@ -27,3 +27,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -25,4 +25,5 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -260,7 +260,7 @@ __meta__ = {
}
[node name="ColorFrom" type="VBoxContainer" parent="Colors"]
margin_right = 290.0
margin_right = 308.0
margin_bottom = 480.0
rect_min_size = Vector2( 0, 320 )
size_flags_horizontal = 2
@@ -275,7 +275,7 @@ text = "Color From:"
[node name="Picker" type="ColorPicker" parent="Colors/ColorFrom"]
margin_top = 18.0
margin_right = 290.0
margin_right = 308.0
margin_bottom = 480.0
rect_min_size = Vector2( 0, 320 )
size_flags_horizontal = 2
@@ -283,7 +283,7 @@ size_flags_vertical = 2
[node name="ColorTo" type="VBoxContainer" parent="Colors"]
margin_left = 348.0
margin_right = 638.0
margin_right = 656.0
margin_bottom = 480.0
rect_min_size = Vector2( 0, 320 )
size_flags_horizontal = 2
@@ -298,7 +298,7 @@ text = "Color To:"
[node name="Picker" type="ColorPicker" parent="Colors/ColorTo"]
margin_top = 18.0
margin_right = 290.0
margin_right = 308.0
margin_bottom = 480.0
rect_min_size = Vector2( 0, 320 )
size_flags_horizontal = 2

View File

@@ -42,4 +42,5 @@ multithread/thread_rid_pool_prealloc=60
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.2349, 0.2349, 0.27, 1 )

View File

@@ -75,5 +75,6 @@ move_right={
[rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=3
quality/filters/msaa=2

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://icon.png"
dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -17,6 +17,7 @@ _global_script_class_icons={
config/name="Multiplayer Bomber"
run/main_scene="res://lobby.tscn"
config/icon="res://icon.png"
[autoload]

View File

@@ -58,5 +58,6 @@ move_up={
[rendering]
quality/driver/driver_name="GLES2"
quality/2d/use_pixel_snap=true
viewport/default_clear_color=Color( 0, 0, 0, 1 )

View File

@@ -30,3 +30,7 @@ window/stretch/aspect="expand"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -37,3 +37,7 @@ singletons_disabled=[ ]
[network]
modules/webrtc_gdnative_script="res://demo/webrtc/webrtc.gdns"
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -15,7 +15,7 @@ _global_script_class_icons={
[application]
config/name="Websocket Chat Demo"
config/name="WebSocket Chat Demo"
run/main_scene="res://combo/combo.tscn"
config/icon="res://icon.png"
@@ -26,3 +26,7 @@ Utils="*res://utils.gd"
[gdnative]
singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -46,7 +46,7 @@ func _on_data():
print("Got data from server: ", _client.get_peer(1).get_packet().get_string_from_utf8())
func _process(delta):
func _process(_delta):
# Call this in _process or _physics_process. Data transfer, and signals
# emission will only happen when calling this function.
_client.poll()

View File

@@ -17,3 +17,7 @@ _global_script_class_icons={
config/name="WebSocket Minimal Demo"
run/main_scene="res://Main.tscn"
[rendering]
quality/driver/driver_name="GLES2"

View File

@@ -50,7 +50,7 @@ func _on_data(id):
_server.get_peer(id).put_packet(pkt)
func _process(delta):
func _process(_delta):
# Call this in _process or _physics_process.
# Data transfer, and signals emission will only happen when calling this function.
_server.poll()

View File

@@ -15,10 +15,11 @@ _global_script_class_icons={
[application]
config/name="Websocket Multiplayer Demo"
config/name="WebSocket Multiplayer Demo"
run/main_scene="res://scene/main.tscn"
config/icon="res://icon.png"
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -50,18 +50,18 @@ script = SubResource( 5 )
albedo_color = Color( 0.652344, 0.652344, 0.652344, 1 )
roughness = 0.0
[sub_resource type="GDScript" id=11]
[sub_resource type="GDScript" id=9]
script/source = "tool
extends Object
func e():
return 0.1
"
[sub_resource type="CubeMesh" id=12]
[sub_resource type="CubeMesh" id=10]
size = Vector3( 1.1, 0.8, 0.1 )
script = SubResource( 11 )
script = SubResource( 9 )
[sub_resource type="SpatialMaterial" id=13]
[sub_resource type="SpatialMaterial" id=11]
[node name="2D_in_3D" type="Spatial"]
script = ExtResource( 1 )
@@ -117,7 +117,7 @@ material/0 = SubResource( 8 )
[node name="Pillar_back" type="MeshInstance" parent="."]
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.2, -4.5 )
mesh = SubResource( 12 )
mesh = SubResource( 10 )
material/0 = SubResource( 8 )
[node name="DirectionalLight" type="DirectionalLight" parent="."]
@@ -128,7 +128,7 @@ directional_shadow_normal_bias = 0.2
[node name="Viewport_quad" type="MeshInstance" parent="."]
transform = Transform( 2, 0, 0, 0, 0, -1.333, 0, 1, 0, 0, 1.2, -4.25 )
material_override = SubResource( 13 )
material_override = SubResource( 11 )
mesh = SubResource( 1 )
material/0 = null

View File

@@ -48,4 +48,5 @@ right_move_down={
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -10,7 +10,7 @@ extends Control
var scale_factor = 1.0
onready var texture_rect = $TextureRect
onready var viewport = $TextureRect/Viewport
onready var viewport = $Viewport
onready var scale_label = $VBoxContainer/Scale
onready var filter_label = $VBoxContainer/Filter

View File

@@ -12,7 +12,7 @@ font_data = ExtResource( 1 )
default_font = SubResource( 1 )
[sub_resource type="ViewportTexture" id=3]
viewport_path = NodePath("TextureRect/Viewport")
viewport_path = NodePath("Viewport")
[node name="HUD" type="Control"]
anchor_right = 1.0
@@ -23,6 +23,15 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Viewport" type="Viewport" parent="."]
size = Vector2( 1024, 600 )
handle_input_locally = false
usage = 3
render_target_update_mode = 3
shadow_atlas_size = 4096
[node name="Spatial" parent="Viewport" instance=ExtResource( 2 )]
[node name="TextureRect" type="TextureRect" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
@@ -34,15 +43,6 @@ __meta__ = {
"_editor_description_": ""
}
[node name="Viewport" type="Viewport" parent="TextureRect"]
size = Vector2( 1024, 600 )
handle_input_locally = false
usage = 3
render_target_update_mode = 3
shadow_atlas_size = 4096
[node name="Spatial" parent="TextureRect/Viewport" instance=ExtResource( 2 )]
[node name="ViewportContainer" type="ViewportContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0

View File

@@ -39,5 +39,6 @@ toggle_filtering={
[rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=3
environment/default_environment="res://default_env.tres"

View File

@@ -34,4 +34,5 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_environment="res://default_env.tres"

View File

@@ -25,5 +25,6 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 )
environment/default_environment="res://default_env.tres"

View File

@@ -33,5 +33,6 @@ pointing/emulate_touch_from_mouse=true
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0.113725, 0.133333, 0.196078, 1 )
environment/default_environment="res://default_env.tres"

View File

@@ -66,5 +66,6 @@ right_move_up={
[rendering]
quality/driver/driver_name="GLES2"
quality/2d/use_pixel_snap=true
viewport/default_clear_color=Color( 0, 0, 0, 1 )