State before structure change.

This commit is contained in:
mono 2021-12-31 17:22:58 +01:00
parent 2aed1dc58b
commit feb61ee74c
11 changed files with 27 additions and 9 deletions

View File

@ -11,6 +11,10 @@ func _interact(event: InputEvent): # Virtual.
pass pass
func update_table():
pass # TODO: Do I even need this?!
func _update_table(table: Image): # Virtual. func _update_table(table: Image): # Virtual.
pass pass

View File

@ -4,7 +4,7 @@ class_name SummerDayDocument
signal track_added(track) signal track_added(track)
signal track_deleted(track) signal track_deleted(track) # Not used yet. Implement please.
export(Resource) var scene = _scene_generation() export(Resource) var scene = _scene_generation()

View File

@ -1,6 +1,6 @@
tool tool
extends Resource extends Resource
class_name SummerDayTrack class_name SummerDayTrack # Don't mistake with SummerDaySceneTrack!
export(Resource) var blueprint export(Resource) var blueprint

View File

@ -7,6 +7,7 @@ signal aspect_ratio_changed(new_aspect_ratio)
export(Vector2) var aspect_ratio = Vector2(16, 9) setget _set_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 var raw_aspect_ratio setget , _get_raw_aspect_ratio

View File

@ -0,0 +1,7 @@
tool
extends Resource
class_name SummerDaySceneTrack
export(PackedScene) var model
export(ImageTexture) var table

View File

@ -3,6 +3,7 @@ extends PanelContainer
class_name SummerDayCanvas class_name SummerDayCanvas
onready var MeshContainer := $Render/RenderLayer/Container onready var MeshContainer := $Render/RenderLayer/Container
onready var EditHints := $Render/ForegroundLayer/EditHints
var document: SummerDayDocument var document: SummerDayDocument
var scene: SummerDayScene var scene: SummerDayScene

View File

@ -93,6 +93,8 @@ usage = 0
render_target_update_mode = 3 render_target_update_mode = 3
gui_disable_input = true gui_disable_input = true
[node name="EditHints" type="ImmediateGeometry" parent="Render/ForegroundLayer"]
[node name="Label" type="Label" parent="Render"] [node name="Label" type="Label" parent="Render"]
margin_right = 40.0 margin_right = 40.0
margin_bottom = 14.0 margin_bottom = 14.0

View File

@ -1,4 +1,4 @@
extends Resource extends Reference
class_name SummerDayCanvasState class_name SummerDayCanvasState
signal fill_transform_changed(fill_transform) signal fill_transform_changed(fill_transform)

View File

@ -55,5 +55,5 @@ void fragment() {
[resource] [resource]
shader = SubResource( 1 ) 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 ) shader_param/table = ExtResource( 1 )

View File

@ -5,3 +5,4 @@
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
aspect_ratio = Vector2( 16, 9 ) aspect_ratio = Vector2( 16, 9 )
tracks = [ ]

View File

@ -49,7 +49,7 @@ _global_script_classes=[ {
"language": "GDScript", "language": "GDScript",
"path": "res://addons/summer_day/user_interface/canvas/canvas.gd" "path": "res://addons/summer_day/user_interface/canvas/canvas.gd"
}, { }, {
"base": "Resource", "base": "Reference",
"class": "SummerDayCanvasState", "class": "SummerDayCanvasState",
"language": "GDScript", "language": "GDScript",
"path": "res://addons/summer_day/user_interface/canvas/canvas_state.gd" "path": "res://addons/summer_day/user_interface/canvas/canvas_state.gd"
@ -129,6 +129,11 @@ _global_script_classes=[ {
"language": "GDScript", "language": "GDScript",
"path": "res://addons/summer_day/user_interface/resource_picker/scene_picker.gd" "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", "base": "Control",
"class": "SummerDayTimeline", "class": "SummerDayTimeline",
"language": "GDScript", "language": "GDScript",
@ -194,6 +199,7 @@ _global_script_class_icons={
"SummerDayScene": "", "SummerDayScene": "",
"SummerDaySceneFrame": "", "SummerDaySceneFrame": "",
"SummerDayScenePicker": "", "SummerDayScenePicker": "",
"SummerDaySceneTrack": "",
"SummerDayTimeline": "", "SummerDayTimeline": "",
"SummerDayTool": "", "SummerDayTool": "",
"SummerDayToolContext": "", "SummerDayToolContext": "",
@ -214,10 +220,6 @@ config/icon="res://icon.png"
Util="res://addons/summer_day/utilities/math_helper.gd" Util="res://addons/summer_day/utilities/math_helper.gd"
[editor_plugins]
enabled=PoolStringArray( "res://addons/summer_day/plugin.cfg" )
[gdnative] [gdnative]
singletons=[ "res://addons/godot-git-plugin/git_api.gdnlib" ] singletons=[ "res://addons/godot-git-plugin/git_api.gdnlib" ]