Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Intermediate Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Oberaigner committed Apr 24, 2024
1 parent 7e356b4 commit b5983cf
Show file tree
Hide file tree
Showing 39 changed files with 142 additions and 109 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="401e77d048b500d714375a77d4ca4326"
dest_md5="e5a412eda16e1d823e7edfffe7460b67"
dest_md5="3dd5c0136c49a94152e320f954261b2e"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="75a018507317f09d0004b8c1148dd3e5"
dest_md5="679d3767ce4f77408ad994917e598186"
dest_md5="17b170ffcc65bc4f70081e448257cb8f"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="b3f0e3061651d3bf5c65104a3179e57b"
dest_md5="f7aff71c2f9645f52c2212eb216dc6a5"
dest_md5="5a32fb564648217ac0c89272e6e5140e"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="418d6668afcddb7714104f43bfb39657"
dest_md5="833039e4737803291cf2a1b80ded72e8"
dest_md5="2285d871ce78dd567083103f4c89cc0d"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="696e70ec3151341523d0a1362670d8ad"
dest_md5="66128c4c7d6f88412784bff3d7ec6833"
dest_md5="01c280be7e21eeb9de24ab0dc8d54aac"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="15e9706fbc67b38db21e8e963fc1a6c0"
dest_md5="9d42ca86e45e35f527268a50ff3302c1"
dest_md5="39d0d078f220a4199c355494f828e34d"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="ace04e0c254883041bc7effb9d951cf2"
dest_md5="01bbdd6ea5ed5db11c72d6b8ddc09e57"
dest_md5="d30842060c67fa252449f2a2261dc412"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="03ef685b34f3356631c3f60c91917002"
dest_md5="49ab49592f43367f99e411b6beb096bf"
dest_md5="7d5ca5739cab625583e757a89311e37a"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="a39e5778312a715a82d7afe88ebac015"
dest_md5="2ff03d243427673442953485f72ee755"
dest_md5="485a5da882b11c299378bc9c94a16d16"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="9f56fb2bffbac7662cb53b783248698a"
dest_md5="4095d2e475b73f7e3cfa641bf08a58ee"
dest_md5="76e6ba40e3eb9766efa798435214eda7"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="40a68e931d9f1c543eac616acb53b2d8"
dest_md5="8227e06ec0fc86a3d61b098543bce7be"
dest_md5="0711b0b264cced887a896c6b362c5432"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="fb8c29136b1ee99fe9dd45a6f8bcc9fd"
dest_md5="e4bf8ae34f8a7fee963c13a5edb43c55"
dest_md5="0476ac6f1416d7e9a5f20c1d6194f9d9"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="6b13e81eab722af33d424ec5a589068e"
dest_md5="77e111b8cff5ee07c66010f63ca68801"
dest_md5="0e08e30ca3840f7c9c47e91820bd98bb"

2 changes: 1 addition & 1 deletion godot/src/script_editor/button_add.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ extends Button


func _on_pressed():
API.insert(200)
API.ast_add(200)
4 changes: 2 additions & 2 deletions godot/src/script_editor/main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Script" path="res://src/script_editor/button_run.gd" id="1_2l7lb"]
[ext_resource type="Script" path="res://src/script_editor/button_add.gd" id="2_vfewj"]
[ext_resource type="Script" path="res://src/script_editor/auto_refresh_fragments.gd" id="3_6u76r"]
[ext_resource type="Script" path="res://src/script_editor/auto_refresh_sprites.gd" id="3_po0h4"]

[node name="ScriptEditor" type="Control"]
layout_mode = 3
Expand Down Expand Up @@ -44,7 +44,7 @@ size_flags_vertical = 3

[node name="AutoRefresh" type="VBoxContainer" parent="VBoxContainer/VScrollContainer"]
layout_mode = 2
script = ExtResource("3_6u76r")
script = ExtResource("3_po0h4")

[node name="Code" type="VBoxContainer" parent="VBoxContainer/VScrollContainer/AutoRefresh"]
layout_mode = 2
Expand Down
13 changes: 0 additions & 13 deletions godot/src/sprite_selector/main.gd

This file was deleted.

