Update v2.6

ChimbaBench/ChangeLog.txt

@@ -1,4 +1,16 @@
 
+2023-10-04 - ChimbaBench 2.6
+- Переход на Godot Engine v3.5.3.
+- Trash: Удалены шаблоны экспорта Android.
+- Linux: Исправлены файлы FORCE_GLESx.sh
+- Main: Исправлена обводка шрифта.
+- Main: Работа над интерфейсом.
+- Main: Содан список стандартов для элементов интерфейса (будет дополняться).
+- Settings: Доработана функция переключения полноэкранного режима. (Crutch for Linux)
+- Font Test: Добавлена возможность вывести произвольный диапазон символов Unicode.
+- Font Test: Заменено поле вывода для тестового набора символов.
+- Benchmark Module: Добавлено предупреждение если FPS меньше 8. Выявлена проблема таймеров Godot Engine, результаты рассчитываются неправильно при FPS ниже 8.
+
 2023-08-20 - ChimbaBench 2.5
 - Linux: Принято стандартное расширение для исполняемых файлов: ".exec"
 - Main: Исправлена подсказка при наведении на кнопку теста GPU Heavy.
@@ -76,4 +88,4 @@ FIXED: (Linux) - Добавлена утилита dmidecode, для работ
 - Выведено больше полезной информаци.
 
 2023-03-14 - ChimbaBench 1.0
-- Первая версия.
+- Первая версия.

ChimbaBench/ChimbaBench.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=25 format=2]
 
 [ext_resource path="res://Scripts/ChimbaBench.gd" type="Script" id=1]
 [ext_resource path="res://GUI/BaseInfo/GUI_BaseInfo.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Scripts/Main_Controls.gd" type="Script" id=3]
+[ext_resource path="res://GUI_img/Settings/sel_btn_fullscreen_active.png" type="Texture" id=4]
 [ext_resource path="res://Scripts/Settings.gd" type="Script" id=5]
 [ext_resource path="res://Textures/Overs_normal.png" type="Texture" id=6]
 [ext_resource path="res://Textures/yaica_.webp" type="Texture" id=7]
@@ -13,18 +14,25 @@
 [ext_resource path="res://Scripts/Message.gd" type="Script" id=12]
 [ext_resource path="res://Scripts/About.gd" type="Script" id=13]
 [ext_resource path="res://Scripts/SystemInfo.gd" type="Script" id=14]
+[ext_resource path="res://GUI_img/Settings/sel_btn_fullscreen.png" type="Texture" id=15]
 [ext_resource path="res://Textures/git_hover.png" type="Texture" id=16]
 [ext_resource path="res://Scripts/SysInfo/Win.gd" type="Script" id=17]
 [ext_resource path="res://Scripts/SysInfo/Lin.gd" type="Script" id=18]
+[ext_resource path="res://Scripts/Standarts.gd" type="Script" id=19]
 [ext_resource path="res://Textures/godot_hover.png" type="Texture" id=20]
 [ext_resource path="res://Textures/godot_normal.png" type="Texture" id=21]
+[ext_resource path="res://GUI_img/Settings/sel_btn_fullscreen_hover.png" type="Texture" id=22]
+[ext_resource path="res://GUI_img/Settings/sel_btn_fullscreen_disable.png" type="Texture" id=23]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.501961, 0.501961, 0.501961, 1 )
 
 [node name="ChimbaBench" type="Spatial"]
 script = ExtResource( 1 )
 
+[node name="Standarts" type="Node" parent="."]
+script = ExtResource( 19 )
+
 [node name="GUI" type="Control" parent="."]
 margin_right = 1024.0
 margin_bottom = 600.0
@@ -300,56 +308,81 @@ margin_right = 1270.0
 margin_bottom = 704.0
 color = Color( 0.160784, 0.0745098, 0.231373, 0.901961 )
 
-[node name="BTN_Close" type="Button" parent="GUI/Settings"]
-margin_left = 14.0
-margin_top = 631.0
-margin_right = 134.0
-margin_bottom = 681.0
-focus_mode = 0
-enabled_focus_mode = 0
-text = "Close"
+[node name="Left" type="Control" parent="GUI/Settings"]
+margin_right = 388.0
+margin_bottom = 163.0
 
-[node name="BTN_Save" type="Button" parent="GUI/Settings"]
-margin_left = 151.0
-margin_top = 632.0
-margin_right = 311.0
-margin_bottom = 680.0
-focus_mode = 0
-enabled_focus_mode = 0
-text = "Save"
+[node name="BG" type="ColorRect" parent="GUI/Settings/Left"]
+margin_right = 515.0
+margin_bottom = 282.0
+color = Color( 0.196078, 0.196078, 0.196078, 1 )
 
