Merge pull request #20 from DmitriySalnikov/restructure

Restructure

dev_debug_draw_3d_Library.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33110.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_draw_3d_Library", "dev_debug_draw_3d_Library.vcxproj", "{A265372D-FCD7-4FBD-9F8C-0D31F6D0F557}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_draw_3d_Library", "src/dev_debug_draw_3d_Library.vcxproj", "{A265372D-FCD7-4FBD-9F8C-0D31F6D0F557}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

examples_dd3d/DebugDrawDemoScene.tscn

@@ -168,7 +168,8 @@ _data = {
 [sub_resource type="Theme" id="3"]
 
 [sub_resource type="GDScript" id="2"]
-script/source = "extends Control
+script/source = "@tool
+extends Control
 
 @export var switch_to_scene = \"\"
 
@@ -177,7 +178,7 @@ func _ready() -> void:
 	await get_tree().process_frame
 	await get_tree().process_frame
 
-	var test := DebugDraw.get_graph(&\"FPS\")
+	var test := DebugDraw2D.get_graph(&\"FPS\")
 	if test:
 		$GC/VB/H/FPSEnabled.button_pressed = test.enabled
 		$GC/VB/FPSMS.button_pressed = test.frame_time_mode
@@ -189,13 +190,21 @@ func _ready() -> void:
 	$GC/VB/H/Button.disabled = true
 
 
+func _process(_delta):
+	pass
+	#queue_redraw()
+
+func _draw():
+	pass
+	#draw_texture_rect_region(load(\"res://icon.svg\"), Rect2(Vector2(), Vector2(128,128)), Rect2(Vector2(), Vector2(128,128)))
+
 func _on_CheckBox_toggled(button_pressed: bool) -> void:
-	var cfg = DebugDraw.get_graph(&\"FPS\")
+	var cfg = DebugDraw2D.get_graph(&\"FPS\")
 	if cfg:
 		cfg.enabled = button_pressed
 
 func _on_FPSMS_toggled(button_pressed: bool) -> void:
-	var cfg = DebugDraw.get_graph(&\"FPS\")
+	var cfg = DebugDraw2D.get_graph(&\"FPS\")
 	if cfg:
 		cfg.frame_time_mode = button_pressed
 
@@ -206,7 +215,7 @@ func _on_HSlider2_value_changed(value: float) -> void:
 	get_parent().graph_buffer_size = int(value)
 
 func _on_Button_pressed() -> void:
-	DebugDraw.clear_all()
+	DebugDraw2D.clear_2d_objects()
 	get_tree().call_deferred(\"change_scene_to_file\", switch_to_scene)
 "
 
@@ -231,6 +240,7 @@ far = 60.0
 
 [node name="Panel" type="PanelContainer" parent="."]
 visible = false
+custom_minimum_size = Vector2(300, 300)
 anchors_preset = 2
 anchor_top = 1.0
 anchor_bottom = 1.0
@@ -244,7 +254,7 @@ stretch = true
 
 [node name="Viewport" type="SubViewport" parent="Panel/ViewportContainer"]
 handle_input_locally = false
-size = Vector2i(300, 300)
+size = Vector2i(2, 2)
 render_target_update_mode = 0
 
 [node name="CameraLayer2_5" type="Camera3D" parent="Panel/ViewportContainer/Viewport"]
@@ -514,27 +524,30 @@ layout_mode = 2
 [node name="FPSEnabled" type="CheckBox" parent="Settings/GC/VB/H"]
 layout_mode = 2
 size_flags_horizontal = 3
+button_pressed = true
 text = "FPS Graph enabled"
 
 [node name="Button" type="Button" parent="Settings/GC/VB/H"]
 layout_mode = 2
+disabled = true
 text = "Switch to C#"
 
 [node name="FPSMS" type="CheckBox" parent="Settings/GC/VB"]
 layout_mode = 2
+button_pressed = true
 text = "FPS Graph ms or FPS"
 
 [node name="HSlider" type="HSlider" parent="Settings/GC/VB"]
 layout_mode = 2
 min_value = 50.0
 max_value = 1000.0
-value = 50.0
+value = 200.0
 
 [node name="HSlider2" type="HSlider" parent="Settings/GC/VB"]
 layout_mode = 2
 min_value = 50.0
 max_value = 1000.0
-value = 50.0
+value = 128.0
 
 [connection signal="toggled" from="Settings/GC/VB/H/FPSEnabled" to="Settings" method="_on_CheckBox_toggled"]
 [connection signal="pressed" from="Settings/GC/VB/H/Button" to="Settings" method="_on_Button_pressed"]

examples_dd3d/addon_icon.gd

@@ -2,9 +2,9 @@
 extends Node3D
 
 func _process(delta: float) -> void:
-	DebugDraw.draw_box_xf($box.global_transform, Color.GREEN)
-	DebugDraw.draw_gizmo($gizmo.global_transform)
-	DebugDraw.draw_grid_xf($gizmo/grid.global_transform, Vector2i(2,2), DebugDraw.empty_color, false)
-	DebugDraw.draw_sphere_xf($sphere.global_transform, Color.RED)
-	DebugDraw.draw_cylinder($cylinder.global_transform, Color.BLUE)
-	DebugDraw.draw_line_hit_offset($"line/1".global_transform.origin, $"line/2".global_transform.origin, true, 0.3, 0.1)
+	DebugDraw3D.draw_box_xf($box.global_transform, Color.GREEN)
+	DebugDraw3D.draw_gizmo($gizmo.global_transform)
+	DebugDraw3D.draw_grid_xf($gizmo/grid.global_transform, Vector2i(2,2), DebugDraw3D.empty_color, false)
+	DebugDraw3D.draw_sphere_xf($sphere.global_transform, Color.RED)
+	DebugDraw3D.draw_cylinder($cylinder.global_transform, Color.BLUE)
+	DebugDraw3D.draw_line_hit_offset($"line/1".global_transform.origin, $"line/2".global_transform.origin, true, 0.3, 0.1)

examples_dd3d/load_unload.gd

@@ -7,7 +7,7 @@ func _input(event: InputEvent) -> void:
 			if event.keycode == KEY_F3:
 				var n = Control.new()
 				get_tree().root.add_child(n)
-				DebugDraw.draw_aabb_ab(Vector3.ZERO, Vector3.ONE, Color.RED, 5.0)
+				DebugDraw3D.draw_aabb_ab(Vector3.ZERO, Vector3.ONE, Color.RED, 5.0)
 				get_tree().create_timer(2).timeout.connect(func(): n.queue_free())
 
 			if event.keycode == KEY_F4:

src/debug_draw_config_2d.cpp → src/2d/config_2d.cpp

@@ -1,8 +1,7 @@
-#include "debug_draw_config_2d.h"
-#include "utils.h"
+#include "config_2d.h"
+#include "utils/utils.h"
 
-#include "data_graphs.h"
-#include "debug_geometry_container.h"
+#include "graphs.h"
 #include "grouped_text.h"
 
 #include <limits.h>

src/debug_draw_config_2d.h → src/2d/config_2d.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "colors.h"
+#include "common/colors.h"
+#include "utils/compiler.h"
 
 GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/font.hpp>