37 changes: 18 additions & 19 deletions godot/src/sprite_selector/main.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://bs2465qtho3bu"]

[ext_resource type="Script" path="res://src/sprite_selector/main.gd" id="1_w6ncu"]
[ext_resource type="Script" path="res://src/sprite_selector/sprite_list.gd" id="2_y3h1p"]
[ext_resource type="Script" path="res://src/sprite_selector/button_add_sprite.gd" id="2_66054"]
[ext_resource type="Script" path="res://src/sprite_selector/auto_refresh_sprites.gd" id="2_wryc7"]

[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_kefq6"]

Expand All @@ -16,19 +16,6 @@ grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("1_w6ncu")

[node name="FileDialog" type="FileDialog" parent="."]
title = "Open a File"
size = Vector2i(479, 400)
exclusive = false
ok_button_text = "Open"
dialog_hide_on_ok = true
dialog_autowrap = true
file_mode = 0
access = 2
filters = PackedStringArray("*.png", "*.jpg", "*.jpeg", "*.svg")
use_native_dialog = true

[node name="VBoxContainer2" type="VBoxContainer" parent="."]
layout_direction = 2
Expand Down Expand Up @@ -63,6 +50,15 @@ size_flags_horizontal = 0
theme_override_styles/pressed = SubResource("StyleBoxEmpty_kefq6")
theme_override_styles/focus = SubResource("StyleBoxEmpty_s6hla")
text = "Add Sprite"
script = ExtResource("2_66054")

[node name="FileDialog" type="FileDialog" parent="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton"]
title = "Open a File"
size = Vector2i(511, 159)
ok_button_text = "Open"
file_mode = 0
access = 2
use_native_dialog = true

[node name="VBox" type="VBoxContainer" parent="VBoxContainer2"]
layout_mode = 2
Expand All @@ -72,11 +68,14 @@ size_flags_vertical = 3
layout_mode = 2
size_flags_vertical = 3

[node name="VBoxIntems" type="VBoxContainer" parent="VBoxContainer2/VBox/ScrollContainer"]
[node name="AutoRefresh" type="VBoxContainer" parent="VBoxContainer2/VBox/ScrollContainer"]
layout_mode = 2
script = ExtResource("2_wryc7")

[node name="VBoxIntems" type="VBoxContainer" parent="VBoxContainer2/VBox/ScrollContainer/AutoRefresh"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("2_y3h1p")

[connection signal="file_selected" from="FileDialog" to="." method="_on_file_dialog_file_selected"]
[connection signal="pressed" from="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton" to="." method="_on_add_sprite_button_pressed"]
[connection signal="pressed" from="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton" to="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton" method="_on_pressed"]
[connection signal="file_selected" from="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton/FileDialog" to="VBoxContainer2/HBoxContainer/MarginContainer/AddSpriteButton" method="_on_file_dialog_file_selected"]
1 change: 0 additions & 1 deletion godot/src/sprite_selector/sprite.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ func setup(path):
img.load(path)
var tex = ImageTexture.new()
tex.set_image(img)
var label = get_node("VBoxContainer/Label")
$VBoxContainer/TextureRect.texture = tex
$VBoxContainer/Label.text = path
self.expand_icon = true
Expand Down
12 changes: 0 additions & 12 deletions godot/src/sprite_selector/sprite_list.gd

This file was deleted.

52 changes: 26 additions & 26 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions rust/compiler/src/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ pub struct Commands {
commands: Vec<Statement>,
}

#[derive(Clone)]
#[derive(Clone, Debug)]
pub enum Statement {
Move(),
Message(Message),
Print(Expression),
}

#[allow(dead_code)]
#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct Message {
from: String,
to: String,
contents: Expression,
}

#[derive(Clone)]
#[derive(Clone, Debug)]
pub enum Expression {
Addition(Box<Expression>, Box<Expression>),
Subtraction(Box<Expression>, Box<Expression>),
Expand Down
2 changes: 1 addition & 1 deletion rust/compiler/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod ast;

#[derive(Default)]
#[derive(Default, Debug)]
pub struct Ast {
statements: Vec<ast::Statement>,
}
Expand Down
Loading

0 comments on commit b5983cf

Please sign in to comment.