-[node name="SEL_MSAA" type="OptionButton" parent="GUI/Settings"]
+[node name="SEL_MSAA" type="OptionButton" parent="GUI/Settings/Left"]
 margin_left = 16.0
 margin_top = 79.0
 margin_right = 216.0
 margin_bottom = 109.0
 focus_mode = 0
 enabled_focus_mode = 0
 
-[node name="SEL_Aniso" type="OptionButton" parent="GUI/Settings"]
+[node name="SEL_Aniso" type="OptionButton" parent="GUI/Settings/Left"]
 margin_left = 17.0
 margin_top = 26.0
 margin_right = 217.0
 margin_bottom = 56.0
 focus_mode = 0
 enabled_focus_mode = 0
 
-[node name="SEL_resolution" type="OptionButton" parent="GUI/Settings"]
+[node name="SEL_resolution" type="OptionButton" parent="GUI/Settings/Left"]
 margin_left = 16.0
 margin_top = 79.0
 margin_right = 216.0
 margin_bottom = 109.0
 focus_mode = 0
 enabled_focus_mode = 0
 
-[node name="CHECK_Fullscreen" type="CheckBox" parent="GUI/Settings"]
-margin_left = 15.0
-margin_top = 125.0
-margin_right = 227.0
-margin_bottom = 166.0
+[node name="SEL_BTN_FullScreen" type="TextureButton" parent="GUI/Settings/Left"]
+margin_left = 31.0
+margin_top = 208.0
+margin_right = 407.0
+margin_bottom = 259.0
 focus_mode = 0
+toggle_mode = true
 enabled_focus_mode = 0
-text = "Fullscreen mode"
+texture_normal = ExtResource( 15 )
+texture_pressed = ExtResource( 4 )
+texture_hover = ExtResource( 22 )
+texture_disabled = ExtResource( 23 )
+expand = true
+stretch_mode = 5
+
+[node name="Right" type="Control" parent="GUI/Settings"]
+margin_right = 388.0
+margin_bottom = 163.0
+
+[node name="BG" type="ColorRect" parent="GUI/Settings/Right"]
+margin_left = 773.0
+margin_right = 1270.0
+margin_bottom = 289.0
+color = Color( 0.196078, 0.196078, 0.196078, 1 )
+
+[node name="BTN_Close" type="Button" parent="GUI/Settings"]
+margin_left = 14.0
+margin_top = 631.0
+margin_right = 134.0
+margin_bottom = 681.0
+focus_mode = 0
+enabled_focus_mode = 0
+text = "Close"
+
+[node name="BTN_Save" type="Button" parent="GUI/Settings"]
+margin_left = 151.0
+margin_top = 632.0
+margin_right = 311.0
+margin_bottom = 680.0
+focus_mode = 0
+enabled_focus_mode = 0
+text = "Save"
 
 [node name="Font_Test" type="Control" parent="GUI"]
 visible = false
@@ -367,14 +400,12 @@ margin_right = 1262.0
 margin_bottom = 419.0
 color = Color( 0.298039, 0.298039, 0.298039, 0.756863 )
 
-[node name="Langs_Main" type="Label" parent="GUI/Font_Test"]
-margin_left = 48.0
-margin_top = 47.0
-margin_right = 540.0
-margin_bottom = 327.0
-text = "
-Main"
-autowrap = true
+[node name="Langs_Main" type="TextEdit" parent="GUI/Font_Test"]
+margin_left = 31.0
+margin_top = 32.0
+margin_right = 1219.0
+margin_bottom = 397.0
+focus_mode = 1
 
 [node name="Font_Current" type="Label" parent="GUI/Font_Test"]
 margin_left = 106.0
@@ -417,7 +448,7 @@ margin_left = 231.0
 margin_top = 164.0
 margin_right = 828.0
 margin_bottom = 459.0
-window_title = "Открыть файл"
+window_title = "Open a File"
 resizable = true
 mode = 0
 access = 2
@@ -478,6 +509,7 @@ margin_left = 873.0
 margin_top = 647.0
 margin_right = 933.0
 margin_bottom = 693.0
+focus_mode = 1
 custom_constants/minimum_spaces = 0
 align = 1
 max_length = 5
@@ -497,6 +529,7 @@ margin_left = 980.0
 margin_top = 648.0
 margin_right = 1040.0
 margin_bottom = 694.0
