diff --git a/addons/summer_day/data/blueprint/template_editables/tube.gd b/addons/summer_day/data/blueprint/template_editables/tube.gd index 9171739..a908eba 100644 --- a/addons/summer_day/data/blueprint/template_editables/tube.gd +++ b/addons/summer_day/data/blueprint/template_editables/tube.gd @@ -11,6 +11,10 @@ func _interact(event: InputEvent): # Virtual. pass +func update_table(): + pass # TODO: Do I even need this?! + + func _update_table(table: Image): # Virtual. pass diff --git a/addons/summer_day/data/document/document.gd b/addons/summer_day/data/document/document.gd index 64e71d2..f0d9cd0 100644 --- a/addons/summer_day/data/document/document.gd +++ b/addons/summer_day/data/document/document.gd @@ -4,7 +4,7 @@ class_name SummerDayDocument signal track_added(track) -signal track_deleted(track) +signal track_deleted(track) # Not used yet. Implement please. export(Resource) var scene = _scene_generation() diff --git a/addons/summer_day/data/document/track.gd b/addons/summer_day/data/document/track.gd index efaa973..f5c9d95 100644 --- a/addons/summer_day/data/document/track.gd +++ b/addons/summer_day/data/document/track.gd @@ -1,6 +1,6 @@ tool extends Resource -class_name SummerDayTrack +class_name SummerDayTrack # Don't mistake with SummerDaySceneTrack! export(Resource) var blueprint diff --git a/addons/summer_day/data/scene/scene.gd b/addons/summer_day/data/scene/scene.gd index bb622eb..c073fe4 100644 --- a/addons/summer_day/data/scene/scene.gd +++ b/addons/summer_day/data/scene/scene.gd @@ -7,6 +7,7 @@ signal aspect_ratio_changed(new_aspect_ratio) export(Vector2) var aspect_ratio = Vector2(16, 9) setget _set_aspect_ratio +export(Array, Resource) var tracks var raw_aspect_ratio setget , _get_raw_aspect_ratio diff --git a/addons/summer_day/data/scene/track.gd b/addons/summer_day/data/scene/track.gd new file mode 100644 index 0000000..7b13be4 --- /dev/null +++ b/addons/summer_day/data/scene/track.gd @@ -0,0 +1,7 @@ +tool +extends Resource +class_name SummerDaySceneTrack + + +export(PackedScene) var model +export(ImageTexture) var table diff --git a/addons/summer_day/user_interface/canvas/canvas.gd b/addons/summer_day/user_interface/canvas/canvas.gd index 8a5b53a..b593d08 100644 --- a/addons/summer_day/user_interface/canvas/canvas.gd +++ b/addons/summer_day/user_interface/canvas/canvas.gd @@ -3,6 +3,7 @@ extends PanelContainer class_name SummerDayCanvas onready var MeshContainer := $Render/RenderLayer/Container +onready var EditHints := $Render/ForegroundLayer/EditHints var document: SummerDayDocument var scene: SummerDayScene diff --git a/addons/summer_day/user_interface/canvas/canvas.tscn b/addons/summer_day/user_interface/canvas/canvas.tscn index b904005..6c27127 100644 --- a/addons/summer_day/user_interface/canvas/canvas.tscn +++ b/addons/summer_day/user_interface/canvas/canvas.tscn @@ -93,6 +93,8 @@ usage = 0 render_target_update_mode = 3 gui_disable_input = true +[node name="EditHints" type="ImmediateGeometry" parent="Render/ForegroundLayer"] + [node name="Label" type="Label" parent="Render"] margin_right = 40.0 margin_bottom = 14.0 diff --git a/addons/summer_day/user_interface/canvas/canvas_state.gd b/addons/summer_day/user_interface/canvas/canvas_state.gd index c82721f..140f5f1 100644 --- a/addons/summer_day/user_interface/canvas/canvas_state.gd +++ b/addons/summer_day/user_interface/canvas/canvas_state.gd @@ -1,4 +1,4 @@ -extends Resource +extends Reference class_name SummerDayCanvasState signal fill_transform_changed(fill_transform) diff --git a/production/blueprints/mannequin/mat.tres b/production/blueprints/mannequin/mat.tres index c4019e2..554be9f 100644 --- a/production/blueprints/mannequin/mat.tres +++ b/production/blueprints/mannequin/mat.tres @@ -55,5 +55,5 @@ void fragment() { [resource] shader = SubResource( 1 ) -shader_param/canvas_transform = Basis( 0.837104, 0, -0.573479, 0, -1.14486, 0.428697, 0, 0, 1 ) +shader_param/canvas_transform = Basis( 0.423164, 0.356665, -0.252057, 0.508395, -0.603185, -0.0647715, 0, 0, 1 ) shader_param/table = ExtResource( 1 ) diff --git a/production/test/scene_001.tres b/production/test/scene_001.tres index ec7cb1d..20dc5d9 100644 --- a/production/test/scene_001.tres +++ b/production/test/scene_001.tres @@ -5,3 +5,4 @@ [resource] script = ExtResource( 1 ) aspect_ratio = Vector2( 16, 9 ) +tracks = [ ] diff --git a/project.godot b/project.godot index a65b52d..9278cc5 100644 --- a/project.godot +++ b/project.godot @@ -49,7 +49,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/summer_day/user_interface/canvas/canvas.gd" }, { -"base": "Resource", +"base": "Reference", "class": "SummerDayCanvasState", "language": "GDScript", "path": "res://addons/summer_day/user_interface/canvas/canvas_state.gd" @@ -129,6 +129,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/summer_day/user_interface/resource_picker/scene_picker.gd" }, { +"base": "Resource", +"class": "SummerDaySceneTrack", +"language": "GDScript", +"path": "res://addons/summer_day/data/scene/track.gd" +}, { "base": "Control", "class": "SummerDayTimeline", "language": "GDScript", @@ -194,6 +199,7 @@ _global_script_class_icons={ "SummerDayScene": "", "SummerDaySceneFrame": "", "SummerDayScenePicker": "", +"SummerDaySceneTrack": "", "SummerDayTimeline": "", "SummerDayTool": "", "SummerDayToolContext": "", @@ -214,10 +220,6 @@ config/icon="res://icon.png" Util="res://addons/summer_day/utilities/math_helper.gd" -[editor_plugins] - -enabled=PoolStringArray( "res://addons/summer_day/plugin.cfg" ) - [gdnative] singletons=[ "res://addons/godot-git-plugin/git_api.gdnlib" ]