+focus_mode = 1
 custom_constants/minimum_spaces = 0
 align = 1
 max_length = 5
@@ -819,12 +852,12 @@ fov = 95.0
 [connection signal="pressed" from="GUI/System_Info/Lin/BTN_lsusb" to="GUI/System_Info/Lin" method="_on_BTN_lsusb_pressed"]
 [connection signal="pressed" from="GUI/System_Info/Lin/BTN_lspci" to="GUI/System_Info/Lin" method="_on_BTN_lspci_pressed"]
 [connection signal="pressed" from="GUI/System_Info/BTN_Close" to="GUI/System_Info" method="_on_BTN_Close_pressed"]
+[connection signal="item_selected" from="GUI/Settings/Left/SEL_MSAA" to="GUI/Settings" method="_on_SEL_MSAA_item_selected"]
+[connection signal="item_selected" from="GUI/Settings/Left/SEL_Aniso" to="GUI/Settings" method="_on_SEL_Aniso_item_selected"]
+[connection signal="item_selected" from="GUI/Settings/Left/SEL_resolution" to="GUI/Settings" method="_on_SEL_resolution_item_selected"]
+[connection signal="toggled" from="GUI/Settings/Left/SEL_BTN_FullScreen" to="GUI/Settings" method="_on_SEL_BTN_FullScreen_toggled"]
 [connection signal="pressed" from="GUI/Settings/BTN_Close" to="GUI/Settings" method="_on_BTN_Close_pressed"]
 [connection signal="pressed" from="GUI/Settings/BTN_Save" to="GUI/Settings" method="_on_BTN_Save_pressed"]
-[connection signal="item_selected" from="GUI/Settings/SEL_MSAA" to="GUI/Settings" method="_on_SEL_MSAA_item_selected"]
-[connection signal="item_selected" from="GUI/Settings/SEL_Aniso" to="GUI/Settings" method="_on_SEL_Aniso_item_selected"]
-[connection signal="item_selected" from="GUI/Settings/SEL_resolution" to="GUI/Settings" method="_on_SEL_resolution_item_selected"]
-[connection signal="toggled" from="GUI/Settings/CHECK_Fullscreen" to="GUI/Settings" method="_on_CHECK_Fullscreen_toggled"]
 [connection signal="pressed" from="GUI/Font_Test/BTN_Select_Font" to="GUI/Font_Test" method="_on_BTN_SelectFont_pressed"]
 [connection signal="pressed" from="GUI/Font_Test/BTN_Close" to="GUI/Font_Test" method="_on_BTN_Close_pressed"]
 [connection signal="file_selected" from="GUI/Font_Test/OpenFile" to="GUI/Font_Test" method="_on_OpenFile_file_selected"]

ChimbaBench/GUI/BaseInfo/BaseSystemInfo.gd

@@ -18,8 +18,8 @@ func _ready():
 	chi_os_name = OS.get_name();
 	chi_os_model = OS.get_model_name();
 	if chi_os_name == "X11": chi_os_name = "Linux";
-	if chi_driverOGL == "GLES3": chi_driverOGL = "OpenGL/ES 3.0";
-	if chi_driverOGL == "GLES2": chi_driverOGL = "OpenGL/ES 2.0 (!!!)";
+	if chi_driverOGL == "GLES3": chi_driverOGL = "OpenGL 3.x";
+	if chi_driverOGL == "GLES2": chi_driverOGL = "OpenGL 2.x (!!!)";
 
 func chi_info():
 	chi_raster = $"..".chi_bi_render_size.x * $"..".chi_bi_render_size.y;

ChimbaBench/GUI/BaseInfo/GUI_BaseInfo.gd

@@ -3,8 +3,8 @@ extends Control
 export var more_info : bool = false;
 export(String, FILE) var font_data = "res://Fonts/determination2/determination2.ttf";
 
-var chi_project_name_and_version = "ChimbaBench 2.5 (GPLv3+)";
-var chi_bi_font = { "outline_s":1, "outline_m":2, "outline_l":3, "outline_xl":4 }
+var chi_project_name_and_version = "ChimbaBench 2.6 (GPLv3+)";
+var chi_bi_font = { "outline_s":2, "outline_m":2, "outline_l":3, "outline_xl":4 }
 
 var chi_bi_render_size = Vector2(0, 0);
 var chi_bi_windows_size = Vector2(0, 0);
@@ -58,7 +58,7 @@ func chi_font_set():
 	font.font_data = load(font_data);
 	return font;
 
-func chi_font_set_settings(font, fsize = 24, outliine_size = 2, outline_color:Color = Color(0.2, 0.2, 0.30, 1)):
+func chi_font_set_settings(font, fsize = 24, outliine_size = 2, outline_color:Color = Color(0.25, 0.25, 0.35, 1)):
 	font.size = fsize;
 	font.outline_size = outliine_size;
 	font.outline_color = outline_color;

ChimbaBench/GUI/Bench60/Bench60.gd

@@ -9,6 +9,7 @@ var chi_font_m = DynamicFont.new();
 var chi_loop;
 var timer;
 var chi_test_result : float = 0;
+var timer_issue = 0;
 
 var chi_btn_size = Vector2(0, 0);
 var chi_btn_mult = Vector2(5, 4);
@@ -95,20 +96,30 @@ func _on_BTN_Start_pressed():
 	$Result.visible = true;
 	$About.visible = false;
 	chi_test_result = 0;
-	$Result.text = "Preparing!";
+	$Result.text = "Preparing! (" + str($Timer.wait_time + $Timer3.wait_time) + " seconds left)";
 	on_resize();
 	$BTN_Start.disabled = true;
+	$Timer3.start();
+
+func _on_Timer3_timeout():
+	$Result.text = "Preparing! (" + str($Timer.wait_time) + " seconds left)";
+	if Performance.get_monitor(Performance.TIME_FPS) < 8:
+		$Result.text = "Preparing! (" + str($Timer.wait_time) + " seconds left)\n WARNING! FPS < 8 !\nThe results may be incorrect\ndue to a Godot Engine timer issue!";
+		timer_issue = 1;
+	on_resize();
 	$Timer.start();
 
 func _on_Timer_timeout():
 	chi_loop = 1;
-	$Result.text = "Testing! (60 seconds)\nDon't touch mouse and keyboard!";
+	$Result.text = "Testing! (" + str($Timer2.wait_time) + " seconds)\nDon't touch mouse and keyboard!";
 	on_resize();
 	$Timer2.start();
 
 func _on_Timer2_timeout():
 	chi_loop = 0;
-	$Result.text = chi_benchmark_name + "\n---  ChimbaPoints:  " + str(stepify(chi_test_result / 10, 0.1)) + " CPs  ---\n(CPs = total frames / 10)\nAverage FPS: " + str(stepify((chi_test_result / $Timer2.wait_time), 0.1));
+	$Result.text = chi_benchmark_name + " - ( " + str($Timer2.wait_time) + " sec. )" + "\n---  ChimbaPoints:  " + str(stepify(chi_test_result / 10, 0.1)) + " CPs  ---\n(CPs = total frames / 10)\nAverage FPS: " + str(stepify((chi_test_result / $Timer2.wait_time), 0.1));
+	if timer_issue == 1:
+		$Result.text += "\n WARNING!"
 	on_resize();
 	$BTN_Start.disabled = false;
 	$About.visible = true
@@ -125,3 +136,4 @@ func _on_BTN_About_pressed():
 
 func _on_BTN_Close_pressed():
 	$About/msg.visible = false;
+

ChimbaBench/GUI/Bench60/Bench60.tscn

@@ -43,10 +43,14 @@ text = "Result"
 align = 1
 valign = 1
 
-[node name="Timer" type="Timer" parent="."]
+[node name="Timer3" type="Timer" parent="."]
 wait_time = 2.0
 one_shot = true
 
+[node name="Timer" type="Timer" parent="."]
+wait_time = 8.0
+one_shot = true
+
 [node name="Timer2" type="Timer" parent="."]
 wait_time = 60.0
 one_shot = true
@@ -93,6 +97,7 @@ wrap_enabled = true
 
 [connection signal="pressed" from="BTN_Back" to="." method="_on_BTN_Back_pressed"]
 [connection signal="pressed" from="BTN_Start" to="." method="_on_BTN_Start_pressed"]
+[connection signal="timeout" from="Timer3" to="." method="_on_Timer3_timeout"]
 [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
 [connection signal="timeout" from="Timer2" to="." method="_on_Timer2_timeout"]
 [connection signal="pressed" from="About/BTN_Info" to="." method="_on_BTN_About_pressed"]

ChimbaBench/GUI_img/Settings/sel_btn_fullscreen.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/sel_btn_fullscreen.png-00480f97716ba8849a37761bcf4a0714.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://GUI_img/Settings/sel_btn_fullscreen.png"
+dest_files=[ "res://.import/sel_btn_fullscreen.png-00480f97716ba8849a37761bcf4a0714.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=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0