From e8714a98fdb32dcf0479d1adef9c1446c6471ac0 Mon Sep 17 00:00:00 2001 From: Ronja Date: Thu, 18 Jan 2024 16:38:32 +0100 Subject: [PATCH] meta files and fixes (and other minor stuff I forgot about when I even did it) --- Luxe/assets/AdventureButtons.image.lx.meta.lx | 2 + Luxe/assets/AdventureButtons.png.meta.lx | 2 + Luxe/assets/folder.meta.lx | 2 + Luxe/assets/fonts/BabyBlocks.font.lx | 21 +- Luxe/assets/fonts/BabyBlocks.font.lx.meta.lx | 2 + Luxe/assets/fonts/BabyBlocksBigger.font.lx | 21 +- .../fonts/BabyBlocksBigger.font.lx.meta.lx | 2 + Luxe/assets/fonts/folder.meta.lx | 2 + Luxe/assets/fonts/src/BabyBlocks.face.lx | 3 + .../fonts/src/BabyBlocks.face.lx.meta.lx | 2 + Luxe/assets/fonts/src/BabyBlocks.ttf.meta.lx | 2 + .../assets/fonts/src/BabyBlocksBigger.face.lx | 3 + .../src/BabyBlocksBigger.face.lx.meta.lx | 2 + .../fonts/src/BabyBlocksBigger.ttf.meta.lx | 2 + Luxe/assets/fonts/src/folder.meta.lx | 2 + .../materials/WipButton.material.lx.meta.lx | 2 + Luxe/assets/materials/folder.meta.lx | 2 + Luxe/assets/names.lx.meta.lx | 2 + Luxe/assets/resources.lx.meta.lx | 2 + Luxe/assets/wip/8Arrow.image.lx.meta.lx | 2 + Luxe/assets/wip/8Arrow.png.meta.lx | 2 + Luxe/assets/wip/8Cross.image.lx.meta.lx | 2 + Luxe/assets/wip/8Cross.png.meta.lx | 2 + Luxe/assets/wip/8Head.image.lx.meta.lx | 2 + Luxe/assets/wip/8Head.png.meta.lx | 2 + .../wip/AdventureButtons.image.lx.meta.lx | 2 + Luxe/assets/wip/AdventureButtons.png.meta.lx | 2 + Luxe/assets/wip/Frame.image.lx.meta.lx | 2 + Luxe/assets/wip/Frame.png.meta.lx | 2 + Luxe/assets/wip/Human.image.lx.meta.lx | 2 + Luxe/assets/wip/Human.png.meta.lx | 2 + Luxe/assets/wip/Knob3.image.lx.meta.lx | 2 + Luxe/assets/wip/Knob3.png.meta.lx | 2 + Luxe/assets/wip/Needle.image.lx.meta.lx | 2 + Luxe/assets/wip/Needle.png.meta.lx | 2 + Luxe/assets/wip/Portrait.image.lx.meta.lx | 2 + Luxe/assets/wip/Portrait.png.meta.lx | 2 + Luxe/assets/wip/Room.image.lx.meta.lx | 2 + Luxe/assets/wip/Room.png.meta.lx | 2 + Luxe/assets/wip/SliderHandle.image.lx.meta.lx | 2 + Luxe/assets/wip/SliderHandle.png.meta.lx | 2 + Luxe/assets/wip/folder.meta.lx | 2 + Luxe/blocks/adventures.wren | 14 +- Luxe/blocks/adventures.wren.meta.lx | 2 + Luxe/blocks/debug.wren | 4 +- Luxe/blocks/debug.wren.meta.lx | 2 + Luxe/blocks/folder.meta.lx | 2 + Luxe/blocks/human.wren | 11 +- Luxe/blocks/human.wren.meta.lx | 2 + Luxe/blocks/human/folder.meta.lx | 2 + Luxe/blocks/human/human.modifier.lx.meta.lx | 2 + Luxe/blocks/human/human.modifier.wren.meta.lx | 2 + Luxe/blocks/human/human.wren.meta.lx | 2 + .../blocks/narrative/diary/diary.wren.meta.lx | 2 + Luxe/blocks/narrative/diary/folder.meta.lx | 2 + Luxe/blocks/narrative/folder.meta.lx | 2 + Luxe/blocks/narrative/progress/folder.meta.lx | 2 + .../narrative/progress/progress.wren.meta.lx | 2 + Luxe/blocks/narrative/time.wren.meta.lx | 2 + Luxe/blocks/resources.wren.meta.lx | 2 + Luxe/blocks/tooltip.wren | 12 +- Luxe/blocks/tooltip.wren.meta.lx | 2 + Luxe/blocks/ui/adventure.wren | 105 +++-- Luxe/blocks/ui/adventure.wren.meta.lx | 2 + Luxe/blocks/ui/box.wren.meta.lx | 2 + Luxe/blocks/ui/clickable.wren | 4 +- Luxe/blocks/ui/clickable.wren.meta.lx | 2 + Luxe/blocks/ui/compass.wren | 3 +- Luxe/blocks/ui/compass.wren.meta.lx | 2 + Luxe/blocks/ui/folder.meta.lx | 2 + Luxe/blocks/ui/image_util.wren.meta.lx | 2 + Luxe/blocks/ui/info.wren | 58 +-- Luxe/blocks/ui/info.wren.meta.lx | 2 + Luxe/blocks/ui/number_field.wren | 13 +- Luxe/blocks/ui/number_field.wren.meta.lx | 2 + Luxe/blocks/ui/scroll_box.wren | 27 +- Luxe/blocks/ui/scroll_box.wren.meta.lx | 2 + Luxe/blocks/ui/simple_text.wren | 3 +- Luxe/blocks/ui/simple_text.wren.meta.lx | 2 + Luxe/blocks/ui/slider.wren.meta.lx | 2 + Luxe/blocks/ui/ui.wren | 11 +- Luxe/blocks/ui/ui.wren.meta.lx | 2 + Luxe/game.wren | 2 +- Luxe/game.wren.meta.lx | 2 + Luxe/globals.wren.meta.lx | 2 + Luxe/log.1.txt | 189 +++++++++ Luxe/log.2.txt | 188 ++++++++ Luxe/log.3.txt | 192 +++++++++ Luxe/luxe.project/assets.lx | 400 ++++++++++++++++++ .../modules.lx} | 2 +- Luxe/luxe.project/version.lx | 1 + Luxe/math/event.wren | 6 +- Luxe/math/event.wren.meta.lx | 2 + Luxe/math/folder.meta.lx | 2 + Luxe/math/math.wren | 2 +- Luxe/math/math.wren.meta.lx | 2 + Luxe/math/observable.wren.meta.lx | 2 + Luxe/math/rect.wren.meta.lx | 2 + Luxe/math/repVal.wren.meta.lx | 2 + Luxe/math/stringUtil.wren.meta.lx | 2 + Luxe/math/time.wren | 2 +- Luxe/math/time.wren.meta.lx | 2 + Luxe/math/util.wren | 2 +- Luxe/math/util.wren.meta.lx | 2 + Luxe/math/vector.wren.meta.lx | 2 + Luxe/outline/app.wren.meta.lx | 2 + Luxe/outline/folder.meta.lx | 2 + Luxe/outline/inputs.input.lx.meta.lx | 2 + Luxe/outline/renderer.wren | 4 +- Luxe/outline/renderer.wren.meta.lx | 2 + Luxe/outline/settings.settings.lx.meta.lx | 2 + Luxe/project.luxe | 3 +- Luxe/shaders/clear.emsl.meta.lx | 2 + Luxe/shaders/folder.meta.lx | 2 + Luxe/shaders/pixel_text.emsl.meta.lx | 2 + Luxe/shaders/pixel_text.material_basis.lx | 16 +- .../pixel_text.material_basis.lx.meta.lx | 2 + Luxe/shaders/pixel_text_ui.emsl | 4 +- Luxe/shaders/pixel_text_ui.emsl.meta.lx | 2 + .../pixel_text_ui.material_basis.lx.meta.lx | 2 + ...lx => pixel_text_ui.material_basis.lx_uuu} | 258 +++++------ ...ixel_text_ui.material_basis.lx_uuu.meta.lx | 2 + Luxe/shaders/upscale.emsl.meta.lx | 2 + Luxe/shaders/wip_button.emsl.meta.lx | 2 + 124 files changed, 1473 insertions(+), 295 deletions(-) create mode 100644 Luxe/assets/AdventureButtons.image.lx.meta.lx create mode 100644 Luxe/assets/AdventureButtons.png.meta.lx create mode 100644 Luxe/assets/folder.meta.lx create mode 100644 Luxe/assets/fonts/BabyBlocks.font.lx.meta.lx create mode 100644 Luxe/assets/fonts/BabyBlocksBigger.font.lx.meta.lx create mode 100644 Luxe/assets/fonts/folder.meta.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocks.face.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocks.face.lx.meta.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocks.ttf.meta.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocksBigger.face.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocksBigger.face.lx.meta.lx create mode 100644 Luxe/assets/fonts/src/BabyBlocksBigger.ttf.meta.lx create mode 100644 Luxe/assets/fonts/src/folder.meta.lx create mode 100644 Luxe/assets/materials/WipButton.material.lx.meta.lx create mode 100644 Luxe/assets/materials/folder.meta.lx create mode 100644 Luxe/assets/names.lx.meta.lx create mode 100644 Luxe/assets/resources.lx.meta.lx create mode 100644 Luxe/assets/wip/8Arrow.image.lx.meta.lx create mode 100644 Luxe/assets/wip/8Arrow.png.meta.lx create mode 100644 Luxe/assets/wip/8Cross.image.lx.meta.lx create mode 100644 Luxe/assets/wip/8Cross.png.meta.lx create mode 100644 Luxe/assets/wip/8Head.image.lx.meta.lx create mode 100644 Luxe/assets/wip/8Head.png.meta.lx create mode 100644 Luxe/assets/wip/AdventureButtons.image.lx.meta.lx create mode 100644 Luxe/assets/wip/AdventureButtons.png.meta.lx create mode 100644 Luxe/assets/wip/Frame.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Frame.png.meta.lx create mode 100644 Luxe/assets/wip/Human.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Human.png.meta.lx create mode 100644 Luxe/assets/wip/Knob3.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Knob3.png.meta.lx create mode 100644 Luxe/assets/wip/Needle.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Needle.png.meta.lx create mode 100644 Luxe/assets/wip/Portrait.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Portrait.png.meta.lx create mode 100644 Luxe/assets/wip/Room.image.lx.meta.lx create mode 100644 Luxe/assets/wip/Room.png.meta.lx create mode 100644 Luxe/assets/wip/SliderHandle.image.lx.meta.lx create mode 100644 Luxe/assets/wip/SliderHandle.png.meta.lx create mode 100644 Luxe/assets/wip/folder.meta.lx create mode 100644 Luxe/blocks/adventures.wren.meta.lx create mode 100644 Luxe/blocks/debug.wren.meta.lx create mode 100644 Luxe/blocks/folder.meta.lx create mode 100644 Luxe/blocks/human.wren.meta.lx create mode 100644 Luxe/blocks/human/folder.meta.lx create mode 100644 Luxe/blocks/human/human.modifier.lx.meta.lx create mode 100644 Luxe/blocks/human/human.modifier.wren.meta.lx create mode 100644 Luxe/blocks/human/human.wren.meta.lx create mode 100644 Luxe/blocks/narrative/diary/diary.wren.meta.lx create mode 100644 Luxe/blocks/narrative/diary/folder.meta.lx create mode 100644 Luxe/blocks/narrative/folder.meta.lx create mode 100644 Luxe/blocks/narrative/progress/folder.meta.lx create mode 100644 Luxe/blocks/narrative/progress/progress.wren.meta.lx create mode 100644 Luxe/blocks/narrative/time.wren.meta.lx create mode 100644 Luxe/blocks/resources.wren.meta.lx create mode 100644 Luxe/blocks/tooltip.wren.meta.lx create mode 100644 Luxe/blocks/ui/adventure.wren.meta.lx create mode 100644 Luxe/blocks/ui/box.wren.meta.lx create mode 100644 Luxe/blocks/ui/clickable.wren.meta.lx create mode 100644 Luxe/blocks/ui/compass.wren.meta.lx create mode 100644 Luxe/blocks/ui/folder.meta.lx create mode 100644 Luxe/blocks/ui/image_util.wren.meta.lx create mode 100644 Luxe/blocks/ui/info.wren.meta.lx create mode 100644 Luxe/blocks/ui/number_field.wren.meta.lx create mode 100644 Luxe/blocks/ui/scroll_box.wren.meta.lx create mode 100644 Luxe/blocks/ui/simple_text.wren.meta.lx create mode 100644 Luxe/blocks/ui/slider.wren.meta.lx create mode 100644 Luxe/blocks/ui/ui.wren.meta.lx create mode 100644 Luxe/game.wren.meta.lx create mode 100644 Luxe/globals.wren.meta.lx create mode 100644 Luxe/log.1.txt create mode 100644 Luxe/log.2.txt create mode 100644 Luxe/log.3.txt create mode 100644 Luxe/luxe.project/assets.lx rename Luxe/{project.modules.lx => luxe.project/modules.lx} (54%) create mode 100644 Luxe/luxe.project/version.lx create mode 100644 Luxe/math/event.wren.meta.lx create mode 100644 Luxe/math/folder.meta.lx create mode 100644 Luxe/math/math.wren.meta.lx create mode 100644 Luxe/math/observable.wren.meta.lx create mode 100644 Luxe/math/rect.wren.meta.lx create mode 100644 Luxe/math/repVal.wren.meta.lx create mode 100644 Luxe/math/stringUtil.wren.meta.lx create mode 100644 Luxe/math/time.wren.meta.lx create mode 100644 Luxe/math/util.wren.meta.lx create mode 100644 Luxe/math/vector.wren.meta.lx create mode 100644 Luxe/outline/app.wren.meta.lx create mode 100644 Luxe/outline/folder.meta.lx create mode 100644 Luxe/outline/inputs.input.lx.meta.lx create mode 100644 Luxe/outline/renderer.wren.meta.lx create mode 100644 Luxe/outline/settings.settings.lx.meta.lx create mode 100644 Luxe/shaders/clear.emsl.meta.lx create mode 100644 Luxe/shaders/folder.meta.lx create mode 100644 Luxe/shaders/pixel_text.emsl.meta.lx create mode 100644 Luxe/shaders/pixel_text.material_basis.lx.meta.lx create mode 100644 Luxe/shaders/pixel_text_ui.emsl.meta.lx create mode 100644 Luxe/shaders/pixel_text_ui.material_basis.lx.meta.lx rename Luxe/shaders/{pixel_text_ui.material_basis.lx => pixel_text_ui.material_basis.lx_uuu} (96%) create mode 100644 Luxe/shaders/pixel_text_ui.material_basis.lx_uuu.meta.lx create mode 100644 Luxe/shaders/upscale.emsl.meta.lx create mode 100644 Luxe/shaders/wip_button.emsl.meta.lx diff --git a/Luxe/assets/AdventureButtons.image.lx.meta.lx b/Luxe/assets/AdventureButtons.image.lx.meta.lx new file mode 100644 index 0000000..eb65776 --- /dev/null +++ b/Luxe/assets/AdventureButtons.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "60cfbe89-ecb5-4c12-9fff-0d6f95768d2f" diff --git a/Luxe/assets/AdventureButtons.png.meta.lx b/Luxe/assets/AdventureButtons.png.meta.lx new file mode 100644 index 0000000..74d4a50 --- /dev/null +++ b/Luxe/assets/AdventureButtons.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "55453f56-790f-47da-bc78-1cdd37fb385c" diff --git a/Luxe/assets/folder.meta.lx b/Luxe/assets/folder.meta.lx new file mode 100644 index 0000000..07f97e3 --- /dev/null +++ b/Luxe/assets/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6878ae27-2e98-4b22-9376-c9b1e2706cb9" diff --git a/Luxe/assets/fonts/BabyBlocks.font.lx b/Luxe/assets/fonts/BabyBlocks.font.lx index 7860f10..23769c0 100644 --- a/Luxe/assets/fonts/BabyBlocks.font.lx +++ b/Luxe/assets/fonts/BabyBlocks.font.lx @@ -1,7 +1,14 @@ -font = { - source = "assets/fonts/src/BabyBlocks.ttf" - ranges = [ - "0020-007F" - "00A0-00FF" - ] -} \ No newline at end of file +font = { + face = "assets/fonts/src/BabyBlocks" + ranges = [ + { + id = "vA1wUK" + value = "0020-007F" + } + { + id = "0y2Yy6" + value = "00A0-00FF" + } + ] // ranges + source = "assets/fonts/src/BabyBlocks.ttf" +} // font diff --git a/Luxe/assets/fonts/BabyBlocks.font.lx.meta.lx b/Luxe/assets/fonts/BabyBlocks.font.lx.meta.lx new file mode 100644 index 0000000..6d5c4d3 --- /dev/null +++ b/Luxe/assets/fonts/BabyBlocks.font.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "069dad70-17b6-44cb-99b2-b08c62e9edae" diff --git a/Luxe/assets/fonts/BabyBlocksBigger.font.lx b/Luxe/assets/fonts/BabyBlocksBigger.font.lx index 08db481..e2b39c8 100644 --- a/Luxe/assets/fonts/BabyBlocksBigger.font.lx +++ b/Luxe/assets/fonts/BabyBlocksBigger.font.lx @@ -1,7 +1,14 @@ -font = { - source = "assets/fonts/src/BabyBlocksBigger.ttf" - ranges = [ - "0020-007F" - "00A0-00FF" - ] -} \ No newline at end of file +font = { + face = "assets/fonts/src/BabyBlocksBigger" + ranges = [ + { + id = "vA1wUK" + value = "0020-007F" + } + { + id = "0y2Yy6" + value = "00A0-00FF" + } + ] // ranges + source = "assets/fonts/src/BabyBlocksBigger.ttf" +} // font diff --git a/Luxe/assets/fonts/BabyBlocksBigger.font.lx.meta.lx b/Luxe/assets/fonts/BabyBlocksBigger.font.lx.meta.lx new file mode 100644 index 0000000..f3b165b --- /dev/null +++ b/Luxe/assets/fonts/BabyBlocksBigger.font.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f61a8386-bb8c-4ec8-a859-9f6be5ca4361" diff --git a/Luxe/assets/fonts/folder.meta.lx b/Luxe/assets/fonts/folder.meta.lx new file mode 100644 index 0000000..2d7d21e --- /dev/null +++ b/Luxe/assets/fonts/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "380b3f3e-b848-47f2-b353-fe6e7190d78d" diff --git a/Luxe/assets/fonts/src/BabyBlocks.face.lx b/Luxe/assets/fonts/src/BabyBlocks.face.lx new file mode 100644 index 0000000..1c7e240 --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocks.face.lx @@ -0,0 +1,3 @@ +face = { + source = "assets/fonts/src/BabyBlocks.ttf" +} // face diff --git a/Luxe/assets/fonts/src/BabyBlocks.face.lx.meta.lx b/Luxe/assets/fonts/src/BabyBlocks.face.lx.meta.lx new file mode 100644 index 0000000..9c53693 --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocks.face.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "4fadbc3b-32e0-409c-8cda-38c6eedbf2b6" diff --git a/Luxe/assets/fonts/src/BabyBlocks.ttf.meta.lx b/Luxe/assets/fonts/src/BabyBlocks.ttf.meta.lx new file mode 100644 index 0000000..7fc61f9 --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocks.ttf.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "196252cf-71d3-4371-9c0f-049bb7125fca" diff --git a/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx b/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx new file mode 100644 index 0000000..5777893 --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx @@ -0,0 +1,3 @@ +face = { + source = "assets/fonts/src/BabyBlocksBigger.ttf" +} // face diff --git a/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx.meta.lx b/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx.meta.lx new file mode 100644 index 0000000..7f8e1ef --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocksBigger.face.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "715511fb-d2e4-4519-8e7c-0efb24c77139" diff --git a/Luxe/assets/fonts/src/BabyBlocksBigger.ttf.meta.lx b/Luxe/assets/fonts/src/BabyBlocksBigger.ttf.meta.lx new file mode 100644 index 0000000..5af47a9 --- /dev/null +++ b/Luxe/assets/fonts/src/BabyBlocksBigger.ttf.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "15959cb5-596c-4601-aa13-fb16e128b677" diff --git a/Luxe/assets/fonts/src/folder.meta.lx b/Luxe/assets/fonts/src/folder.meta.lx new file mode 100644 index 0000000..c3d7696 --- /dev/null +++ b/Luxe/assets/fonts/src/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "7d4541b8-a388-4ee7-beb9-7ccb10157884" diff --git a/Luxe/assets/materials/WipButton.material.lx.meta.lx b/Luxe/assets/materials/WipButton.material.lx.meta.lx new file mode 100644 index 0000000..e499002 --- /dev/null +++ b/Luxe/assets/materials/WipButton.material.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "fa6098c9-43fe-45d7-8a9f-ffd0f5f461ca" diff --git a/Luxe/assets/materials/folder.meta.lx b/Luxe/assets/materials/folder.meta.lx new file mode 100644 index 0000000..a09ce6e --- /dev/null +++ b/Luxe/assets/materials/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "434f9a8d-9fe7-4fee-a2e9-9e48cd707812" diff --git a/Luxe/assets/names.lx.meta.lx b/Luxe/assets/names.lx.meta.lx new file mode 100644 index 0000000..5f164a7 --- /dev/null +++ b/Luxe/assets/names.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6de4d7e6-b74c-4cab-abde-58ff310cdf0d" diff --git a/Luxe/assets/resources.lx.meta.lx b/Luxe/assets/resources.lx.meta.lx new file mode 100644 index 0000000..95aee27 --- /dev/null +++ b/Luxe/assets/resources.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "56256a3d-452e-4b94-af1d-06a3e8e36b97" diff --git a/Luxe/assets/wip/8Arrow.image.lx.meta.lx b/Luxe/assets/wip/8Arrow.image.lx.meta.lx new file mode 100644 index 0000000..eea861d --- /dev/null +++ b/Luxe/assets/wip/8Arrow.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "ee9b4e04-aa71-4cbd-b5f2-5abfef8e0ac8" diff --git a/Luxe/assets/wip/8Arrow.png.meta.lx b/Luxe/assets/wip/8Arrow.png.meta.lx new file mode 100644 index 0000000..8b9116f --- /dev/null +++ b/Luxe/assets/wip/8Arrow.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "2a938d17-d2d0-48a1-b4b8-0f7ddf28deba" diff --git a/Luxe/assets/wip/8Cross.image.lx.meta.lx b/Luxe/assets/wip/8Cross.image.lx.meta.lx new file mode 100644 index 0000000..bb53467 --- /dev/null +++ b/Luxe/assets/wip/8Cross.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "95e47b5b-ce48-412f-8d1c-9dd22cac1d46" diff --git a/Luxe/assets/wip/8Cross.png.meta.lx b/Luxe/assets/wip/8Cross.png.meta.lx new file mode 100644 index 0000000..b0dcbfe --- /dev/null +++ b/Luxe/assets/wip/8Cross.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "e4aa1eed-ed86-43a9-b3fd-d3098abcb800" diff --git a/Luxe/assets/wip/8Head.image.lx.meta.lx b/Luxe/assets/wip/8Head.image.lx.meta.lx new file mode 100644 index 0000000..38f41d6 --- /dev/null +++ b/Luxe/assets/wip/8Head.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "553463a5-22e8-4eda-9f4d-b7270c5347a6" diff --git a/Luxe/assets/wip/8Head.png.meta.lx b/Luxe/assets/wip/8Head.png.meta.lx new file mode 100644 index 0000000..325cefa --- /dev/null +++ b/Luxe/assets/wip/8Head.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "a4f826d8-3219-43a4-9d7e-6aef0d283442" diff --git a/Luxe/assets/wip/AdventureButtons.image.lx.meta.lx b/Luxe/assets/wip/AdventureButtons.image.lx.meta.lx new file mode 100644 index 0000000..04b9b67 --- /dev/null +++ b/Luxe/assets/wip/AdventureButtons.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "43298db2-37ba-4624-8100-f2ab6b77b9c5" diff --git a/Luxe/assets/wip/AdventureButtons.png.meta.lx b/Luxe/assets/wip/AdventureButtons.png.meta.lx new file mode 100644 index 0000000..7a39fa3 --- /dev/null +++ b/Luxe/assets/wip/AdventureButtons.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6910ddda-c8e4-476c-9f78-968d83aca8a9" diff --git a/Luxe/assets/wip/Frame.image.lx.meta.lx b/Luxe/assets/wip/Frame.image.lx.meta.lx new file mode 100644 index 0000000..1009b84 --- /dev/null +++ b/Luxe/assets/wip/Frame.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "172a5d80-10c6-4a13-9746-42ac6c452503" diff --git a/Luxe/assets/wip/Frame.png.meta.lx b/Luxe/assets/wip/Frame.png.meta.lx new file mode 100644 index 0000000..f18af48 --- /dev/null +++ b/Luxe/assets/wip/Frame.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "51766136-9beb-4a4f-8e14-7906ce7f3ad6" diff --git a/Luxe/assets/wip/Human.image.lx.meta.lx b/Luxe/assets/wip/Human.image.lx.meta.lx new file mode 100644 index 0000000..4492d4c --- /dev/null +++ b/Luxe/assets/wip/Human.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f4679fb3-35c0-46fc-9dbe-a55f24c6ea58" diff --git a/Luxe/assets/wip/Human.png.meta.lx b/Luxe/assets/wip/Human.png.meta.lx new file mode 100644 index 0000000..241fb88 --- /dev/null +++ b/Luxe/assets/wip/Human.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "87147b86-b359-4778-8d18-94d3e9d87724" diff --git a/Luxe/assets/wip/Knob3.image.lx.meta.lx b/Luxe/assets/wip/Knob3.image.lx.meta.lx new file mode 100644 index 0000000..e5a679c --- /dev/null +++ b/Luxe/assets/wip/Knob3.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f2651ca6-2eb5-4211-8315-6cb323f50679" diff --git a/Luxe/assets/wip/Knob3.png.meta.lx b/Luxe/assets/wip/Knob3.png.meta.lx new file mode 100644 index 0000000..65978ee --- /dev/null +++ b/Luxe/assets/wip/Knob3.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "dbfbc81c-3a95-45af-911d-c8ab3f65b181" diff --git a/Luxe/assets/wip/Needle.image.lx.meta.lx b/Luxe/assets/wip/Needle.image.lx.meta.lx new file mode 100644 index 0000000..6500acc --- /dev/null +++ b/Luxe/assets/wip/Needle.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "8fc7c8a8-b02e-4b16-8402-f92ee1c11b51" diff --git a/Luxe/assets/wip/Needle.png.meta.lx b/Luxe/assets/wip/Needle.png.meta.lx new file mode 100644 index 0000000..f57faa2 --- /dev/null +++ b/Luxe/assets/wip/Needle.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "e51c5c5d-1d2b-4d81-9e37-cf3454d21cf9" diff --git a/Luxe/assets/wip/Portrait.image.lx.meta.lx b/Luxe/assets/wip/Portrait.image.lx.meta.lx new file mode 100644 index 0000000..466d896 --- /dev/null +++ b/Luxe/assets/wip/Portrait.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "d9b348e8-afcc-4d1a-a929-f4c7ae63e2d4" diff --git a/Luxe/assets/wip/Portrait.png.meta.lx b/Luxe/assets/wip/Portrait.png.meta.lx new file mode 100644 index 0000000..68764c7 --- /dev/null +++ b/Luxe/assets/wip/Portrait.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "68dbc3e9-9822-45b7-82a9-ad38251ea6ff" diff --git a/Luxe/assets/wip/Room.image.lx.meta.lx b/Luxe/assets/wip/Room.image.lx.meta.lx new file mode 100644 index 0000000..b3f70a6 --- /dev/null +++ b/Luxe/assets/wip/Room.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "77111f1b-6fa4-428b-a37a-9d231c359996" diff --git a/Luxe/assets/wip/Room.png.meta.lx b/Luxe/assets/wip/Room.png.meta.lx new file mode 100644 index 0000000..1bc30a5 --- /dev/null +++ b/Luxe/assets/wip/Room.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "3b1ce9ad-acb9-4133-982c-a84377f00f65" diff --git a/Luxe/assets/wip/SliderHandle.image.lx.meta.lx b/Luxe/assets/wip/SliderHandle.image.lx.meta.lx new file mode 100644 index 0000000..76bc7a9 --- /dev/null +++ b/Luxe/assets/wip/SliderHandle.image.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "52d4ed5c-32fa-44d6-866c-8ce36e647114" diff --git a/Luxe/assets/wip/SliderHandle.png.meta.lx b/Luxe/assets/wip/SliderHandle.png.meta.lx new file mode 100644 index 0000000..2ab9de1 --- /dev/null +++ b/Luxe/assets/wip/SliderHandle.png.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "b43bbae1-852e-4241-b018-ac8e5a8c860c" diff --git a/Luxe/assets/wip/folder.meta.lx b/Luxe/assets/wip/folder.meta.lx new file mode 100644 index 0000000..dee0f43 --- /dev/null +++ b/Luxe/assets/wip/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f2e6a438-0ba5-4dd1-bb04-cc1e7bea1628" diff --git a/Luxe/blocks/adventures.wren b/Luxe/blocks/adventures.wren index 17747cf..a4ac230 100644 --- a/Luxe/blocks/adventures.wren +++ b/Luxe/blocks/adventures.wren @@ -21,7 +21,7 @@ class AdventureManager{ } plan_new(){ - System.print("Start planning new Adventure") + Log.print("Start planning new Adventure") var adventure = Adventure.new() adventure.distance = 2 _planning.value = adventure @@ -31,19 +31,19 @@ class AdventureManager{ dispatch(){ var adventure = _planning.value if(!adventure){ - System.print("Tried to dispatch adventure, but none is planned") + Log.print("Tried to dispatch adventure, but none is planned") return } adventure.setup() adventure.adventurers.each{|human| - Human.set_active(human, false) + human.active = false if(_game.focus.value == human) _game.focus.value = null } adventure.resources.list().each{|resource| _game.resources.remove(resource["base_name"], resource["amount"]) } - System.print("Dispatching adventure \"%(adventure)\"") + Log.print("Dispatching adventure \"%(adventure)\"") _in_progress.add(adventure) _planning.value = null } @@ -55,9 +55,9 @@ class AdventureManager{ _game.resources.add(resource["base_name"], resource["amount"]) } adventure.adventurers.each{|adventurer| - Human.set_active(adventurer, true) + adventurer.active = true } - System.print("Adventure arrived \"%(adventure)\"") + Log.print("Adventure arrived \"%(adventure)\"") } tick(){ @@ -93,7 +93,7 @@ class Adventure{ distance=(dist){_distance = dist} toString{ - return "%(adventurers.map{|id| Human.get_name(id)}.toList)"+ + return "%(adventurers.map{|human| human.name}.toList)"+ " travelling %(distance)km towards %(StringUtil.direction(direction))"+ " with %(resources.list().map{|resource| "%(resource["amount"]) %(resource["name"])"}.toList)" } diff --git a/Luxe/blocks/adventures.wren.meta.lx b/Luxe/blocks/adventures.wren.meta.lx new file mode 100644 index 0000000..ea3185d --- /dev/null +++ b/Luxe/blocks/adventures.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "7697ba82-5ca1-42f4-acb0-fec4c2b366da" diff --git a/Luxe/blocks/debug.wren b/Luxe/blocks/debug.wren index c37c7b6..f7eb64f 100644 --- a/Luxe/blocks/debug.wren +++ b/Luxe/blocks/debug.wren @@ -53,11 +53,11 @@ class DrawDebug{ class Holder{ static x{ - System.print("%(__value) was taken from me") + Log.print("%(__value) was taken from me") return __value } static x=(val){ - System.print("I was given %(val)") + Log.print("I was given %(val)") __value = val } } \ No newline at end of file diff --git a/Luxe/blocks/debug.wren.meta.lx b/Luxe/blocks/debug.wren.meta.lx new file mode 100644 index 0000000..2d70d1e --- /dev/null +++ b/Luxe/blocks/debug.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "a4ba7441-c63d-4a0f-9e87-0a77eb7032f0" diff --git a/Luxe/blocks/folder.meta.lx b/Luxe/blocks/folder.meta.lx new file mode 100644 index 0000000..4acdc73 --- /dev/null +++ b/Luxe/blocks/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "5768bb59-9a12-45f2-90ea-76e03bd79900" diff --git a/Luxe/blocks/human.wren b/Luxe/blocks/human.wren index 3ea0c06..1a90a98 100644 --- a/Luxe/blocks/human.wren +++ b/Luxe/blocks/human.wren @@ -29,11 +29,12 @@ class Human{ name=(value){ _name = value } - adventure_count{_adventure_count} + adv_count{_adventure_count} entity{_entity} color=(value){ _color = value } + color{_color} construct new(){ _active = false @@ -73,18 +74,16 @@ class Human{ var over = Sprite.contains(entity, mouse.x, mouse.y) if(over && __hoverEnt != entity){ __hoverEnt = entity - Globals["Tooltip"].set(Strings.get(human.name), entity) + Globals["Tooltip"].set(human.name, entity) } if(!over && __hoverEnt == entity){ __hoverEnt = null Globals["Tooltip"].clear(entity) } - if(Input.mouse_state_pressed(MouseButton.left)){ + if(Input.mouse_state_pressed(MouseButton.left) && over){ var game = Globals["Game"] - if(__hoverEnt){ //remove if statement to allow clicking away (probably needs extra code to allow ui clicking) - game.focus.value = __hoverEnt - } + game.focus.value = human } } } diff --git a/Luxe/blocks/human.wren.meta.lx b/Luxe/blocks/human.wren.meta.lx new file mode 100644 index 0000000..1320296 --- /dev/null +++ b/Luxe/blocks/human.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "9990abd6-c8ca-4af0-9156-0b1863bf6212" diff --git a/Luxe/blocks/human/folder.meta.lx b/Luxe/blocks/human/folder.meta.lx new file mode 100644 index 0000000..173c2ec --- /dev/null +++ b/Luxe/blocks/human/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6db8cf77-8a99-4e90-a1ad-298e39e1178e" diff --git a/Luxe/blocks/human/human.modifier.lx.meta.lx b/Luxe/blocks/human/human.modifier.lx.meta.lx new file mode 100644 index 0000000..84515eb --- /dev/null +++ b/Luxe/blocks/human/human.modifier.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "7be66510-cd18-4d19-93da-2496aaf88e76" diff --git a/Luxe/blocks/human/human.modifier.wren.meta.lx b/Luxe/blocks/human/human.modifier.wren.meta.lx new file mode 100644 index 0000000..9f8afbd --- /dev/null +++ b/Luxe/blocks/human/human.modifier.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f18c71d8-3fed-4230-a75d-5bcfe5917937" diff --git a/Luxe/blocks/human/human.wren.meta.lx b/Luxe/blocks/human/human.wren.meta.lx new file mode 100644 index 0000000..0aa375b --- /dev/null +++ b/Luxe/blocks/human/human.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "67efcb83-8d5f-4612-acee-e6ffd98aafcd" diff --git a/Luxe/blocks/narrative/diary/diary.wren.meta.lx b/Luxe/blocks/narrative/diary/diary.wren.meta.lx new file mode 100644 index 0000000..e379414 --- /dev/null +++ b/Luxe/blocks/narrative/diary/diary.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f875cb4f-14b3-4bf2-82d6-fe4a80728352" diff --git a/Luxe/blocks/narrative/diary/folder.meta.lx b/Luxe/blocks/narrative/diary/folder.meta.lx new file mode 100644 index 0000000..35b2f9e --- /dev/null +++ b/Luxe/blocks/narrative/diary/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "c1fb0b00-2a29-408c-88f7-ea819c87d7fd" diff --git a/Luxe/blocks/narrative/folder.meta.lx b/Luxe/blocks/narrative/folder.meta.lx new file mode 100644 index 0000000..f963a5a --- /dev/null +++ b/Luxe/blocks/narrative/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "132ffbd3-e29c-4fb7-83eb-d8c974028c1c" diff --git a/Luxe/blocks/narrative/progress/folder.meta.lx b/Luxe/blocks/narrative/progress/folder.meta.lx new file mode 100644 index 0000000..78fcdce --- /dev/null +++ b/Luxe/blocks/narrative/progress/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "e639ebef-331c-4f19-ae6e-303050c9177c" diff --git a/Luxe/blocks/narrative/progress/progress.wren.meta.lx b/Luxe/blocks/narrative/progress/progress.wren.meta.lx new file mode 100644 index 0000000..ae8f056 --- /dev/null +++ b/Luxe/blocks/narrative/progress/progress.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "fac24071-24a1-4554-b20f-981e1664187c" diff --git a/Luxe/blocks/narrative/time.wren.meta.lx b/Luxe/blocks/narrative/time.wren.meta.lx new file mode 100644 index 0000000..cd66f14 --- /dev/null +++ b/Luxe/blocks/narrative/time.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "d7bd684e-a6b6-4242-a1b5-ad899cd31263" diff --git a/Luxe/blocks/resources.wren.meta.lx b/Luxe/blocks/resources.wren.meta.lx new file mode 100644 index 0000000..8ca3b43 --- /dev/null +++ b/Luxe/blocks/resources.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "846f1ffc-30c8-4385-b97b-162466cfcc51" diff --git a/Luxe/blocks/tooltip.wren b/Luxe/blocks/tooltip.wren index a21d31f..7da71a0 100644 --- a/Luxe/blocks/tooltip.wren +++ b/Luxe/blocks/tooltip.wren @@ -1,5 +1,6 @@ import "luxe: world" for Entity, Text, Transform import "luxe: assets" for Assets +import "luxe: asset" for Asset import "luxe: render" for Material import "luxe: math" for Math @@ -15,8 +16,11 @@ class Tooltip{ construct new(app){ _text = Entity.create(app.ui) - var mat = Material.create("shaders/pixel_text") - Text.create(_text, mat, 8, "assets/fonts/BabyBlocks", color) + var mat = Material.create("luxe: material_basis/ui_font") + Text.create(_text, mat, 8, Asset.font("assets/fonts/BabyBlocks"), color) + + //Text.create(b, Assets.material("luxe: material/font"), 25, "luxe : fonts/lato", [1, 1, 1, 1]) + //Text.set_text(b, "Play") Transform.create(_text) Transform.set_snap(_text, 1, 1, 0) @@ -25,8 +29,8 @@ class Tooltip{ _shadows = [] for(i in offsets){ var shadow = Entity.create(app.ui) - var mat = Material.create("shaders/pixel_text") - Text.create(shadow, mat, 8, "assets/fonts/BabyBlocks", background) + var mat = Material.create("luxe: material_basis/ui_font") + Text.create(shadow, mat, 8, Asset.font("assets/fonts/BabyBlocks"), background) Transform.create(shadow) Transform.set_snap(shadow, 1, 1, 0) _shadows.add(shadow) diff --git a/Luxe/blocks/tooltip.wren.meta.lx b/Luxe/blocks/tooltip.wren.meta.lx new file mode 100644 index 0000000..4681c5a --- /dev/null +++ b/Luxe/blocks/tooltip.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6373c429-6823-477b-8e6b-6d3c639aec48" diff --git a/Luxe/blocks/ui/adventure.wren b/Luxe/blocks/ui/adventure.wren index 376780e..f76e484 100644 --- a/Luxe/blocks/ui/adventure.wren +++ b/Luxe/blocks/ui/adventure.wren @@ -9,7 +9,7 @@ import "luxe: ui/control" for Control import "luxe: ui/image" for UIImage import "luxe: ui/label" for UILabel import "luxe: world" for Entity, Transform, UI, UIRenderMode, UIEvent -import "luxe: world" for UILayout, UILayoutBehave, UILayoutContain +import "luxe: world" for UIBehave, UIContain import "blocks/human/human" for Human import "blocks/ui/box" for UIBox @@ -77,9 +77,9 @@ class UiAdventure{ var list = Control.create(_ent) Control.child_add(_root, list) Control.set_size(list, 0, 16) - UILayout.set_behave(_ent, list, UILayoutBehave.left | UILayoutBehave.right | UILayoutBehave.bottom)//| - UILayout.set_margin(_ent, list, 0, 0, 0, 0) - UILayout.set_contain(_ent, list, UILayoutContain.row | UILayoutContain.start) //| + Control.set_behave(list, UIBehave.left | UIBehave.right | UIBehave.bottom)//| + Control.set_margin(list, 0, 0, 0, 0) + Control.set_contain(list, UIContain.row | UIContain.start) //| //toolbar icons _ui.list_button(list, [1, 0], "Info") {_ui.ui_mode = Ui.Info} @@ -93,9 +93,9 @@ class UiAdventure{ direction(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) - UILayout.set_contain(_ent, page, UILayoutContain.row | UILayoutContain.start) //| + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) + Control.set_contain(page, UIContain.row | UIContain.start) //| _page.on_change(true){|val| Control.set_visible(page, val == UiAdventure.direction) @@ -105,7 +105,7 @@ class UiAdventure{ var compass = UiCompass.create(_ent) Control.child_add(page, compass) Control.set_size(compass, 32, 32) - UILayout.set_margin(_ent, compass, 8, 0, 0, 0) + Control.set_margin(compass, 8, 0, 0, 0) var steps = 16 //compass steps adventure.on_change(true){|val| @@ -127,17 +127,17 @@ class UiAdventure{ var colParent = Control.create(_ent) Control.set_id(colParent, "dir col parent") Control.child_add(page, colParent) - UILayout.set_behave(_ent, colParent, UILayoutBehave.fill) - UILayout.set_margin(_ent, colParent, 8, 0, 0, 0) - UILayout.set_contain(_ent, colParent, UILayoutContain.column | UILayoutContain.start) //| + Control.set_behave(colParent, UIBehave.fill) + Control.set_margin(colParent, 8, 0, 0, 0) + Control.set_contain(colParent, UIContain.column | UIContain.start) //| //slider var slider = UiSlider.create(_ent) Control.set_id(slider, "dir dist slider") Control.child_add(colParent, slider) Control.set_size(slider, 0, 11) - UILayout.set_behave(_ent, slider, UILayoutBehave.left | UILayoutBehave.right) //| - UILayout.set_margin(_ent, slider, 4, 4, 4, 0) + Control.set_behave(slider, UIBehave.left | UIBehave.right) //| + Control.set_margin(slider, 4, 4, 4, 0) adventure.on_change(true){|val| if(val == null) return @@ -160,8 +160,8 @@ class UiAdventure{ UILabel.set_font(text, _ui.font) UILabel.set_text_size(text, 8) UILabel.set_align_vertical(text, TextAlign.top) - UILayout.set_behave(_ent, text, UILayoutBehave.left) //| - UILayout.set_margin(_ent, text, 4, 8, 4, 0) + Control.set_behave(text, UIBehave.left) //| + Control.set_margin(text, 4, 8, 4, 0) adventure.on_change(true) { |val| if(val == null) return @@ -175,8 +175,8 @@ class UiAdventure{ people(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiAdventure.people) @@ -195,8 +195,8 @@ class UiAdventure{ var list = UiScrollBox.create(_ent) Control.child_add(page, list) - UILayout.set_behave(_ent, list, UILayoutBehave.fill) - UILayout.set_margin(_ent, list, 40, 0, 0, 0) + Control.set_behave(list, UIBehave.fill) + Control.set_margin(list, 40, 0, 0, 0) var tiny_head = Assets.image("assets/wip/8Head") var x_image = Assets.image("assets/wip/8Cross") @@ -216,11 +216,11 @@ class UiAdventure{ planning.adventurers.each{ |adventurer| i = i + 1 var item = UIBox.create(_ent) - UILayout.set_behave(_ent, item, UILayoutBehave.left | UILayoutBehave.right)//| - UILayout.set_margin(_ent, item, 0, 0, 0, 0) - UILayout.set_contain(_ent, item, UILayoutContain.row | UILayoutContain.start)//| + Control.set_behave(item, UIBehave.left | UIBehave.right)//| + Control.set_margin(item, 0, 0, 0, 0) + Control.set_contain(item, UIContain.row | UIContain.start)//| Control.set_size(item, -1, 12) - Control.set_id(item, "Person %(i) : %(Human.get_name(adventurer))") + Control.set_id(item, "Person %(i) : %(adventurer.name)") Clickable.make_clickable(item) Clickable.set_on_click(item) { _ui.ui_mode = Ui.Info @@ -233,17 +233,17 @@ class UiAdventure{ Control.child_add(item, head) Control.set_size(head, 8, 8) UIImage.set_image(head, tiny_head) - UIImage.set_color(head, Human.get_color(adventurer)) - UILayout.set_margin(_ent, head, 2, 0, 0, 0) + UIImage.set_color(head, adventurer.color) + Control.set_margin(head, 2, 0, 0, 0) var name = UILabel.create(_ent) Control.child_add(item, name) UILabel.set_align_vertical(name, TextAlign.bottom) UILabel.set_font(name, _ui.font) UILabel.set_text_size(name, 8) - UILabel.set_text(name, Human.get_name(adventurer)) - UILayout.set_behave(_ent, name, UILayoutBehave.hfill | UILayoutBehave.left)//| - UILayout.set_margin(_ent, name, 2, 1, 0, 1) + UILabel.set_text(name, adventurer.name) + Control.set_behave(name, UIBehave.hfill | UIBehave.left)//| + Control.set_margin(name, 2, 1, 0, 1) var remove = UIImage.create(_ent) Clickable.make_clickable(remove) @@ -251,7 +251,7 @@ class UiAdventure{ Control.set_size(remove, 8, 8) UIImage.set_image(remove, x_image) UIImage.set_color(remove, Color.hex(0xec172a)) - UILayout.set_margin(_ent, remove, 0, 0, 2, 0) + Control.set_margin(remove, 0, 0, 2, 0) Clickable.set_tooltip(remove, "remove") Clickable.set_on_click(remove) { Frame.end{ @@ -263,7 +263,7 @@ class UiAdventure{ _adventurerListItems.add(item) } - UILayout.commit(_ent) + UI.commit(_ent) } } @@ -271,8 +271,8 @@ class UiAdventure{ resources(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiAdventure.resources) @@ -281,8 +281,8 @@ class UiAdventure{ var list = UiScrollBox.create(_ent) UiScrollBox.set_drag_cancelled(list, false) Control.child_add(page, list) - UILayout.set_behave(_ent, list, UILayoutBehave.fill) - UILayout.set_margin(_ent, list, 40, 0, 0, 0) + Control.set_behave(list, UIBehave.fill) + Control.set_margin(list, 40, 0, 0, 0) var x_image = Assets.image("assets/wip/8Cross") @@ -301,9 +301,9 @@ class UiAdventure{ //rebuild _game.resources.list().each{ |resource| var item = UIBox.create(_ent) - UILayout.set_behave(_ent, item, UILayoutBehave.left | UILayoutBehave.right)//| - UILayout.set_margin(_ent, item, 0, 0, 0, 0) - UILayout.set_contain(_ent, item, UILayoutContain.row | UILayoutContain.start)//| + Control.set_behave(item, UIBehave.left | UIBehave.right)//| + Control.set_margin(item, 0, 0, 0, 0) + Control.set_contain(item, UIContain.row | UIContain.start)//| Control.set_size(item, -1, 12) UiScrollBox.add(list, item) @@ -313,12 +313,12 @@ class UiAdventure{ UILabel.set_font(name, _ui.font) UILabel.set_text_size(name, 8) UILabel.set_text(name, "%(resource["name"])(%(resource["amount"]))") - UILayout.set_behave(_ent, name, UILayoutBehave.hfill | UILayoutBehave.left)//| - UILayout.set_margin(_ent, name, 2, 1, 0, 1) + Control.set_behave(name, UIBehave.hfill | UIBehave.left)//| + Control.set_margin(name, 2, 1, 0, 1) var amount = NumberField.create(_ent) NumberField.set_value(amount, adventure.resources.get(resource["name"])) - UILayout.set_margin(_ent, amount, 0, 1, 2, 1) + Control.set_margin(amount, 0, 1, 2, 1) Control.child_add(item, amount) //change resource data Control.set_events(amount){|event| @@ -334,7 +334,6 @@ class UiAdventure{ _itemEvents.add(token) _itemListItems.add(item) } - UILayout.commit(_ent) UI.commit(_ent) } } @@ -342,8 +341,8 @@ class UiAdventure{ depart(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiAdventure.depart) } @@ -355,8 +354,8 @@ class UiAdventure{ UILabel.set_font(ready, _ui.font) UILabel.set_text_size(ready, 16) UILabel.set_text(ready, "READY?") - UILayout.set_behave(_ent, ready, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, ready, 56, 8, 0, 0) + Control.set_behave(ready, UIBehave.left | UIBehave.top) //| + Control.set_margin(ready, 56, 8, 0, 0) var go = UILabel.create(_ent) Control.child_add(page, go) @@ -367,8 +366,8 @@ class UiAdventure{ UILabel.set_text(go, "GO") UILabel.set_color(go, [1,1,1,1]) UILabel.set_color_hover(go, [1,1,1,1]) - UILayout.set_behave(_ent, go, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, go, 56, 24, 0, 0) + Control.set_behave(go, UIBehave.left | UIBehave.top) //| + Control.set_margin(go, 56, 24, 0, 0) Clickable.make_clickable(go) Clickable.set_state_change(go){ |data, button| UILabel.set_text(go, data["hover"]?"GO!":"GO") @@ -381,8 +380,8 @@ class UiAdventure{ abort(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiAdventure.abort) } @@ -394,8 +393,8 @@ class UiAdventure{ UILabel.set_font(ready, _ui.font) UILabel.set_text_size(ready, 8) UILabel.set_text(ready, "This will discard the adventure") - UILayout.set_behave(_ent, ready, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, ready, 12, 0, 0, 0) + Control.set_behave(ready, UIBehave.left | UIBehave.top) //| + Control.set_margin(ready, 12, 0, 0, 0) UILabel.set_color(ready, [0.7, 0.7, 0.7, 1]) var abort = UILabel.create(_ent) @@ -408,8 +407,8 @@ class UiAdventure{ UILabel.set_text(abort, "ABORT") UILabel.set_color(abort, [1,1,1,1]) UILabel.set_color_hover(abort, [1,1,1,1]) - UILayout.set_behave(_ent, abort, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, abort, 25, 8, 0, 0) + Control.set_behave(abort, UIBehave.left | UIBehave.top) //| + Control.set_margin(abort, 25, 8, 0, 0) Clickable.make_clickable(abort) Clickable.set_state_change(abort){ |data, button| UILabel.set_text(abort, data["hover"]?"ABORT!":"ABORT") diff --git a/Luxe/blocks/ui/adventure.wren.meta.lx b/Luxe/blocks/ui/adventure.wren.meta.lx new file mode 100644 index 0000000..c9cdbb3 --- /dev/null +++ b/Luxe/blocks/ui/adventure.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f8ee9496-b2ef-468f-abb3-5751cc996110" diff --git a/Luxe/blocks/ui/box.wren.meta.lx b/Luxe/blocks/ui/box.wren.meta.lx new file mode 100644 index 0000000..4cde1d2 --- /dev/null +++ b/Luxe/blocks/ui/box.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "af9d2350-b0e9-486e-8127-93e5e89f7311" diff --git a/Luxe/blocks/ui/clickable.wren b/Luxe/blocks/ui/clickable.wren index 74e605c..ecaf99d 100644 --- a/Luxe/blocks/ui/clickable.wren +++ b/Luxe/blocks/ui/clickable.wren @@ -26,7 +26,7 @@ class Clickable{ "press_location": [0, 0], } newData.each{|val| - if(data.containsKey(val.key)) System.print("[warning] overriding key %(val.key)") + if(data.containsKey(val.key)) Log.print("[warning] overriding key %(val.key)") data[val.key] = val.value } Control.set_state_data(button, data) @@ -72,7 +72,7 @@ class Clickable{ } if(changed){ - //System.print(UIEvent.name(string_type) + " " + data["tooltip"]) + //Log.print(UIEvent.name(string_type) + " " + data["tooltip"]) var func = data["state_change"] if(func){ func.call(data, button) diff --git a/Luxe/blocks/ui/clickable.wren.meta.lx b/Luxe/blocks/ui/clickable.wren.meta.lx new file mode 100644 index 0000000..fe34333 --- /dev/null +++ b/Luxe/blocks/ui/clickable.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "ea875785-8cd5-413b-9318-393b35540aab" diff --git a/Luxe/blocks/ui/compass.wren b/Luxe/blocks/ui/compass.wren index b76ba19..3ea2315 100644 --- a/Luxe/blocks/ui/compass.wren +++ b/Luxe/blocks/ui/compass.wren @@ -2,6 +2,7 @@ import "luxe: ui/control" for Control import "luxe: world" for UI, World, UIEvent import "luxe: draw" for PathStyle import "luxe: assets" for Assets +import "luxe: asset" for Asset import "luxe: render" for Image import "luxe: math" for Math @@ -12,7 +13,7 @@ import "blocks/debug" for DrawDebug import "luxe: io" for IO class UiCompass{ - static font{"assets/fonts/BabyBlocks"} + static font{Asset.font("assets/fonts/BabyBlocks")} static size{8} static create(ent){ diff --git a/Luxe/blocks/ui/compass.wren.meta.lx b/Luxe/blocks/ui/compass.wren.meta.lx new file mode 100644 index 0000000..f224b1e --- /dev/null +++ b/Luxe/blocks/ui/compass.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "bf0dcdb1-7199-4dde-a888-356b28f9bec8" diff --git a/Luxe/blocks/ui/folder.meta.lx b/Luxe/blocks/ui/folder.meta.lx new file mode 100644 index 0000000..369fd40 --- /dev/null +++ b/Luxe/blocks/ui/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "cd6a4018-b635-478f-abd9-c9faabf00fd1" diff --git a/Luxe/blocks/ui/image_util.wren.meta.lx b/Luxe/blocks/ui/image_util.wren.meta.lx new file mode 100644 index 0000000..5f565e0 --- /dev/null +++ b/Luxe/blocks/ui/image_util.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "47813f38-c0f3-407f-b1f4-27f03b2cd943" diff --git a/Luxe/blocks/ui/info.wren b/Luxe/blocks/ui/info.wren index 042871b..20a5024 100644 --- a/Luxe/blocks/ui/info.wren +++ b/Luxe/blocks/ui/info.wren @@ -1,6 +1,6 @@ import "luxe: draw" for Draw, PathStyle import "luxe: world" for Entity, Transform, UI, UIRenderMode -import "luxe: world" for UILayout, UILayoutBehave, UILayoutContain +import "luxe: world" for UIBehave, UIContain import "luxe: ui/control" for Control import "luxe: ui/panel" for UIPanel import "luxe: ui/list" for UIList @@ -50,8 +50,8 @@ class UiInfo{ var ui_rect = Globals["UiRect"] _root = Control.create(_ent) - UILayout.set_behave(_ent, _root, UILayoutBehave.fill) - UILayout.set_margin(_ent, _root, 0, 0, 0, 0) + Control.set_behave(_root, UIBehave.fill) + Control.set_margin(_root, 0, 0, 0, 0) toolbar() human() @@ -67,9 +67,9 @@ class UiInfo{ Control.set_id(list, "info list") Control.child_add(_root, list) //make list span bottom area - UILayout.set_behave(_ent, list, UILayoutBehave.left | UILayoutBehave.right | UILayoutBehave.bottom) //| - UILayout.set_margin(_ent, list, 0, 0, 0, 0) - UILayout.set_contain(_ent, list, UILayoutContain.row | UILayoutContain.start) //| + Control.set_behave(list, UIBehave.left | UIBehave.right | UIBehave.bottom) //| + Control.set_margin(list, 0, 0, 0, 0) + Control.set_contain(list, UIContain.row | UIContain.start) //| Control.set_size(list, 16, 16) var adventureButtons = Assets.image("assets/AdventureButtons") @@ -89,8 +89,8 @@ class UiInfo{ human(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiInfo.human) @@ -100,8 +100,8 @@ class UiInfo{ Control.set_size(portrait, 30, 46) Control.set_id(portrait, "person info portrait") Control.child_add(page, portrait) - UILayout.set_behave(_ent, portrait, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, portrait, 1, 1, 0, 0) + Control.set_behave(portrait, UIBehave.left | UIBehave.top) //| + Control.set_margin(portrait, 1, 1, 0, 0) var frame = UIImage.create(_ent) UIImage.set_image(frame, Assets.image("assets/wip/Frame")) @@ -110,31 +110,31 @@ class UiInfo{ Control.set_id(frame, "person info frame") Control.child_add(portrait, frame) - _game.focus.on_change(true) {|val| + _game.focus.on_change(true) {|human| //todo: more sophisticated portrait generation UIImage.set_image(portrait, Assets.image("assets/wip/Portrait")) - UIImage.set_color(portrait, Human.get_color(val) || [0, 0, 0, 1]) + UIImage.set_color(portrait, human ? human.color : [0, 0, 0, 1]) } var statBlock = Control.create(_ent) Control.child_add(page, statBlock) - UILayout.set_behave(_ent, statBlock, UILayoutBehave.fill) - UILayout.set_margin(_ent, statBlock, 33, 1, 0, 16) - UILayout.set_contain(_ent, statBlock, UILayoutContain.column | UILayoutContain.start) //| + Control.set_behave(statBlock, UIBehave.fill) + Control.set_margin(statBlock, 33, 1, 0, 16) + Control.set_contain(statBlock, UIContain.column | UIContain.start) //| var name = UISimpleText.create(_ent) Control.child_add(statBlock, name) Control.set_id(name, "human name info") - _game.focus.on_change(true) {|val| - var name_string = Human.get_name(val) || "-" + _game.focus.on_change(true) {|human| + var name_string = human ? human.name : "-" UISimpleText.set_text(name, name_string) } var adventures = UISimpleText.create(_ent) Control.child_add(statBlock, adventures) Control.set_id(name, "human adventure count") - _game.focus.on_change(true) {|val| - var count = Human.get_adventure_count(val) + _game.focus.on_change(true) {|human| + var count = human ? human.adv_count : null var text = count ? "Adventures: %(count)" : "" UISimpleText.set_text(adventures, text) } @@ -143,8 +143,8 @@ class UiInfo{ diary(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiInfo.diary) @@ -153,10 +153,10 @@ class UiInfo{ var title = UISimpleText.create(_ent) Control.child_add(page, title) Control.set_id(title, "human name info") - UILayout.set_behave(_ent, title, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, title, 1, 1, 0, 0) - _game.focus.on_change(true) {|val| - var name = Human.get_name(val) + Control.set_behave(title, UIBehave.left | UIBehave.top) //| + Control.set_margin(title, 1, 1, 0, 0) + _game.focus.on_change(true) {|human| + var name = human ? human.name : null var diary_title = name ? "%(StringUtil.possesive(name)) Diary" : "Diary" UISimpleText.set_text(title, diary_title) } @@ -165,8 +165,8 @@ class UiInfo{ resources(){ var page = Control.create(_ent) Control.child_add(_root, page) - UILayout.set_behave(_ent, page, UILayoutBehave.fill) - UILayout.set_margin(_ent, page, 0, 0, 0, 16) + Control.set_behave(page, UIBehave.fill) + Control.set_margin(page, 0, 0, 0, 16) _page.on_change(true){|val| Control.set_visible(page, val == UiInfo.resources) @@ -174,8 +174,8 @@ class UiInfo{ var resList = UISimpleText.create(_ent) Control.child_add(page, resList) - UILayout.set_behave(_ent, resList, UILayoutBehave.left | UILayoutBehave.top) //| - UILayout.set_margin(_ent, resList, 7, 3, 0, 0) + Control.set_behave(resList, UIBehave.left | UIBehave.top) //| + Control.set_margin(resList, 7, 3, 0, 0) _game.resources.on_change{|val| var resources = val.list() var text = resources.map{|res| "%(res["name"]): %(res["amount"])"}.join("\n") diff --git a/Luxe/blocks/ui/info.wren.meta.lx b/Luxe/blocks/ui/info.wren.meta.lx new file mode 100644 index 0000000..a42e564 --- /dev/null +++ b/Luxe/blocks/ui/info.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "52e16cee-2246-482b-8fe3-384c85678b7b" diff --git a/Luxe/blocks/ui/number_field.wren b/Luxe/blocks/ui/number_field.wren index b491393..57eae70 100644 --- a/Luxe/blocks/ui/number_field.wren +++ b/Luxe/blocks/ui/number_field.wren @@ -2,8 +2,9 @@ import "luxe: ui/label" for UILabel import "luxe: ui/control" for Control import "luxe: ui/image" for UIImage import "luxe: render" for TextAlign -import "luxe: world" for UILayout, UILayoutContain, UIEvent, UI +import "luxe: world" for UIBehave, UIContain, UI, UIEvent import "luxe: assets" for Assets +import "luxe: asset" for Asset import "math/util" for Util import "blocks/ui/box" for UIBox @@ -13,7 +14,7 @@ class NumberField{ static create(ent){ var root = Control.create(ent) - UILayout.set_contain(ent, root, UILayoutContain.row | UILayoutContain.start)//| + Control.set_contain(root, UIContain.row | UIContain.start)//| Control.set_size(root, 27, 10) var arrow = Assets.image("assets/wip/8Arrow") @@ -22,7 +23,7 @@ class NumberField{ UIImage.set_image(leftArrow, arrow) Control.set_size(leftArrow, 8, 8) Control.child_add(root, leftArrow) - UILayout.set_margin(ent, leftArrow, -1, 0, 0, 0) + Control.set_margin(leftArrow, -1, 0, 0, 0) Clickable.make_clickable(leftArrow) Clickable.set_on_click(leftArrow){ var data = Control.get_state_data(root) @@ -34,16 +35,16 @@ class NumberField{ Control.set_size(label, 12, 10) UILabel.set_align_vertical(label, TextAlign.bottom) UILabel.set_align(label, TextAlign.center) - UILabel.set_font(label, "assets/fonts/BabyBlocks") + UILabel.set_font(label, Asset.font("assets/fonts/BabyBlocks")) UILabel.set_text_size(label, 8) UILabel.set_text(label, "0") - UILayout.set_margin(ent, label, 1, 0, 0, 0) + Control.set_margin(label, 1, 0, 0, 0) var rightArrow = UIImage.create(ent) UIImage.set_image(rightArrow, arrow) Control.set_size(rightArrow, 8, 8) Control.child_add(root, rightArrow) - UILayout.set_margin(ent, rightArrow, 0, 0, 0, 0) + Control.set_margin(rightArrow, 0, 0, 0, 0) UIImage.set_uv(rightArrow, 1, 0, 0, 1) Clickable.make_clickable(rightArrow) Clickable.set_on_click(rightArrow){ diff --git a/Luxe/blocks/ui/number_field.wren.meta.lx b/Luxe/blocks/ui/number_field.wren.meta.lx new file mode 100644 index 0000000..5489cfa --- /dev/null +++ b/Luxe/blocks/ui/number_field.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "a030818e-33e8-4e8a-9cba-20525372e74e" diff --git a/Luxe/blocks/ui/scroll_box.wren b/Luxe/blocks/ui/scroll_box.wren index 4e94ccb..2b2f04b 100644 --- a/Luxe/blocks/ui/scroll_box.wren +++ b/Luxe/blocks/ui/scroll_box.wren @@ -1,5 +1,6 @@ import "luxe: ui/control" for Control -import "luxe: world" for UI, World, UIEvent, UILayout, UILayoutContain, UILayoutBehave +import "luxe: ui" for UIContain, UIBehave +import "luxe: world" for UI, World, UIEvent import "luxe: draw" for PathStyle import "luxe: assets" for Assets import "luxe: render" for Image @@ -31,8 +32,8 @@ class UiScrollBox{ UiSlider.set_handle(slider, Assets.image("assets/wip/Knob3")) UiSlider.set_value(slider, 0) Control.set_size(slider, 7, -1) - UILayout.set_behave(ent, slider, UILayoutBehave.right | UILayoutBehave.vfill) //| - UILayout.set_margin(ent, slider, 0, 0, 0, 0) + Control.set_behave(slider, UIBehave.right | UIBehave.vfill) //| + Control.set_margin(slider, 0, 0, 0, 0) Control.set_events(slider){|event| if(event.type == UIEvent.change){ var position = 0 @@ -47,10 +48,10 @@ class UiScrollBox{ var childContainer = Control.create(ent) Control.child_add(box, childContainer) - UILayout.set_behave(ent, childContainer, UILayoutBehave.fill) - UILayout.set_margin(ent, childContainer, 1, 1, 7, 2) //don't include border, fix bottom bug, freedom to side slider + Control.set_behave(childContainer, UIBehave.fill) + Control.set_margin(childContainer, 1, 1, 7, 2) //don't include border, fix bottom bug, freedom to side slider Control.set_clip(childContainer, true) - UILayout.set_contain(ent, childContainer, UILayoutContain.column | UILayoutContain.start) //| + Control.set_contain(childContainer, UIContain.column | UIContain.start) //| Control.set_allow_input(childContainer, true) Control.set_events(childContainer){ |event| if(!Util.valid_event(event, state["drag_cancelled"])) return @@ -74,8 +75,8 @@ class UiScrollBox{ var alignmentChild = Control.create(ent) Control.child_add(childContainer, alignmentChild) Control.set_size(alignmentChild, -1, 0) - UILayout.set_behave(ent, alignmentChild, UILayoutBehave.hfill | UILayoutBehave.top) //| //make it wide - UILayout.set_margin(ent, alignmentChild, 0, state["position"], 0, 0) //pos will always be 0 here, but writing it explicitly makes intent clearer + Control.set_behave(alignmentChild, UIBehave.hfill | UIBehave.top) //| //make it wide + Control.set_margin(alignmentChild, 0, state["position"], 0, 0) //pos will always be 0 here, but writing it explicitly makes intent clearer state["alignmentChild"] = alignmentChild Control.set_render(box) {|control, state, x, y, w, h| @@ -112,7 +113,7 @@ class UiScrollBox{ var state = Control.get_state_data(box) Control.child_add(state["childContainer"], child) var ent = state["ent"] - UILayout.commit(ent) + UI.commit(ent) update_content(box) } @@ -121,7 +122,7 @@ class UiScrollBox{ var state = Control.get_state_data(box) Control.child_remove(state["childContainer"], child) var ent = state["ent"] - UILayout.commit(ent) + UI.commit(ent) update_content(box) } @@ -158,12 +159,12 @@ class UiScrollBox{ var state = Control.get_state_data(box) state["position"] = position var ent = state["ent"] - UILayout.set_margin(ent, state["alignmentChild"], 0, position, 0, 0) + Control.set_margin(state["alignmentChild"], 0, position, 0, 0) if(!delay_commit){ - UILayout.commit(ent) + } else { Frame.end{ - UILayout.commit(ent) + } } var rel_pos = 0 diff --git a/Luxe/blocks/ui/scroll_box.wren.meta.lx b/Luxe/blocks/ui/scroll_box.wren.meta.lx new file mode 100644 index 0000000..fca0d66 --- /dev/null +++ b/Luxe/blocks/ui/scroll_box.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "7df74b03-249b-42b0-b8e1-a2310e9dd45e" diff --git a/Luxe/blocks/ui/simple_text.wren b/Luxe/blocks/ui/simple_text.wren index 5864c50..540fcb7 100644 --- a/Luxe/blocks/ui/simple_text.wren +++ b/Luxe/blocks/ui/simple_text.wren @@ -1,9 +1,10 @@ import "luxe: ui/control" for Control import "luxe: world" for UI import "luxe: render" for TextAlign +import "luxe: asset" for Asset class UISimpleText{ - static font{"assets/fonts/BabyBlocks"} + static font{Asset.font("assets/fonts/BabyBlocks")} static size{8} static create(ent){ diff --git a/Luxe/blocks/ui/simple_text.wren.meta.lx b/Luxe/blocks/ui/simple_text.wren.meta.lx new file mode 100644 index 0000000..40f417b --- /dev/null +++ b/Luxe/blocks/ui/simple_text.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f7466cf5-5176-4c04-986b-9ffe7c934b7f" diff --git a/Luxe/blocks/ui/slider.wren.meta.lx b/Luxe/blocks/ui/slider.wren.meta.lx new file mode 100644 index 0000000..8a2b909 --- /dev/null +++ b/Luxe/blocks/ui/slider.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "c50e9890-e65f-4295-a593-dd56822f05cd" diff --git a/Luxe/blocks/ui/ui.wren b/Luxe/blocks/ui/ui.wren index 08339b2..11481e1 100644 --- a/Luxe/blocks/ui/ui.wren +++ b/Luxe/blocks/ui/ui.wren @@ -1,12 +1,13 @@ import "luxe: draw" for Draw, PathStyle import "luxe: world" for Entity, Transform, UI, UIRenderMode -import "luxe: world" for UILayout, UILayoutBehave, UILayoutContain +import "luxe: world" for UIBehave, UIContain import "luxe: ui/control" for Control import "luxe: ui/panel" for UIPanel import "luxe: ui/list" for UIList import "luxe: ui/button" for UIButton import "luxe: ui/image" for UIImage import "luxe: assets" for Assets +import "luxe: asset" for Asset import "luxe: ui/text" for UIText import "luxe: render" for Material @@ -20,7 +21,7 @@ class Ui{ static Planning{"planning"} static Info {"info"} - font{"assets/fonts/BabyBlocks"} + font{Asset.font("assets/fonts/BabyBlocks")} ui_mode{_ui_mode.value} ui_mode=(v){_ui_mode.value = v} @@ -39,9 +40,7 @@ class Ui{ UI.create(_ent, ui_rect.x, ui_rect.y, ui_rect.width, ui_rect.height, 0, app.ui_camera) UI.set_render_mode(_ent, UIRenderMode.world) - UI.set_material_basis(_ent, "luxe: material_basis/ui_solid", "shaders/pixel_text_ui") - - UILayout.create(_ent) + //UI.set_material_basis(_ent, "luxe: material_basis/ui_solid", "shaders/pixel_text_ui") _info = UiInfo.new(_ent, this) _planning = UiAdventure.new(_ent, this) @@ -53,7 +52,7 @@ class Ui{ } UI.commit(_ent) - UILayout.commit(_ent) + } list_button(parent){ diff --git a/Luxe/blocks/ui/ui.wren.meta.lx b/Luxe/blocks/ui/ui.wren.meta.lx new file mode 100644 index 0000000..c000f2a --- /dev/null +++ b/Luxe/blocks/ui/ui.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "a92e79e3-54bc-441b-b28f-2bbfec9480d3" diff --git a/Luxe/game.wren b/Luxe/game.wren index d852919..e95a3cc 100644 --- a/Luxe/game.wren +++ b/Luxe/game.wren @@ -67,7 +67,7 @@ class Game is Ready { } //tick destroy() { - System.print("unready!") + Log.print("unready!") app.destroy() } //destroy diff --git a/Luxe/game.wren.meta.lx b/Luxe/game.wren.meta.lx new file mode 100644 index 0000000..2e836d5 --- /dev/null +++ b/Luxe/game.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "5c64d986-79db-4c89-bd65-51a854998cb9" diff --git a/Luxe/globals.wren.meta.lx b/Luxe/globals.wren.meta.lx new file mode 100644 index 0000000..38d6be7 --- /dev/null +++ b/Luxe/globals.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "36a1efaf-b047-4ce1-b0f2-0bedb0e1cd2d" diff --git a/Luxe/log.1.txt b/Luxe/log.1.txt new file mode 100644 index 0000000..793f628 --- /dev/null +++ b/Luxe/log.1.txt @@ -0,0 +1,189 @@ +luxe / Engine / Sun Mar 20 20:40:07 2022 +luxe / Engine / path is `d:/gamedev/Cabin/Luxe` +luxe / script / profiler / enabled false +luxe / Engine / 2022.0.5 +luxe / Engine / dev mode +luxe / paths / root / located at `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe` +luxe / paths / modules / located at `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules` +luxe / dev / project / runtime version specified as `dev` +luxe / dev / project / runtime dev version `2022.0.5` - luxe @ c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev +luxe / API / 2022.0.5 +luxe / Runtime / 2022.0.5 +luxe / project / requested `luxe` @ `2022.0.5` not found... checking for `dev` match +luxe / project / found `luxe` @ `dev` with matching version `2022.0.5` so using that! +luxe / project / syncing dependency / `luxe` @ `2022.0.5` => `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev` +luxe / dev / parcel / adding dependency assets and units +luxe / dev / parcel / adding dependency `luxe` @ `2022.0.5` +luxe / dev / parcel / - adding scripts from `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev/api` +luxe / dev / parcel / - adding assets from `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev/assets` +luxe / dev / images / adding unreferenced sources... +luxe / dev / parcel / entry parcel generated in 14.69839998753741ms +luxe / dev / compiler / compiling dev content to `.luxe/` ... +luxe / dev / compiler / luxe runtime `2022.0.5` at path `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev` ... + + atlas - 0 found + + modifier - 1 found + + mesh - 0 found + + block - 0 found + + skeleton - 0 found + + shaders - 6 found + + settings - 1 found + - `.luxe/entry.settings.lx` > `.luxe/.luxe/entry.settings.lx.814a19b5` + + render - 1 found + + tiles - 0 found + + font - 3 found + + anim - 0 found + + scene - 0 found + + material_basis - 16 found + + prototype - 0 found + + material - 9 found + + physics - 2 found + + script - 153 found + + material_input - 0 found + + image - 15 found + + input - 1 found + + ui - 29 found +luxe / dev / data compile times: + - / modifier / spent `4.8575ms` + - / shaders / spent `5.7522ms` + - / font / spent `1.98ms` + - / material / spent `2.9183ms` + - / physics / spent `0.384ms` + - / material_basis / spent `4.1671ms` + - / settings / spent `1.1449ms` + - / script / spent `192.3409ms` + - / image / spent `6.4018ms` + - / input / spent `0.6689ms` + - / render / spent `0.5143ms` + - / ui / spent `3.9408ms` +luxe / dev / compiler / compile completed | `237 assets` | `242.9800000390969ms` +luxe / dev / build / success +luxe / project / info: + - name: `Cabin Game` + - path: `d:/gamedev/Cabin/Luxe/project.luxe` + - version: `0.0.1` + - package: `com.luxeengine.game` + - entry: `game` + - renderer: `outline/renderer` + - settings: `outline/settings` + - depends: + - luxe @ 2022.0.5 + +luxe / sdl / 2.0.14 hg-14525:e52d96ea04fc +luxe / assets / settings / applied `outline/settings` +luxe / opengl / initializing +luxe / opengl / request / core context (engine.render.opengl.core) +luxe / opengl / request / 3.3 (engine.render.opengl.major/minor) +luxe / sdl / creating window at `704,156` with size `512x768` +luxe / opengl / request / vsync? true (engine.render.vsync) +luxe / opengl / versions / GL `3.3.0 NVIDIA 511.79` - GLSL `3.30 NVIDIA via Cg compiler` +luxe / opengl / request / debug logging (engine.render.opengl.debug_level = 3) +luxe / opengl / debug / enabled debug callback +luxe / render / init ok +luxe / assets / loading `entry parcel` ... + luxe / assets / loading / render data `luxe: render_data` + luxe / assets / loading / shaders `luxe: shaders` + luxe / assets / loading / shaders `shaders/clear` + luxe / assets / loading / shaders `shaders/pixel_text` + luxe / assets / loading / shaders `shaders/pixel_text_ui` + luxe / assets / loading / shaders `shaders/upscale` + luxe / assets / loading / shaders `shaders/wip_button` + luxe / assets / loading / image `luxe: image/empty` + luxe / assets / loading / image `luxe: image/logo` + luxe / assets / loading / image `luxe: image/logo.sprite` + luxe / assets / loading / image `assets/wip/8Arrow` + luxe / assets / loading / image `assets/wip/8Cross` + luxe / assets / loading / image `assets/wip/8Head` + luxe / assets / loading / image `assets/wip/AdventureButtons` + luxe / assets / loading / image `assets/wip/Frame` + luxe / assets / loading / image `assets/wip/Human` + luxe / assets / loading / image `assets/wip/Knob3` + luxe / assets / loading / image `assets/wip/Needle` + luxe / assets / loading / image `assets/wip/Portrait` + luxe / assets / loading / image `assets/wip/Room` + luxe / assets / loading / image `assets/wip/SliderHandle` + luxe / assets / loading / image `assets/AdventureButtons` + luxe / assets / loading / basis `luxe: material_basis/debug_line3d` 3791244789 + luxe / assets / loading / basis `luxe: material_basis/font` 3777439469 + luxe / assets / loading / basis `luxe: material_basis/line` 1956587066 + luxe / assets / loading / basis `luxe: material_basis/mesh_debug` 538330473 + luxe / assets / loading / basis `luxe: material_basis/mesh_line` 4102261780 + luxe / assets / loading / basis `luxe: material_basis/mesh_solid` 2990521889 + luxe / assets / loading / basis `luxe: material_basis/solid` 1519506903 + luxe / assets / loading / basis `luxe: material_basis/sprite` 3941839433 + luxe / assets / loading / basis `luxe: material_basis/sprite_pixelated` 2606480210 + luxe / assets / loading / basis `luxe: material_basis/sprite_solid` 4167178021 + luxe / assets / loading / basis `luxe: material_basis/ui_font` 3033324030 + luxe / assets / loading / basis `luxe: material_basis/ui_mask` 1781843443 + luxe / assets / loading / basis `luxe: material_basis/ui_solid` 1723021186 + luxe / assets / loading / basis `luxe: material_basis/wire` 358309301 + luxe / assets / loading / basis `shaders/pixel_text` 1730835540 + luxe / assets / loading / basis `shaders/pixel_text_ui` 1057379103 + luxe / assets / loading / font `luxe: fonts/lato` 702255734 + luxe / assets / loading / font `assets/fonts/BabyBlocks` 3543213272 + luxe / assets / loading / font `assets/fonts/BabyBlocksBigger` 2395348976 + luxe / assets / loading / material `luxe: material/font` + luxe / assets / loading / material `luxe: material/logo` + luxe / assets / loading / material `luxe: material/logo.sprite` + luxe / assets / loading / material `luxe: material/mesh.debug` + luxe / assets / loading / material `luxe: material/mesh.line` + luxe / assets / loading / material `luxe: material/mesh_solid` + luxe / assets / loading / material `luxe: material/solid` + luxe / assets / loading / material `luxe: material/sprite.solid` + luxe / assets / loading / material `assets/materials/WipButton` + luxe / assets / loading / bytes `luxe: anim/material.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.value.track.lx` + luxe / assets / loading / bytes `luxe: anim/transform.track.lx` + luxe / assets / loading / bytes `luxe: asset/import/atlas.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/font.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/image.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/input.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/material.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/mesh.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/modifier.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/physics.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/sprite.import.lx` + luxe / assets / loading / bytes `assets/names.lx` + luxe / assets / loading / bytes `assets/resources.lx` + luxe / assets / loading / physics `luxe: physics/default.body` + luxe / assets / loading / physics `luxe: physics/default.collider` + luxe / assets / loading / modifier `blocks/human/human` + luxe / assets / loading / input `outline/inputs` + luxe / assets / loading / ui `luxe: asset/import/image.import` + luxe / assets / loading / ui `luxe: asset/import/material.import` + luxe / assets / loading / ui `luxe: asset/import/sprite.import` + luxe / assets / loading / ui `luxe: asset/import/sprites.import` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.frame` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.sprite.value.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.transform.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.button` + luxe / assets / loading / ui `luxe: ui/editor.panel.check` + luxe / assets / loading / ui `luxe: ui/editor.panel.label` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.mesh` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.script` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.sprite` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tags` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.text` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tiles` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.transform` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values.part` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.layer` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scene` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scenes` + luxe / assets / loading / ui `luxe: ui/editor.panel.progress` + luxe / assets / loading / ui `luxe: ui/editor.panel.slider` + luxe / assets / loading / ui `luxe: ui/editor.panel.text` +luxe / assets / loaded `entry parcel` with `98 items` in `19.01069999439642ms` +luxe / runtime / setting log level `info` +luxe / assets / input / no entry input specified +luxe / render / init renderer script `outline/renderer` +game / render / init / ok +game is now 128 x 192 +Cabin Game +Start planning new Adventure +unready! diff --git a/Luxe/log.2.txt b/Luxe/log.2.txt new file mode 100644 index 0000000..aaa1cde --- /dev/null +++ b/Luxe/log.2.txt @@ -0,0 +1,188 @@ +luxe / Engine / Sun Mar 20 20:39:56 2022 +luxe / Engine / path is `d:/gamedev/Cabin/Luxe` +luxe / script / profiler / enabled false +luxe / Engine / 2022.0.5 +luxe / Engine / dev mode +luxe / paths / root / located at `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe` +luxe / paths / modules / located at `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules` +luxe / dev / project / runtime version specified as `dev` +luxe / dev / project / runtime dev version `2022.0.5` - luxe @ c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev +luxe / API / 2022.0.5 +luxe / Runtime / 2022.0.5 +luxe / project / requested `luxe` @ `2022.0.5` not found... checking for `dev` match +luxe / project / found `luxe` @ `dev` with matching version `2022.0.5` so using that! +luxe / project / syncing dependency / `luxe` @ `2022.0.5` => `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev` +luxe / dev / parcel / adding dependency assets and units +luxe / dev / parcel / adding dependency `luxe` @ `2022.0.5` +luxe / dev / parcel / - adding scripts from `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev/api` +luxe / dev / parcel / - adding assets from `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev/assets` +luxe / dev / images / adding unreferenced sources... +luxe / dev / parcel / entry parcel generated in 136.8122000130825ms +luxe / dev / compiler / compiling dev content to `.luxe/` ... +luxe / dev / compiler / luxe runtime `2022.0.5` at path `c:/Users/Ronja/AppData/Roaming/luxeengine/luxe/.luxe/modules/luxe/dev` ... + + atlas - 0 found + + modifier - 1 found + + mesh - 0 found + + block - 0 found + + skeleton - 0 found + + shaders - 6 found + + settings - 1 found + - `.luxe/entry.settings.lx` > `.luxe/.luxe/entry.settings.lx.814a19b5` + + render - 1 found + + tiles - 0 found + + font - 3 found + + anim - 0 found + + scene - 0 found + + material_basis - 16 found + + prototype - 0 found + + material - 9 found + + physics - 2 found + + script - 153 found + + material_input - 0 found + + image - 15 found + + input - 1 found + + ui - 29 found +luxe / dev / data compile times: + - / modifier / spent `55.0027ms` + - / shaders / spent `72.5336ms` + - / font / spent `42.1073ms` + - / material / spent `4.8123ms` + - / physics / spent `0.49ms` + - / material_basis / spent `9.4018ms` + - / settings / spent `4.4748ms` + - / script / spent `665.7901ms` + - / image / spent `92.7734ms` + - / input / spent `4.3369ms` + - / render / spent `0.5836ms` + - / ui / spent `4.9386ms` +luxe / dev / compiler / compile completed | `237 assets` | `976.4337000087835ms` +luxe / dev / build / success +luxe / project / info: + - name: `Cabin Game` + - path: `d:/gamedev/Cabin/Luxe/project.luxe` + - version: `0.0.1` + - package: `com.luxeengine.game` + - entry: `game` + - renderer: `outline/renderer` + - settings: `outline/settings` + - depends: + - luxe @ 2022.0.5 + +luxe / sdl / 2.0.14 hg-14525:e52d96ea04fc +luxe / assets / settings / applied `outline/settings` +luxe / opengl / initializing +luxe / opengl / request / core context (engine.render.opengl.core) +luxe / opengl / request / 3.3 (engine.render.opengl.major/minor) +luxe / sdl / creating window at `704,156` with size `512x768` +luxe / opengl / request / vsync? true (engine.render.vsync) +luxe / opengl / versions / GL `3.3.0 NVIDIA 511.79` - GLSL `3.30 NVIDIA via Cg compiler` +luxe / opengl / request / debug logging (engine.render.opengl.debug_level = 3) +luxe / opengl / debug / enabled debug callback +luxe / render / init ok +luxe / assets / loading `entry parcel` ... + luxe / assets / loading / render data `luxe: render_data` + luxe / assets / loading / shaders `luxe: shaders` + luxe / assets / loading / shaders `shaders/clear` + luxe / assets / loading / shaders `shaders/pixel_text` + luxe / assets / loading / shaders `shaders/pixel_text_ui` + luxe / assets / loading / shaders `shaders/upscale` + luxe / assets / loading / shaders `shaders/wip_button` + luxe / assets / loading / image `luxe: image/empty` + luxe / assets / loading / image `luxe: image/logo` + luxe / assets / loading / image `luxe: image/logo.sprite` + luxe / assets / loading / image `assets/wip/8Arrow` + luxe / assets / loading / image `assets/wip/8Cross` + luxe / assets / loading / image `assets/wip/8Head` + luxe / assets / loading / image `assets/wip/AdventureButtons` + luxe / assets / loading / image `assets/wip/Frame` + luxe / assets / loading / image `assets/wip/Human` + luxe / assets / loading / image `assets/wip/Knob3` + luxe / assets / loading / image `assets/wip/Needle` + luxe / assets / loading / image `assets/wip/Portrait` + luxe / assets / loading / image `assets/wip/Room` + luxe / assets / loading / image `assets/wip/SliderHandle` + luxe / assets / loading / image `assets/AdventureButtons` + luxe / assets / loading / basis `luxe: material_basis/debug_line3d` 3791244789 + luxe / assets / loading / basis `luxe: material_basis/font` 3777439469 + luxe / assets / loading / basis `luxe: material_basis/line` 1956587066 + luxe / assets / loading / basis `luxe: material_basis/mesh_debug` 538330473 + luxe / assets / loading / basis `luxe: material_basis/mesh_line` 4102261780 + luxe / assets / loading / basis `luxe: material_basis/mesh_solid` 2990521889 + luxe / assets / loading / basis `luxe: material_basis/solid` 1519506903 + luxe / assets / loading / basis `luxe: material_basis/sprite` 3941839433 + luxe / assets / loading / basis `luxe: material_basis/sprite_pixelated` 2606480210 + luxe / assets / loading / basis `luxe: material_basis/sprite_solid` 4167178021 + luxe / assets / loading / basis `luxe: material_basis/ui_font` 3033324030 + luxe / assets / loading / basis `luxe: material_basis/ui_mask` 1781843443 + luxe / assets / loading / basis `luxe: material_basis/ui_solid` 1723021186 + luxe / assets / loading / basis `luxe: material_basis/wire` 358309301 + luxe / assets / loading / basis `shaders/pixel_text` 1730835540 + luxe / assets / loading / basis `shaders/pixel_text_ui` 1057379103 + luxe / assets / loading / font `luxe: fonts/lato` 702255734 + luxe / assets / loading / font `assets/fonts/BabyBlocks` 3543213272 + luxe / assets / loading / font `assets/fonts/BabyBlocksBigger` 2395348976 + luxe / assets / loading / material `luxe: material/font` + luxe / assets / loading / material `luxe: material/logo` + luxe / assets / loading / material `luxe: material/logo.sprite` + luxe / assets / loading / material `luxe: material/mesh.debug` + luxe / assets / loading / material `luxe: material/mesh.line` + luxe / assets / loading / material `luxe: material/mesh_solid` + luxe / assets / loading / material `luxe: material/solid` + luxe / assets / loading / material `luxe: material/sprite.solid` + luxe / assets / loading / material `assets/materials/WipButton` + luxe / assets / loading / bytes `luxe: anim/material.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.value.track.lx` + luxe / assets / loading / bytes `luxe: anim/transform.track.lx` + luxe / assets / loading / bytes `luxe: asset/import/atlas.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/font.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/image.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/input.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/material.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/mesh.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/modifier.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/physics.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/sprite.import.lx` + luxe / assets / loading / bytes `assets/names.lx` + luxe / assets / loading / bytes `assets/resources.lx` + luxe / assets / loading / physics `luxe: physics/default.body` + luxe / assets / loading / physics `luxe: physics/default.collider` + luxe / assets / loading / modifier `blocks/human/human` + luxe / assets / loading / input `outline/inputs` + luxe / assets / loading / ui `luxe: asset/import/image.import` + luxe / assets / loading / ui `luxe: asset/import/material.import` + luxe / assets / loading / ui `luxe: asset/import/sprite.import` + luxe / assets / loading / ui `luxe: asset/import/sprites.import` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.frame` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.sprite.value.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.transform.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.button` + luxe / assets / loading / ui `luxe: ui/editor.panel.check` + luxe / assets / loading / ui `luxe: ui/editor.panel.label` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.mesh` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.script` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.sprite` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tags` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.text` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tiles` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.transform` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values.part` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.layer` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scene` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scenes` + luxe / assets / loading / ui `luxe: ui/editor.panel.progress` + luxe / assets / loading / ui `luxe: ui/editor.panel.slider` + luxe / assets / loading / ui `luxe: ui/editor.panel.text` +luxe / assets / loaded `entry parcel` with `98 items` in `356.1391999828629ms` +luxe / runtime / setting log level `info` +luxe / assets / input / no entry input specified +luxe / render / init renderer script `outline/renderer` +game / render / init / ok +game is now 128 x 192 +Cabin Game +unready! diff --git a/Luxe/log.3.txt b/Luxe/log.3.txt new file mode 100644 index 0000000..bef6ad1 --- /dev/null +++ b/Luxe/log.3.txt @@ -0,0 +1,192 @@ +luxe / Engine / Sat Feb 19 12:37:34 2022 +luxe / Engine / path is `d:/gamedev/Cabin/Luxe` +luxe / script / profiler / enabled false +luxe / Engine / 2022.0.4 +luxe / Engine / dev mode +luxe / paths / root / located at `D:\tools\.luxe` +luxe / paths / modules / located at `D:\tools\.luxe/modules` +luxe / dev / project / runtime version specified as `dev` +luxe / dev / project / runtime dev version `2022.0.4` - luxe @ D:\tools\.luxe/modules/luxe/dev +luxe / API / 2022.0.4 +luxe / Runtime / 2022.0.4 +luxe / project / requested `luxe` @ `2022.0.4` not found... checking for `dev` match +luxe / project / found `luxe` @ `dev` with matching version `2022.0.4` so using that! +luxe / project / syncing dependency / `luxe` @ `2022.0.4` => `d:/tools/.luxe/modules/luxe/dev` +luxe / dev / parcel / adding dependency assets and units +luxe / dev / parcel / adding dependency `luxe` @ `2022.0.4` +luxe / dev / parcel / - adding scripts from `d:/tools/.luxe/modules/luxe/dev/api` +luxe / dev / parcel / - adding assets from `d:/tools/.luxe/modules/luxe/dev/assets` +luxe / dev / images / adding unreferenced sources... +luxe / dev / parcel / entry parcel generated in 36.27810000034515ms +luxe / dev / compiler / compiling dev content to `.luxe/` ... +luxe / dev / compiler / luxe runtime `2022.0.4` at path `d:/tools/.luxe/modules/luxe/dev` ... + + atlas - 0 found + + modifier - 1 found + + mesh - 0 found + + block - 0 found + + skeleton - 0 found + + shaders - 6 found + + settings - 1 found + - `.luxe/entry.settings.lx` > `.luxe/.luxe/entry.settings.lx.814a19b5` + + render - 1 found + + tiles - 0 found + + font - 3 found + + anim - 0 found + + scene - 0 found + + material_basis - 16 found + + prototype - 0 found + + material - 9 found + + physics - 2 found + + script - 153 found + + material_input - 0 found + + image - 15 found + + input - 1 found + + ui - 29 found +luxe / dev / data compile times: + - / modifier / spent `10.5353ms` + - / shaders / spent `12.1822ms` + - / font / spent `5.9356ms` + - / material / spent `4.6495ms` + - / physics / spent `0.8935ms` + - / material_basis / spent `12.9761ms` + - / settings / spent `3.7913ms` + - / script / spent `490.9438ms` + - / image / spent `19.372ms` + - / input / spent `2.5872ms` + - / render / spent `4.87ms` + - / ui / spent `28.6099ms` +luxe / dev / compiler / compile completed | `237 assets` | `626.804200001061ms` +luxe / dev / build / success +luxe / project / info: + - name: `Cabin Game` + - path: `d:/gamedev/Cabin/Luxe/project.luxe` + - version: `0.0.1` + - package: `com.luxeengine.game` + - entry: `game` + - renderer: `outline/renderer` + - settings: `outline/settings` + - depends: + - luxe @ 2022.0.4 + +luxe / sdl / 2.0.14 hg-14525:e52d96ea04fc +luxe / assets / settings / applied `outline/settings` +luxe / opengl / initializing +luxe / opengl / request / core context (engine.render.opengl.core) +luxe / opengl / request / 3.3 (engine.render.opengl.major/minor) +luxe / sdl / creating window at `704,156` with size `512x768` +luxe / opengl / request / vsync? true (engine.render.vsync) +luxe / opengl / versions / GL `3.3.14761 Core Profile/Debug Context 20.45.40.14 27.20.14540.14002` - GLSL `4.60` +luxe / opengl / request / debug logging (engine.render.opengl.debug_level = 3) +luxe / opengl / debug / enabled debug callback +luxe / render / init ok +luxe / assets / loading `entry parcel` ... + luxe / assets / loading / render data `luxe: render_data` + luxe / assets / loading / shaders `luxe: shaders` + luxe / assets / loading / shaders `shaders/clear` + luxe / assets / loading / shaders `shaders/pixel_text` + luxe / assets / loading / shaders `shaders/pixel_text_ui` + luxe / assets / loading / shaders `shaders/upscale` + luxe / assets / loading / shaders `shaders/wip_button` + luxe / assets / loading / image `luxe: image/empty` + luxe / assets / loading / image `luxe: image/logo` + luxe / assets / loading / image `luxe: image/logo.sprite` + luxe / assets / loading / image `assets/wip/8Arrow` + luxe / assets / loading / image `assets/wip/8Cross` + luxe / assets / loading / image `assets/wip/8Head` + luxe / assets / loading / image `assets/wip/AdventureButtons` + luxe / assets / loading / image `assets/wip/Frame` + luxe / assets / loading / image `assets/wip/Human` + luxe / assets / loading / image `assets/wip/Knob3` + luxe / assets / loading / image `assets/wip/Needle` + luxe / assets / loading / image `assets/wip/Portrait` + luxe / assets / loading / image `assets/wip/Room` + luxe / assets / loading / image `assets/wip/SliderHandle` + luxe / assets / loading / image `assets/AdventureButtons` + luxe / assets / loading / basis `luxe: material_basis/debug_line3d` 3791244789 + luxe / assets / loading / basis `luxe: material_basis/font` 3777439469 + luxe / assets / loading / basis `luxe: material_basis/line` 1956587066 + luxe / assets / loading / basis `luxe: material_basis/mesh_debug` 538330473 + luxe / assets / loading / basis `luxe: material_basis/mesh_line` 4102261780 + luxe / assets / loading / basis `luxe: material_basis/mesh_solid` 2990521889 + luxe / assets / loading / basis `luxe: material_basis/solid` 1519506903 + luxe / assets / loading / basis `luxe: material_basis/sprite` 3941839433 + luxe / assets / loading / basis `luxe: material_basis/sprite_pixelated` 2606480210 + luxe / assets / loading / basis `luxe: material_basis/sprite_solid` 4167178021 + luxe / assets / loading / basis `luxe: material_basis/ui_font` 3033324030 + luxe / assets / loading / basis `luxe: material_basis/ui_mask` 1781843443 + luxe / assets / loading / basis `luxe: material_basis/ui_solid` 1723021186 + luxe / assets / loading / basis `luxe: material_basis/wire` 358309301 + luxe / assets / loading / basis `shaders/pixel_text` 1730835540 + luxe / assets / loading / basis `shaders/pixel_text_ui` 1057379103 + luxe / assets / loading / font `luxe: fonts/lato` 702255734 + luxe / assets / loading / font `assets/fonts/BabyBlocks` 3543213272 + luxe / assets / loading / font `assets/fonts/BabyBlocksBigger` 2395348976 + luxe / assets / loading / material `luxe: material/font` + luxe / assets / loading / material `luxe: material/logo` + luxe / assets / loading / material `luxe: material/logo.sprite` + luxe / assets / loading / material `luxe: material/mesh.debug` + luxe / assets / loading / material `luxe: material/mesh.line` + luxe / assets / loading / material `luxe: material/mesh_solid` + luxe / assets / loading / material `luxe: material/solid` + luxe / assets / loading / material `luxe: material/sprite.solid` + luxe / assets / loading / material `assets/materials/WipButton` + luxe / assets / loading / bytes `luxe: anim/material.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.track.lx` + luxe / assets / loading / bytes `luxe: anim/sprite.value.track.lx` + luxe / assets / loading / bytes `luxe: anim/transform.track.lx` + luxe / assets / loading / bytes `luxe: asset/import/atlas.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/font.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/image.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/input.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/material.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/mesh.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/modifier.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/physics.import.lx` + luxe / assets / loading / bytes `luxe: asset/import/sprite.import.lx` + luxe / assets / loading / bytes `assets/names.lx` + luxe / assets / loading / bytes `assets/resources.lx` + luxe / assets / loading / bytes `log.1.txt` + luxe / assets / loading / bytes `log.2.txt` + luxe / assets / loading / bytes `log.3.txt` + luxe / assets / loading / physics `luxe: physics/default.body` + luxe / assets / loading / physics `luxe: physics/default.collider` + luxe / assets / loading / modifier `blocks/human/human` + luxe / assets / loading / input `outline/inputs` + luxe / assets / loading / ui `luxe: asset/import/image.import` + luxe / assets / loading / ui `luxe: asset/import/material.import` + luxe / assets / loading / ui `luxe: asset/import/sprite.import` + luxe / assets / loading / ui `luxe: asset/import/sprites.import` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.frame` + luxe / assets / loading / ui `luxe: ui/editor.mini.anim.sprite.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.sprite.value.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.anim.transform.settings` + luxe / assets / loading / ui `luxe: ui/editor.panel.button` + luxe / assets / loading / ui `luxe: ui/editor.panel.check` + luxe / assets / loading / ui `luxe: ui/editor.panel.label` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.mesh` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.script` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.sprite` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tags` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.text` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.tiles` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.transform` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values.part` + luxe / assets / loading / ui `luxe: ui/editor.panel.modifier.values` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.layer` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype.entity` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.prototype` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scene` + luxe / assets / loading / ui `luxe: ui/editor.panel.outline.scenes` + luxe / assets / loading / ui `luxe: ui/editor.panel.progress` + luxe / assets / loading / ui `luxe: ui/editor.panel.slider` + luxe / assets / loading / ui `luxe: ui/editor.panel.text` +luxe / assets / loaded `entry parcel` with `101 items` in `116.2211999999272ms` +luxe / runtime / setting log level `info` +luxe / assets / input / no entry input specified +luxe / render / init renderer script `outline/renderer` +game / render / init / ok +game is now 128 x 192 +Cabin Game +Start planning new Adventure +unready! diff --git a/Luxe/luxe.project/assets.lx b/Luxe/luxe.project/assets.lx new file mode 100644 index 0000000..c25ffbb --- /dev/null +++ b/Luxe/luxe.project/assets.lx @@ -0,0 +1,400 @@ +[ + { "033dde8b-03a7-47ed-aa55-de60d60688f6" = "luxe: asset/import/" } + { "037d00e2-eef4-4a49-b259-2f5f62b767be" = "luxe: material_basis/line.material_basis.lx" } + { "03f432ec-f0c1-4bfe-b2ae-00ca3729eaa9" = "luxe: image/folder-open.svg" } + { "04b8ffa3-250c-4b2d-8bea-d0e8205bbc7f" = "luxe: ui/editor.panel.modifier.values.part.ui.lx" } + { "059537f0-2f76-4d90-8ad7-d729b44fd258" = "luxe: ui/" } + { "05c3eeac-12bf-436a-ba37-e828cf78851d" = "luxe: asset/import/sprite.import.wren" } + { "069dad70-17b6-44cb-99b2-b08c62e9edae" = "assets/fonts/BabyBlocks.font.lx" } + { "07f3f923-bd72-4e65-b507-4260d8017f02" = "luxe: world/modifier.wren" } + { "08809ad4-dec1-4295-aa5a-dd32af9ce08c" = "luxe: anim/transform.track.lx" } + { "08f4674f-3fdb-4492-95ad-3156c03235c4" = "luxe: build/" } + { "09a2385b-82e1-4d2a-ad3c-7367cea5a3c6" = "luxe: asset/import/image.import.ui.lx" } + { "0ab0e0ed-ed1e-44c8-9f89-8ed95ffb9310" = "luxe: build/wrenalyzer/" } + { "0b1d217b-03b7-46ff-9d01-5c2980e64b05" = "luxe: build/inputs.wren" } + { "0b56e6d0-a5d3-4559-bd61-288eb25b12be" = "luxe: material_basis/ui_font.material_basis.lx" } + { "0cace1c8-75fd-4010-911f-f599db9f5c98" = "luxe: string/" } + { "0e6d4e2f-8fe7-4106-90d9-172640e4831a" = "luxe: assert.wren" } + { "0ef1c6f1-36c7-40e4-829a-12ce04a6de2e" = "luxe: image/close.png" } + { "0fa4282f-874e-43ca-9378-6527c5c06c6b" = "luxe: anim/sprite.track.lx" } + { "0fcf2a07-b22b-46bf-937c-20fb661c22d8" = "luxe: system/" } + { "132ffbd3-e29c-4fb7-83eb-d8c974028c1c" = "blocks/narrative/" } + { "1356b469-4d46-4065-8dc0-504e105819f4" = "shaders/wip_button.emsl" } + { "13939be7-246b-47ac-96f8-69f356e0f0fe" = "luxe: project/paths.wren" } + { "140edfe0-c94d-466a-b71d-aa4c908de163" = "outline/renderer.wren" } + { "15959cb5-596c-4601-aa13-fb16e128b677" = "assets/fonts/src/BabyBlocksBigger.ttf" } + { "16161d92-454e-4c33-a373-d48bb7098f63" = "luxe: modifier/tiles.wren" } + { "16210f60-0869-4d7d-a68f-5c26bfb6be6f" = "luxe: type/entity.asset.wren" } + { "169977e9-2689-4291-9eea-086dbc5e06e1" = "luxe: ui/field/number.wren" } + { "172a5d80-10c6-4a13-9746-42ac6c452503" = "assets/wip/Frame.image.lx" } + { "193a15e6-5a1b-4bee-b92e-7193d2b6b919" = "luxe: material_basis/color_pick_triangle.material_basis.lx" } + { "196252cf-71d3-4371-9c0f-049bb7125fca" = "assets/fonts/src/BabyBlocks.ttf" } + { "1ca8973c-934b-4a50-b64b-e8adf786ccbe" = "luxe: pqueue.wren" } + { "1d3d37b4-b24b-4b2a-9578-d7fbe729de7b" = "luxe: ui/list_filtered.wren" } + { "1e9cf25d-31a5-4d42-8db2-780227d26872" = "luxe: project/outline.wren" } + { "1efc86ed-d7dc-4bc6-9c80-2c85f0399c24" = "luxe: settings.wren" } + { "1f7d9e1c-707f-4c77-8e85-adffa96b8679" = "luxe: string.wren" } + { "1fc6b7cb-3473-43b6-bac0-3b98e68afb0a" = "luxe: modules/" } + { "20739792-549d-4866-b732-8ea76049f939" = "luxe: video.wren" } + { "213f02c0-44bf-45bb-a9eb-7531415a395f" = "luxe: ui/image.wren" } + { "21b10c94-126c-4712-8f2c-f05b3f215039" = "luxe: color.wren" } + { "21eb0361-ab5b-4ab2-b0bb-2f7a47cf444e" = "luxe: image/proto-closed.svg" } + { "2204ce86-f5dc-4cb8-a58d-75b9c1880bd4" = "luxe: editor.wren" } + { "2209ecd4-565d-43f3-8539-42b5d29e53b3" = "luxe: type/image.asset.wren" } + { "221efed0-44e5-47ee-9993-673ae489db11" = "luxe: material_basis/wire.material_basis.lx" } + { "22420ca4-8d7e-4eb4-9f28-0eb83923e3fa" = "luxe: asset/import/font.import.lx" } + { "22462cd5-99f7-48a7-a193-3606d4238ac6" = "luxe: ui/editor.mini.anim.sprite.frame.ui.lx" } + { "226c8983-9cfc-4b84-9590-d61cf68febce" = "luxe: build/modifier.wren" } + { "22cb3c70-45b5-4aa8-ab9f-01dd29ee89c5" = "luxe: semver.wren" } + { "23cf74f0-ec02-4830-a030-a935420a1a4a" = "luxe: ui/check.wren" } + { "242947da-0c98-4769-a7c5-d4ed49ee63b5" = "luxe: image/save-all.svg" } + { "246464f3-864f-4339-b8c4-e011dbef3c5d" = "luxe: image/trash.svg" } + { "256819c5-df25-4cb7-9f3a-8ac8b8ddda91" = "luxe: fonts/Lato-Regular.ttf" } + { "2627e439-076c-41d2-be05-a294346e52c9" = "luxe: fonts/" } + { "26bb5c97-b00b-4403-9227-acf8fab022ce" = "luxe: ui/slider.wren" } + { "26ce032b-177a-49ef-b18c-71ed60d1ab34" = "luxe: build/wrenalyzer/core.wren" } + { "26e19c9b-1995-4c9a-8cf6-f287139b2b6e" = "luxe: ui/editor.panel.outline.prototype.ui.lx" } + { "274573a7-9186-44c8-b543-918716579cd3" = "luxe: material/logo.material.lx" } + { "28d06ec0-4022-4a33-aa8b-6c7c2453276b" = "luxe: system/anim.modifier.wren" } + { "294f02dd-7520-4b16-8e81-923701ce4fc5" = "luxe: modifier/values.wren" } + { "2a938d17-d2d0-48a1-b4b8-0f7ddf28deba" = "assets/wip/8Arrow.png" } + { "2abd5c44-9389-42c8-bd13-a5afe749261b" = "luxe: type/compute.asset.wren" } + { "2b15b234-1252-460a-b76e-c1670fb93e78" = "luxe: game.wren" } + { "2b58795c-8383-4062-af02-8367ed6e9135" = "luxe: build/settings.wren" } + { "2d1ceeeb-511c-44a3-9eec-1843ad06ae3d" = "luxe: system/mesh.modifier.wren" } + { "2d8249ed-69df-4d22-91e1-135b066258ec" = "luxe: ui/editor.mini.anim.sprite.settings.ui.lx" } + { "2de79151-30fe-475a-a1d0-77e0d6032e38" = "luxe: asset/" } + { "2f2dd91a-e918-4edd-b689-10ad9746ff29" = "luxe: build/scripts.wren" } + { "2fa460df-72df-49fc-88ce-de87923abce5" = "luxe: ui/editor.panel.check.ui.lx" } + { "30534dfb-d859-4d1a-ad0a-ef6b5b392f1d" = "luxe: material/mesh.line.material.lx" } + { "310e2913-4bca-4654-b6b1-5a943209971b" = "luxe: material_basis/mesh_debug.material_basis.lx" } + { "354d9a12-436f-4e4e-ae41-b0158ad1f6fa" = "luxe: asset/import/material.import.ui.lx" } + { "357deeab-985b-4993-b94c-e74bc1baedbe" = "luxe: events.wren" } + { "3607e639-140b-4526-a490-fec3ba5b0f79" = "luxe: build/deploy/deploy.windows.wren" } + { "36a1efaf-b047-4ce1-b0f2-0bedb0e1cd2d" = "globals.wren" } + { "36e0aee8-7a4a-475f-a984-1d8b4b0f5eb2" = "luxe: build/empty.wren" } + { "3708ef2a-0469-42c8-9bcd-b3290fa42199" = "luxe: test.wren" } + { "3741d639-5a93-4ea0-bcda-0c0e41c5039f" = "luxe: physics/default.collider.physics.lx" } + { "380b3f3e-b848-47f2-b353-fe6e7190d78d" = "assets/fonts/" } + { "38b045eb-6a8d-4972-a39e-9fe90e0f5853" = "luxe: build/ast/" } + { "3b1ce9ad-acb9-4133-982c-a84377f00f65" = "assets/wip/Room.png" } + { "3b33675c-609a-403b-b612-66bbf2111f6b" = "luxe: ui.wren" } + { "3b582b2e-3165-4282-bf54-817e9413bb77" = "luxe: asset/import/input.import.lx" } + { "3bc41225-9f29-41da-86ea-9aa4cad85f78" = "luxe: blocks.wren" } + { "3c464e0c-aa2b-40c9-8292-6d59bb8656b9" = "luxe: ui/editor.panel.text.ui.lx" } + { "3c50e481-a975-43f2-912c-78c0f56736be" = "luxe: build/wrenalyzer/lexer.wren" } + { "3c9e71a4-2fb6-4278-82a0-90034c3f38d4" = "math/" } + { "3d36ae3b-5e2f-490b-8e22-90bb06feef42" = "luxe: lx.wren" } + { "3fe7353b-5129-46a2-a1a0-48f5538bb206" = "luxe: runtime.wren" } + { "40203b61-0f21-4366-a72a-f60d29f36fdd" = "luxe: anim/material.track.lx" } + { "4059e97a-2e0f-4d7c-9358-ecb4760b7f7c" = "luxe: physics/" } + { "418a45d5-cad1-4b39-9a88-b6454771565e" = "luxe: shape2D.wren" } + { "418e3cc4-2b79-4343-811e-f7a15bc1d72a" = "luxe: build/material_input.wren" } + { "419deda8-48ef-4af8-a52d-76f885e23452" = "luxe: physics/default.body.physics.lx" } + { "42ea78bb-e6ed-4e35-9e24-63bf30334f4e" = "luxe: ui/scroll.wren" } + { "43298db2-37ba-4624-8100-f2ab6b77b9c5" = "assets/wip/AdventureButtons.image.lx" } + { "434f9a8d-9fe7-4fee-a2e9-9e48cd707812" = "assets/materials/" } + { "4445e92a-f563-4bb1-9b92-f63c88417351" = "luxe: ui/list.wren" } + { "4455c83d-f0eb-48a2-a2d9-8803dda14689" = "luxe: type/basis.asset.wren" } + { "44b11a5a-337f-4b69-aa24-3bdabe325515" = "luxe: asset/import/sprite.import.ui.lx" } + { "45459d4b-0639-499b-a6cf-c45a99278065" = "luxe: type/sys.asset.wren" } + { "46485275-be93-4537-9eec-4d91f64fd2ea" = "luxe: image/select-all.svg" } + { "47813f38-c0f3-407f-b1f4-27f03b2cd943" = "blocks/ui/image_util.wren" } + { "47dc7e2a-6ae2-433e-820f-f948cde810ed" = "luxe: material_basis/vector.material_basis.lx" } + { "48ec633c-6e3f-4db8-ba46-db17ae6999a7" = "luxe: image/logo.png" } + { "499d4cb0-c33d-4e9e-8467-8f1df07c2bd3" = "luxe: material_basis/debug_line3d.material_basis.lx" } + { "49acf614-0127-4775-b741-3ed8ed417c2a" = "luxe: material_basis/ui_solid.material_basis.lx" } + { "4b006c68-f0fa-492c-8453-f6e20fa36892" = "luxe: system/tags.modifier.wren" } + { "4bc31e29-ccc0-4d66-a39d-6ea5abdd52c9" = "luxe: ui/editor.panel.progress.ui.lx" } + { "4bdfddff-3f3e-48fb-a388-74e81eeffd2b" = "luxe: ui/editor.panel.outline.prototype.entity.ui.lx" } + { "4c817f8d-457e-4a89-ae6a-1c88a308ce1d" = "luxe: ui/editor.panel.modifier.tiles.ui.lx" } + { "4ce41557-7e6d-474b-95cd-acb6ced3364c" = "luxe: image/proto-open.svg" } + { "4d5a2a7a-12ce-42cb-89ae-bcb2c6fa7045" = "luxe: ui/editor.panel.outline.scenes.ui.lx" } + { "4e2ef951-1420-4f7b-8e69-f017a84e4540" = "luxe: render_data.render.lx" } + { "4e584db7-0e93-4bf0-91ee-7e8454db77a3" = "luxe: type/font.face.ttf.asset.wren" } + { "4e9bb8c0-490d-4464-8349-7feeb3921574" = "outline/inputs.input.lx" } + { "4ec00484-318a-412e-8a5b-b5d1f5759810" = "luxe: plot.wren" } + { "4ede2ef1-58d8-4000-b38c-1bbb36dacf3b" = "luxe: ui/progress.wren" } + { "4f45e124-37be-43f6-918d-a82037fc26c4" = "luxe: material_basis/color_pick_ring.material_basis.lx" } + { "4f4851d0-b4b7-49dd-8bef-bbe00e5b17ce" = "luxe: system/transform.modifier.wren" } + { "4fadbc3b-32e0-409c-8cda-38c6eedbf2b6" = "assets/fonts/src/BabyBlocks.face.lx" } + { "504ec597-12d2-4ad3-82dc-f9c4d98788f7" = "math/math.wren" } + { "505c9b4e-c532-4bea-980c-d448f362aacd" = "luxe: build/wrenalyzer/visitor.wren" } + { "50e96084-8f2c-45fc-8fb3-ae1127b10c93" = "luxe: modifier/script.wren" } + { "51766136-9beb-4a4f-8e14-7906ce7f3ad6" = "assets/wip/Frame.png" } + { "51b27bf3-812f-4f7d-9354-c91f99c34546" = "shaders/pixel_text_ui.emsl" } + { "524b0500-88d2-43a4-880e-7889fd67f2aa" = "luxe: ui/editor.panel.modifier.script.ui.lx" } + { "5285599d-54b0-49d7-9f67-70a4c14dbd4e" = "luxe: build/deploy/deploy.mac.wren" } + { "52d4ed5c-32fa-44d6-866c-8ce36e647114" = "assets/wip/SliderHandle.image.lx" } + { "52e16cee-2246-482b-8fe3-384c85678b7b" = "blocks/ui/info.wren" } + { "53664479-2371-472f-aa5d-9c97e85f4cbe" = "luxe: type/mesh.asset.wren" } + { "537821a0-21e6-4a1f-81d3-5c40a38b4d78" = "luxe: image/folder-closed.svg" } + { "53b0b502-f059-4135-978b-dd6f865e0b6e" = "luxe: build/meshes.wren" } + { "54f6442d-a5b6-4824-a563-6b25ac8a76ef" = "luxe: anim/transform.wren" } + { "55338ca0-3f1a-46de-a853-ae108df9df1f" = "luxe: material_basis/solid.material_basis.lx" } + { "553463a5-22e8-4eda-9f4d-b7270c5347a6" = "assets/wip/8Head.image.lx" } + { "553e3386-9d56-4533-b336-cc49b6f6ce33" = "luxe: toggle.wren" } + { "55453f56-790f-47da-bc78-1cdd37fb385c" = "assets/AdventureButtons.png" } + { "55788203-09b4-4a20-9971-677f8d2b4a91" = "luxe: version.wren" } + { "557c27d0-5c76-4928-b58a-4ad7ddeaff54" = "luxe: sample/" } + { "56256a3d-452e-4b94-af1d-06a3e8e36b97" = "assets/resources.lx" } + { "567a1d24-92a2-402a-8f1f-aad8008f553f" = "luxe: ui/editor.panel.slider.ui.lx" } + { "5768bb59-9a12-45f2-90ea-76e03bd79900" = "blocks/" } + { "5908c85f-c050-4291-ab05-58f32f43d2af" = "luxe: type/modifier.asset.wren" } + { "594741d0-58dc-482f-aa3f-83a5eaf32683" = "luxe: noise.wren" } + { "598e114f-fd94-4866-b90b-4e0a313dcf0a" = "luxe: sample/app.wren" } + { "59c1e97b-07f8-4189-82a0-61b03234311a" = "luxe: math.wren" } + { "5a8aeb53-efc2-4f74-900b-cd87ec4cdde3" = "luxe: ui/editor.panel.modifier.mesh.ui.lx" } + { "5b2f1286-d705-47eb-9235-5a7742d9637c" = "luxe: ui/editor.panel.outline.layer.ui.lx" } + { "5bba6963-bd5a-44cf-aa7a-83aae1cff5e7" = "luxe: triangulate.wren" } + { "5c64d986-79db-4c89-bd65-51a854998cb9" = "game.wren" } + { "5c664aea-99f0-4ca7-9544-b5d05b19de48" = "luxe: ui/text.wren" } + { "5df41a20-9475-491b-8394-d11c534ce91b" = "luxe: asset/import/physics.import.lx" } + { "5f283252-ffdc-47e5-aa11-b4efb2786a0b" = "luxe: ui/tabs.wren" } + { "5f71f82a-e194-4370-bc75-5eb0c44f3e2a" = "outline/settings.settings.lx" } + { "602265e1-be17-452c-9985-223b379b9eef" = "luxe: project.wren" } + { "60cfbe89-ecb5-4c12-9fff-0d6f95768d2f" = "assets/AdventureButtons.image.lx" } + { "6274166e-dbf5-42cf-9007-1797c4a70690" = "shaders/" } + { "62a0e2b6-1595-44c3-96be-bcce77d225e7" = "luxe: build/deploy/deploy.web.wren" } + { "62c2bc33-c3ac-4182-ba33-df725edd8625" = "luxe: type/anim.asset.wren" } + { "63593606-6f4c-45ac-89aa-5c0e9f9f5c2d" = "luxe: anim/empty.wren" } + { "6373c429-6823-477b-8e6b-6d3c639aec48" = "blocks/tooltip.wren" } + { "6406c233-4515-4c50-9374-ac50d3393a39" = "luxe: anim/sprite.value.track.lx" } + { "65a1d40f-4468-48eb-b2d2-273c71f65526" = "outline/app.wren" } + { "661202d2-a88f-4f6a-9980-a49f29b1b2eb" = "luxe: image/empty.image.lx" } + { "67192e9c-a987-4961-8c6c-b3b1a0ec35ac" = "luxe: world/prototype.wren" } + { "674251a4-ea6d-4de0-9fe8-a369057048e1" = "luxe: moduler.wren" } + { "67e372fc-1fd3-4253-97ef-ba9ee9c15124" = "luxe: build/wrenalyzer/ast.wren" } + { "67efcb83-8d5f-4612-acee-e6ffd98aafcd" = "blocks/human/human.wren" } + { "67f3ada5-3412-4b52-9bc4-5f891f534e0d" = "math/rect.wren" } + { "6878ae27-2e98-4b22-9376-c9b1e2706cb9" = "assets/" } + { "68dbc3e9-9822-45b7-82a9-ad38251ea6ff" = "assets/wip/Portrait.png" } + { "6910ddda-c8e4-476c-9f78-968d83aca8a9" = "assets/wip/AdventureButtons.png" } + { "697da9a3-fe63-4ac7-90fd-d37e9a326036" = "luxe: modifier/anim.wren" } + { "6a012a92-2241-4b0f-933c-a1608e7e3506" = "luxe: regex.wren" } + { "6a405619-3c8b-40da-8fad-1abbc6e73bd8" = "luxe: ui/editor.panel.modifier.sprite.ui.lx" } + { "6aa35469-6318-4710-a35f-773f78aac586" = "luxe: type/text.style.asset.wren" } + { "6af570e8-5050-48b0-8c28-aa0a5c884953" = "luxe: image/select-inverse.svg" } + { "6b0094c3-cde7-4ed8-9641-a329bce61f98" = "luxe: image/select-none.svg" } + { "6ce19f80-1987-4195-a1df-588639c4a702" = "luxe: image/active-context.svg" } + { "6db8cf77-8a99-4e90-a1ad-298e39e1178e" = "blocks/human/" } + { "6de4d7e6-b74c-4cab-abde-58ff310cdf0d" = "assets/names.lx" } + { "6f49cc4a-adb5-4c22-8c0f-f37883e09374" = "luxe: build/dependency.wren" } + { "703d51c6-42b6-4311-ac1c-0f9a509746c3" = "luxe: ui/field/color.wren" } + { "7150e167-ed4f-4fd8-bc85-0bd867ddef86" = "luxe: build/deploy/" } + { "715511fb-d2e4-4519-8e7c-0efb24c77139" = "assets/fonts/src/BabyBlocksBigger.face.lx" } + { "721bcf58-8df4-4202-9604-180932f8acef" = "luxe: build/shaders.wren" } + { "72895c82-2455-48d3-85ad-9fe28ca440b1" = "luxe: material_basis/sprite_solid.material_basis.lx" } + { "766456ef-364f-4dfd-a1fa-0aeeb07ae745" = "luxe: image/save.svg" } + { "7697ba82-5ca1-42f4-acb0-fec4c2b366da" = "blocks/adventures.wren" } + { "76bc4ece-bff8-49e9-aa8a-e735525ab0a2" = "luxe: anim/sprite.value.wren" } + { "76f219bb-7e48-4faf-a16f-95a2e286a6ae" = "luxe: tiles/" } + { "77111f1b-6fa4-428b-a37a-9d231c359996" = "assets/wip/Room.image.lx" } + { "787959d8-941f-4336-afb4-8a571589ed07" = "luxe: ui/block.wren" } + { "78830304-83cb-4a36-9f74-b488c02fa854" = "luxe: material_basis/color_pick_transparency_grid.material_basis.lx" } + { "7898f0a6-e205-4f7e-a8a7-10c6e290518e" = "luxe: ui/button.wren" } + { "78df96d0-9ded-48dc-b687-e06d2417edf7" = "luxe: ui/field/choice.wren" } + { "7b35abca-5bac-4cea-a090-bb2437d98d10" = "luxe: material_basis/sprite_pixelated_AA.material_basis.lx" } + { "7be66510-cd18-4d19-93da-2496aaf88e76" = "blocks/human/human.modifier.lx" } + { "7c02a4bd-8d2d-43d9-971f-b6dbe3c57003" = "luxe: templates/sprite.prototype/sprite.prototype.lx" } + { "7d4541b8-a388-4ee7-beb9-7ccb10157884" = "assets/fonts/src/" } + { "7dd7f2c6-dd27-49f6-ad02-1986ab6ccdf6" = "luxe: anim/material.wren" } + { "7df74b03-249b-42b0-b8e1-a2310e9dd45e" = "blocks/ui/scroll_box.wren" } + { "7f85cc45-a155-4704-8d43-7e0d31dd554f" = "luxe: render/font.wren" } + { "823564a1-4156-48c7-a08d-7f3af8b2de14" = "luxe: material/" } + { "83527e80-d6f9-49fd-81a3-a861cd359b1d" = "luxe: id.wren" } + { "84513e56-8c2c-4638-b983-dd6f651af88f" = "luxe: material/logo.sprite.material.lx" } + { "846f1ffc-30c8-4385-b97b-162466cfcc51" = "blocks/resources.wren" } + { "8479ffe5-6912-4fd1-bd04-c42222934166" = "luxe: sample/game.wren" } + { "850c027b-6078-4469-8b25-d417affce745" = "luxe: ui/field/" } + { "86dbccb1-8d56-48f2-8b2d-d0c9f82f92a3" = "luxe: modifier/tags.wren" } + { "87147b86-b359-4778-8d18-94d3e9d87724" = "assets/wip/Human.png" } + { "874d90cf-f01f-4d52-9cf4-9aee525d8b17" = "luxe: templates/sprite.prototype/" } + { "875f3021-6814-4c7e-a058-cbdc0cf5c7af" = "luxe: system/text.modifier.wren" } + { "878ea519-80a1-47a3-a707-d80b68a38a49" = "luxe: build/uis.wren" } + { "87d5973b-884c-465c-8041-d091000dcfb4" = "luxe: image/world.svg" } + { "87d7e88c-0846-49ab-8f37-ad18880623d8" = "luxe: build/types.wren" } + { "8809b3b8-bf0f-4767-85c5-6320dfbabb44" = "luxe: type/tiles.source.asset.wren" } + { "8a9e12ae-789e-4b67-b989-a0cae1c47abc" = "math/repVal.wren" } + { "8b203951-7b5d-4db8-840a-76f64d845222" = "luxe: type/font.asset.wren" } + { "8bb201c7-f43a-4e96-ac00-e5a5551d6091" = "luxe: build/wrenalyzer/chars.wren" } + { "8e04322a-fbf0-470a-96b2-8c85caa75289" = "luxe: asset/import/image.import.wren" } + { "8e636310-d6bd-4fb2-a44a-c62835072829" = "luxe: build/lxc.wren" } + { "8f7b157a-93e1-41b0-930c-617de5b143f9" = "luxe: bytes.wren" } + { "8fc7c8a8-b02e-4b16-8402-f92ee1c11b51" = "assets/wip/Needle.image.lx" } + { "9097f18b-77a2-47b0-88a8-0cc8ab78bc1f" = "luxe: build/wrenalyzer/source_file.wren" } + { "90d47128-2b14-4935-b962-abed58c72a7d" = "luxe: world/scene.wren" } + { "921c5576-434d-48b8-9ec6-38c6d81e687b" = "luxe: build/images.wren" } + { "9258d16f-6f4c-4cbc-adc8-1988096a24cb" = "luxe: asset/import/material.import.lx" } + { "92617ca3-b9b6-475a-b197-5aa505b067e5" = "luxe: build/wrenalyzer/resolver.wren" } + { "9396f5a6-305c-4aca-ac5a-d3944cc3eeca" = "luxe: astar.wren" } + { "9505e8fe-4235-4ad8-8190-c559174149d5" = "luxe: ui/editor.panel.outline.scene.ui.lx" } + { "95e47b5b-ce48-412f-8d1c-9dd22cac1d46" = "assets/wip/8Cross.image.lx" } + { "98e2a49b-90d8-49f3-81a7-f051a043af42" = "shaders/pixel_text.material_basis.lx" } + { "995fc5de-6799-4f8c-ae38-f37364a7a12c" = "luxe: ui/editor.panel.button.ui.lx" } + { "9990abd6-c8ca-4af0-9156-0b1863bf6212" = "blocks/human.wren" } + { "9a5148e1-0fdd-4141-ad85-22a382f3c516" = "luxe: build/wrenalyzer/token.wren" } + { "9a5fcd78-4241-4584-b205-78d6f94cc609" = "luxe: ui/field/path.wren" } + { "9a9e5edb-af69-4040-a83e-f8b5b583f533" = "luxe: image/template-closed.svg" } + { "9af8b96e-64eb-447d-bec3-0e491fd94287" = "luxe: type/asset.meta.asset.wren" } + { "9cc01d4f-ab7a-4eca-ab4b-bdea4471b3e1" = "luxe: string/po.wren" } + { "9ce88ce9-98ef-45fc-a53f-07776b6b96f7" = "luxe: ui/editor.panel.modifier.transform.ui.lx" } + { "9cf9ca22-aa54-46bb-911b-85f1d9b4fa0e" = "luxe: ui/editor.panel.label.ui.lx" } + { "9d55f7bb-2ba2-4258-a90c-a31da477f2c4" = "luxe: tiles/default.tiles_visual.lx" } + { "9ec008b9-2ea2-48d1-aad0-9100f2be27c9" = "luxe: build/tiles.wren" } + { "9fe35a23-539b-4236-80d1-f005a7be9e70" = "luxe: sample/sample.wren" } + { "a030818e-33e8-4e8a-9cba-20525372e74e" = "blocks/ui/number_field.wren" } + { "a16df612-f309-4d5b-8edf-0768e2b8eb74" = "luxe: io.wren" } + { "a1d5c153-8fcc-41cf-ac11-fa5614343050" = "shaders/pixel_text.emsl" } + { "a228a86b-ebac-4d72-b8e6-24f94d8a6c0b" = "luxe: type/prototype.asset.wren" } + { "a28e68d5-c304-4167-8205-6f29c8cfc189" = "luxe: image/empty.png" } + { "a291f9a3-bb44-44d9-9795-5660c4f1ca65" = "luxe: ui/control.wren" } + { "a3982fc6-5538-48e0-a47e-9662d59e0ae0" = "luxe: anim/sprite.wren" } + { "a46db0a8-a0d9-49b4-b156-38c8753076fa" = "luxe: ui/editor.panel.anim.sprite.value.settings.ui.lx" } + { "a4ba7441-c63d-4a0f-9e87-0a77eb7032f0" = "blocks/debug.wren" } + { "a4cd06dd-aa6d-42d8-826d-ace9915ae2c5" = "luxe: modifier/transform.wren" } + { "a4f0fe8b-2c7a-42cd-954e-b47af84f3467" = "luxe: material/luxe.char.material.lx" } + { "a4f826d8-3219-43a4-9d7e-6aef0d283442" = "assets/wip/8Head.png" } + { "a7441c5b-6582-4a39-b433-4dfe388b39b4" = "luxe: image/entity-1.svg" } + { "a7aee425-9e15-4859-a145-a0feaa95fe83" = "luxe: terminal.wren" } + { "a7e30304-4000-4ede-815f-f3f4da533139" = "luxe: material_basis/sprite.material_basis.lx" } + { "a828f382-ad35-4444-bed0-33096afabaf3" = "luxe: material_basis/font.material_basis.lx" } + { "a9062104-7db2-4698-bd56-80ea04bf0675" = "luxe: image/logo.sprite.image.lx" } + { "a90d864b-d821-4847-9488-a5f97a9776d8" = "luxe: render/" } + { "a92e79e3-54bc-441b-b28f-2bbfec9480d3" = "blocks/ui/ui.wren" } + { "a95df88f-98d8-4401-bf5b-0ec182f16590" = "luxe: material_basis/mesh_line.material_basis.lx" } + { "a9fdbeaf-ccf6-49d4-804d-c2922481c534" = "luxe: build/blocks.wren" } + { "abad1323-40fe-44d0-bdb3-15cba03fc07c" = "luxe: ui/label.wren" } + { "abd0f195-7eae-40b0-8ef7-a75f368222df" = "luxe: system/tiles.modifier.wren" } + { "ac33518d-5fca-413f-a6b7-f9e7ce42271f" = "luxe: image/logo.sprite.png" } + { "ac91dded-01ec-4999-8775-af82c1657591" = "luxe: type/tiles.asset.wren" } + { "ae7c5223-fc5f-4a3e-88cc-5e9b49f4f143" = "luxe: asset/import/image.import.lx" } + { "af99bd92-3b37-4d67-91af-0c22bdad1c8b" = "shaders/pixel_text_ui.material_basis.lx" } + { "af9d2350-b0e9-486e-8127-93e5e89f7311" = "blocks/ui/box.wren" } + { "b280c497-7ddc-430c-82f5-f7412622a255" = "luxe: image/close.image.lx" } + { "b3d8c6e4-c44b-4c4e-9779-f065deef19a5" = "luxe: ui/editor.panel.outline.entity.ui.lx" } + { "b43bbae1-852e-4241-b018-ac8e5a8c860c" = "assets/wip/SliderHandle.png" } + { "b51ffee6-a9cd-44da-bb03-6a5d855f760d" = "luxe: image/" } + { "b7913ebe-9ae9-4bea-9182-b236f977906a" = "luxe: ui/window.wren" } + { "b7d53e94-ca1e-42d4-aae4-e9795b0a4aec" = "luxe: fuzzy.wren" } + { "b8f5275d-bfc3-40d7-9c14-59d3f583aa2b" = "luxe: asset/import/material.import.wren" } + { "b9259fe0-72eb-4a26-885e-e0b23c3947a5" = "luxe: build/wrenalyzer/reporter.wren" } + { "ba5df728-f35e-4c16-b8ea-80b9c1f9a71e" = "luxe: type/tiles.visual.asset.wren" } + { "bbed69d1-40fe-477c-a348-b653fac545ae" = "luxe: type/material.asset.wren" } + { "bc9adffb-e731-4475-a9c8-550351d09091" = "luxe: templates/text.prototype/text.prototype.lx" } + { "bd93f564-5325-42bf-8d8f-4dac846270f2" = "luxe: draw.wren" } + { "bd9d5cf2-bd58-4cdb-8424-3d7bc15984a4" = "luxe: build/prototypes.wren" } + { "be5deb48-0e4e-4488-a714-07631ac8da5b" = "luxe: type/block_def.asset.wren" } + { "bf0dcdb1-7199-4dde-a888-356b28f9bec8" = "blocks/ui/compass.wren" } + { "bfdd97a1-2508-4900-836e-208f00850179" = "shaders/upscale.emsl" } + { "bfe1ba5f-2a76-48b5-a850-05f8954a638b" = "luxe: build/wrenalyzer/scope.wren" } + { "c0091a2f-3da9-4f7a-b2da-5c91cb2b5849" = "luxe: mat4.wren" } + { "c0bfbb6a-18ab-42e8-b4b8-011cac19e4c5" = "luxe: asset/import/atlas.import.lx" } + { "c1fb0b00-2a29-408c-88f7-ea819c87d7fd" = "blocks/narrative/diary/" } + { "c40e80ac-2b41-4730-a443-785ce9790f25" = "math/util.wren" } + { "c467f680-3c57-4607-a7a6-1cbd14bfd958" = "luxe: ui/panel.wren" } + { "c46acd19-747b-47f6-90dd-4f3295c85fc2" = "luxe: material_basis/mesh_solid.material_basis.lx" } + { "c4701c93-2460-41a7-91fa-4cd772cabb69" = "luxe: shaders.emsl" } + { "c50e9890-e65f-4295-a593-dd56822f05cd" = "blocks/ui/slider.wren" } + { "c565c5c6-3eff-473d-a433-292df1428a13" = "luxe: image/logo.image.lx" } + { "c6a1b577-dd93-4e8e-9657-efa069783f26" = "luxe: material_basis/sprite_outlined.material_basis.lx" } + { "c6a5c2f8-d7d4-4c98-9f8a-ef0486fad66d" = "luxe: image/select-siblings.svg" } + { "c6fa1f22-1c3d-4225-a485-ed5266ec1716" = "luxe: asset/import/mesh.import.lx" } + { "c7bdc1e2-7bf6-4f7b-a95b-6e9447f3cd16" = "luxe: build/wrenalyzer/parser.wren" } + { "c8dfa5c3-4909-4225-9af4-74114b9c4116" = "luxe: ui/editor.panel.modifier.values.ui.lx" } + { "cb0c18ec-7065-4c71-ac92-953ec798a6ec" = "luxe: image/edit.svg" } + { "cb9e5e49-4a1e-4e25-8a42-90ba77b9c1a4" = "luxe: material/mesh_solid.material.lx" } + { "ccff75d9-7834-44d3-a303-f42598ca5931" = "luxe: build/wrenalyzer/generate_ast.wren" } + { "cd6a4018-b635-478f-abd9-c9faabf00fd1" = "blocks/ui/" } + { "ce051a86-5de3-4e98-b278-4422165782ff" = "luxe: system/sprite.modifier.wren" } + { "ce88dab6-b9e0-46d8-bec4-dda5a90f4fb9" = "luxe: image/entity-0.svg" } + { "cef56cd9-cabd-4c02-a98f-c899b3a94d5a" = "luxe: image/luxe.char.png" } + { "cef7e256-a5c9-47ae-b81c-e529d48c7b8c" = "luxe: ui/editor.panel.modifier.tags.ui.lx" } + { "cf953544-8e72-4883-8eb6-21b8c0c2a2ce" = "luxe: build/compiler.wren" } + { "d0a92445-3038-4a35-91a9-cb50a8ed3f50" = "luxe: type/font.face.asset.wren" } + { "d0d5f754-c1f1-46cb-bf52-46f219b40adc" = "luxe: build/renders.wren" } + { "d0fd98e5-4ad8-45a5-8133-e6a37fb05a93" = "luxe: asset.wren" } + { "d16c7774-89ae-4832-b514-7611bd8a3657" = "luxe: type/font.face.otf.asset.wren" } + { "d1d3e880-e22f-461b-884f-04e371d834d1" = "luxe: ui/color_picker.wren" } + { "d2cd3cee-f3e1-4bb1-9afb-46aa71fbebbb" = "luxe: sat2D.wren" } + { "d3c73dc0-07be-4796-a489-bab975b462f4" = "luxe: build/reloader.wren" } + { "d4661f93-7612-4881-b555-63e178f5239e" = "math/time.wren" } + { "d60890f4-cd70-43b4-a6e0-647439c3f994" = "luxe: build/material_basis.wren" } + { "d74e573d-4c01-47ea-84bc-da452d74e3b0" = "luxe: asset/type.wren" } + { "d7645285-42e8-4279-825b-2a53a98eb645" = "luxe: containers.wren" } + { "d775591d-9486-476f-b37b-2927dad9921e" = "luxe: build/deploy/deploy.linux.wren" } + { "d77fb473-4736-4c4d-8eb3-51626ab7c518" = "luxe: asset/import/modifier.import.lx" } + { "d7bd684e-a6b6-4242-a1b5-ad899cd31263" = "blocks/narrative/time.wren" } + { "d832cf55-4532-4dd6-be0e-26a3712295ab" = "outline/" } + { "d949aa5b-3910-4aa3-9d7e-e2f606912c36" = "luxe: input.wren" } + { "d961f187-99ae-48c5-a095-1ebdfe99a374" = "luxe: asset/import/sprites.import.ui.lx" } + { "d9b348e8-afcc-4d1a-a929-f4c7ae63e2d4" = "assets/wip/Portrait.image.lx" } + { "db618085-af85-449c-a667-6b19217d0e04" = "luxe: system/values.modifier.wren" } + { "dbfbc81c-3a95-45af-911d-c8ab3f65b181" = "assets/wip/Knob3.png" } + { "dc1d02d2-8213-4113-a129-ed3f3eed953d" = "luxe: selection.wren" } + { "dd4a52f2-4ff3-471b-b20c-bb993e9d2daa" = "luxe: world.wren" } + { "ddcdb988-8e22-40f4-b873-720390886b87" = "luxe: topograph.wren" } + { "de055ceb-86e2-4380-9f9f-656b5017094c" = "luxe: type/" } + { "de391828-f015-4709-9382-153bcf71602c" = "luxe: tiles/default.tiles_source.lx" } + { "df3a3e57-5303-4da9-8833-f6f6e0b4b48f" = "luxe: material/mesh.debug.material.lx" } + { "dff35750-64c7-4b94-916c-428d10d6b111" = "shaders/clear.emsl" } + { "dffe6c9c-f637-4041-927c-b4a5651a4018" = "luxe: fonts/lato.font.lx" } + { "e1722296-a93a-4eaa-934c-737c8082e479" = "luxe: asset/import/sprite.import.lx" } + { "e194adea-a04c-4c7f-813b-c37806ee886c" = "math/observable.wren" } + { "e345f4df-d28c-45b2-bb79-c0e589169f5e" = "luxe: docgen.wren" } + { "e3f6c699-d7d7-4645-945b-43a84a1a101e" = "luxe: build/deploy/deploy.wren" } + { "e47dd647-4471-46be-92df-f65ace79dbf0" = "luxe: build/materials.wren" } + { "e4aa1eed-ed86-43a9-b3fd-d3098abcb800" = "assets/wip/8Cross.png" } + { "e50895d2-d01b-4cff-ae8a-9ca1b5fe760e" = "luxe: build/values.wren" } + { "e51c5c5d-1d2b-4d81-9e37-cf3454d21cf9" = "assets/wip/Needle.png" } + { "e639ebef-331c-4f19-ae6e-303050c9177c" = "blocks/narrative/progress/" } + { "e65142ec-0325-4243-baec-942172121c64" = "luxe: type/scene.asset.wren" } + { "e669bee9-79ca-48da-b617-4554eb541edc" = "luxe: material_basis/sprite_pixelated.material_basis.lx" } + { "e66c719b-c6c3-41f7-bc75-815a1a477e78" = "luxe: build/ast/wren.wren" } + { "e74126d5-03d4-476b-936a-39afc04e5107" = "luxe: templates/text.prototype/" } + { "e75a7dfd-fb6b-43dd-8f8d-97067812b4ef" = "luxe: assets.wren" } + { "e8525512-2e08-4bd9-b386-0f9c90e1d0f0" = "math/stringUtil.wren" } + { "e89daf91-d010-4eb5-8081-a29c2f5ee2e3" = "luxe: save.wren" } + { "e931603c-ac19-4006-8823-c139602603f3" = "luxe: material_basis/" } + { "e96c0392-234b-42a5-947e-bd34272024cb" = "luxe: material/font.material.lx" } + { "ea875785-8cd5-413b-9318-393b35540aab" = "blocks/ui/clickable.wren" } + { "eb0041fc-9f8a-4f08-8f3e-094fa3584c96" = "luxe: modifier/" } + { "ebfa7313-6631-45d2-90d1-d262f27444e5" = "luxe: modules/solver.wren" } + { "ee6285e3-5976-473c-91fa-20a10f9eabb8" = "luxe: material/solid.material.lx" } + { "ee9b4e04-aa71-4cbd-b5f2-5abfef8e0ac8" = "assets/wip/8Arrow.image.lx" } + { "eeef6d53-8844-4398-b3e7-0f0198b3ee50" = "luxe: render.wren" } + { "f0028ef4-01b0-4b66-ad2f-04ca8a91a236" = "luxe: ui/editor.panel.modifier.text.ui.lx" } + { "f18c71d8-3fed-4230-a75d-5bcfe5917937" = "blocks/human/human.modifier.wren" } + { "f1bb4dcb-2449-44d4-941b-e3286f0ac0d9" = "luxe: build/atlases.wren" } + { "f2651ca6-2eb5-4211-8315-6cb323f50679" = "assets/wip/Knob3.image.lx" } + { "f2e6a438-0ba5-4dd1-bb04-cc1e7bea1628" = "assets/wip/" } + { "f3c645a2-92ee-4f11-ae22-0e5835cc1a7e" = "luxe: material/sprite.solid.material.lx" } + { "f4679fb3-35c0-46fc-9dbe-a55f24c6ea58" = "assets/wip/Human.image.lx" } + { "f592eb6a-d70c-4074-b98b-b3605bb4ab33" = "math/vector.wren" } + { "f5ca5673-ba7d-41bf-b499-4f35a1f70938" = "math/event.wren" } + { "f5ecc6df-128b-47d1-a714-13141b885cd6" = "shaders/pixel_text_ui.material_basis.lx_uuu" } + { "f61a8386-bb8c-4ec8-a859-9f6be5ca4361" = "assets/fonts/BabyBlocksBigger.font.lx" } + { "f6663667-59d2-4f63-85e5-bf290a01f669" = "luxe: build/scenes.wren" } + { "f6e27f3a-da7d-4e90-a56c-173c75389372" = "luxe: build/skeletons.wren" } + { "f6eb7e87-792e-4735-86d7-0096ac3a1958" = "luxe: ui/editor.panel.anim.transform.settings.ui.lx" } + { "f7466cf5-5176-4c04-986b-9ffe7c934b7f" = "blocks/ui/simple_text.wren" } + { "f875cb4f-14b3-4bf2-82d6-fe4a80728352" = "blocks/narrative/diary/diary.wren" } + { "f8ee9496-b2ef-468f-abb3-5751cc996110" = "blocks/ui/adventure.wren" } + { "f9633aae-352d-4bcd-97a3-af037603b9e5" = "luxe: modifier/mesh.wren" } + { "fa6098c9-43fe-45d7-8a9f-ffd0f5f461ca" = "assets/materials/WipButton.material.lx" } + { "fac24071-24a1-4554-b20f-981e1664187c" = "blocks/narrative/progress/progress.wren" } + { "fac39060-d484-4269-83b7-e81d91866ab9" = "luxe: world/" } + { "fb040dae-4559-4b3c-b8e6-f4459c3c1ed0" = "luxe: anim/" } + { "fb606a2a-2b1b-4f70-bf36-0f1b4284f186" = "luxe: world/world.wren" } + { "fbbbf442-8a68-4e3b-bf60-23b8b559b9f7" = "luxe: build/anims.wren" } + { "fc150757-6536-4b94-971a-696ab7d7f5ab" = "luxe: ui/world.wren" } + { "fc483140-345a-4e4f-89c6-7c32c70552ff" = "luxe: fonts/Lato-Regular.face.lx" } + { "fc68b27b-561e-4002-87c3-1e9b7a80b444" = "luxe: modifier/sprite.wren" } + { "fd317e8b-fd5b-41d4-a20d-02be95fafe6e" = "luxe: audio.wren" } + { "fd9bb50e-f11b-46e4-96b6-7b0583f2ae17" = "luxe: image/luxe.char.image.lx" } + { "fe747c07-b68a-4f70-89e0-68770c98093f" = "luxe: modifier/text.wren" } + { "fe812f31-62f3-4c19-89ad-0ba87c12606a" = "luxe: material_basis/ui_mask.material_basis.lx" } + { "fe86391d-5703-45b7-9ded-bb4fd9609870" = "luxe: ui/field/vector.wren" } + { "fef9df70-b036-4ef4-a3dc-667036646d22" = "luxe: templates/" } + { "ff137c6d-5842-4cdf-a6a3-8c57180a5823" = "luxe: project/" } +] diff --git a/Luxe/project.modules.lx b/Luxe/luxe.project/modules.lx similarity index 54% rename from Luxe/project.modules.lx rename to Luxe/luxe.project/modules.lx index f064f8a..2ce9e6b 100644 --- a/Luxe/project.modules.lx +++ b/Luxe/luxe.project/modules.lx @@ -1,3 +1,3 @@ modules = { - luxe = "2021.0.0" + luxe = "dev" } //modules diff --git a/Luxe/luxe.project/version.lx b/Luxe/luxe.project/version.lx new file mode 100644 index 0000000..5820a72 --- /dev/null +++ b/Luxe/luxe.project/version.lx @@ -0,0 +1 @@ +version = "0.0.1" diff --git a/Luxe/math/event.wren b/Luxe/math/event.wren index eed82ef..7b0c73c 100644 --- a/Luxe/math/event.wren +++ b/Luxe/math/event.wren @@ -26,7 +26,7 @@ class Event{ removed = removed || _listeners.remove(id) removed = removed || _listenersOnce.remove(id) if(!removed){ - System.print("[warn] tried to remove unknown listener id") + Log.print("[warn] tried to remove unknown listener id") } } else if(id is Fn){ var removed = false @@ -39,12 +39,12 @@ class Event{ } } if(!removed){ - System.print("[warn] tried to remove unknown listener fn") + Log.print("[warn] tried to remove unknown listener fn") } } else if(id is ListenerToken) { id.discard() } else { - System.print("[warn] how is a %(id.type.name) related to the listener? pass the listener index or function.") + Log.print("[warn] how is a %(id.type.name) related to the listener? pass the listener index or function.") } } diff --git a/Luxe/math/event.wren.meta.lx b/Luxe/math/event.wren.meta.lx new file mode 100644 index 0000000..7830eaa --- /dev/null +++ b/Luxe/math/event.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f5ca5673-ba7d-41bf-b499-4f35a1f70938" diff --git a/Luxe/math/folder.meta.lx b/Luxe/math/folder.meta.lx new file mode 100644 index 0000000..c5a2ad0 --- /dev/null +++ b/Luxe/math/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "3c9e71a4-2fb6-4278-82a0-90034c3f38d4" diff --git a/Luxe/math/math.wren b/Luxe/math/math.wren index e800c01..2d0cf9a 100644 --- a/Luxe/math/math.wren +++ b/Luxe/math/math.wren @@ -82,7 +82,7 @@ class M{ return result } - System.print("can't clamp %(value.type) between %(min.type) and %(max.type)") + Log.print("can't clamp %(value.type) between %(min.type) and %(max.type)") return null } diff --git a/Luxe/math/math.wren.meta.lx b/Luxe/math/math.wren.meta.lx new file mode 100644 index 0000000..16e6861 --- /dev/null +++ b/Luxe/math/math.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "504ec597-12d2-4ad3-82dc-f9c4d98788f7" diff --git a/Luxe/math/observable.wren.meta.lx b/Luxe/math/observable.wren.meta.lx new file mode 100644 index 0000000..000eb61 --- /dev/null +++ b/Luxe/math/observable.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "e194adea-a04c-4c7f-813b-c37806ee886c" diff --git a/Luxe/math/rect.wren.meta.lx b/Luxe/math/rect.wren.meta.lx new file mode 100644 index 0000000..118c76b --- /dev/null +++ b/Luxe/math/rect.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "67f3ada5-3412-4b52-9bc4-5f891f534e0d" diff --git a/Luxe/math/repVal.wren.meta.lx b/Luxe/math/repVal.wren.meta.lx new file mode 100644 index 0000000..65ec983 --- /dev/null +++ b/Luxe/math/repVal.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "8a9e12ae-789e-4b67-b989-a0cae1c47abc" diff --git a/Luxe/math/stringUtil.wren.meta.lx b/Luxe/math/stringUtil.wren.meta.lx new file mode 100644 index 0000000..4e64857 --- /dev/null +++ b/Luxe/math/stringUtil.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "e8525512-2e08-4bd9-b386-0f9c90e1d0f0" diff --git a/Luxe/math/time.wren b/Luxe/math/time.wren index 4cdd353..c632862 100644 --- a/Luxe/math/time.wren +++ b/Luxe/math/time.wren @@ -121,7 +121,7 @@ class DateTime{ construct from_time(years, months, days, hours, minutes, seconds){ if(years < DateTime.epoch) { - System.print("[warn] dates before %(DateTime.epoch) aren't possible yet :(") + Log.print("[warn] dates before %(DateTime.epoch) aren't possible yet :(") return } for(i in DateTime.epoch...years){ diff --git a/Luxe/math/time.wren.meta.lx b/Luxe/math/time.wren.meta.lx new file mode 100644 index 0000000..435305a --- /dev/null +++ b/Luxe/math/time.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "d4661f93-7612-4881-b555-63e178f5239e" diff --git a/Luxe/math/util.wren b/Luxe/math/util.wren index 51e3861..5038517 100644 --- a/Luxe/math/util.wren +++ b/Luxe/math/util.wren @@ -64,7 +64,7 @@ class Util{ } else if(l == 9) { fn.call(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]) } else { - System.print("%(l) is too many arguments") + Log.print("%(l) is too many arguments") } } diff --git a/Luxe/math/util.wren.meta.lx b/Luxe/math/util.wren.meta.lx new file mode 100644 index 0000000..3981869 --- /dev/null +++ b/Luxe/math/util.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "c40e80ac-2b41-4730-a443-785ce9790f25" diff --git a/Luxe/math/vector.wren.meta.lx b/Luxe/math/vector.wren.meta.lx new file mode 100644 index 0000000..9c44299 --- /dev/null +++ b/Luxe/math/vector.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f592eb6a-d70c-4074-b98b-b3605bb4ab33" diff --git a/Luxe/outline/app.wren.meta.lx b/Luxe/outline/app.wren.meta.lx new file mode 100644 index 0000000..4f02e5a --- /dev/null +++ b/Luxe/outline/app.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "65a1d40f-4468-48eb-b2d2-273c71f65526" diff --git a/Luxe/outline/folder.meta.lx b/Luxe/outline/folder.meta.lx new file mode 100644 index 0000000..a7bbf5e --- /dev/null +++ b/Luxe/outline/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "d832cf55-4532-4dd6-be0e-26a3712295ab" diff --git a/Luxe/outline/inputs.input.lx.meta.lx b/Luxe/outline/inputs.input.lx.meta.lx new file mode 100644 index 0000000..426e35b --- /dev/null +++ b/Luxe/outline/inputs.input.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "4e9bb8c0-490d-4464-8349-7feeb3921574" diff --git a/Luxe/outline/renderer.wren b/Luxe/outline/renderer.wren index 55bf8df..0048c1b 100644 --- a/Luxe/outline/renderer.wren +++ b/Luxe/outline/renderer.wren @@ -41,7 +41,7 @@ class Renderer { _rt = Image.create(_desc) Render.define_resource(target, _rt) - System.print("game / render / init / ok") + Log.print("game / render / init / ok") } //new update_targets(){ @@ -50,7 +50,7 @@ class Renderer { _gameRes = window / _pixel_size _gameRes = _gameRes - _gameRes % 2 - System.print("game is now %(res.x) x %(res.y)") + Log.print("game is now %(res.x) x %(res.y)") Globals["GameRect"] = AABB.new((_gameRes.x - pixel_width) / 2, _gameRes.y - pixel_width, pixel_width, pixel_width) Globals["UiRect"] = AABB.new(0, 0, _gameRes.x, _gameRes.y - pixel_width) diff --git a/Luxe/outline/renderer.wren.meta.lx b/Luxe/outline/renderer.wren.meta.lx new file mode 100644 index 0000000..4298af5 --- /dev/null +++ b/Luxe/outline/renderer.wren.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "140edfe0-c94d-466a-b71d-aa4c908de163" diff --git a/Luxe/outline/settings.settings.lx.meta.lx b/Luxe/outline/settings.settings.lx.meta.lx new file mode 100644 index 0000000..d90619e --- /dev/null +++ b/Luxe/outline/settings.settings.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "5f71f82a-e194-4370-bc75-5eb0c44f3e2a" diff --git a/Luxe/project.luxe b/Luxe/project.luxe index 9073e37..19018e0 100644 --- a/Luxe/project.luxe +++ b/Luxe/project.luxe @@ -5,10 +5,9 @@ class Project is Entry { construct entry(target) { name = "Cabin Game" - version = "0.1" + version = "0.0.1" renderer = "outline/renderer" settings = "outline/settings" - } //new } //Project \ No newline at end of file diff --git a/Luxe/shaders/clear.emsl.meta.lx b/Luxe/shaders/clear.emsl.meta.lx new file mode 100644 index 0000000..03c1f76 --- /dev/null +++ b/Luxe/shaders/clear.emsl.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "dff35750-64c7-4b94-916c-428d10d6b111" diff --git a/Luxe/shaders/folder.meta.lx b/Luxe/shaders/folder.meta.lx new file mode 100644 index 0000000..3dd23c3 --- /dev/null +++ b/Luxe/shaders/folder.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "6274166e-dbf5-42cf-9007-1797c4a70690" diff --git a/Luxe/shaders/pixel_text.emsl.meta.lx b/Luxe/shaders/pixel_text.emsl.meta.lx new file mode 100644 index 0000000..3df4adb --- /dev/null +++ b/Luxe/shaders/pixel_text.emsl.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "a1d5c153-8fcc-41cf-ac11-fa5614343050" diff --git a/Luxe/shaders/pixel_text.material_basis.lx b/Luxe/shaders/pixel_text.material_basis.lx index a7520c0..b120b4a 100644 --- a/Luxe/shaders/pixel_text.material_basis.lx +++ b/Luxe/shaders/pixel_text.material_basis.lx @@ -25,56 +25,56 @@ material_basis = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page1 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page2 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page3 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page4 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page5 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page6 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } font.page7 = { type = "image" value = { type = "image2D" - sampler_state = "linear_repeat" + sampler_state = "nearest_clamp" } } // font.pages = { diff --git a/Luxe/shaders/pixel_text.material_basis.lx.meta.lx b/Luxe/shaders/pixel_text.material_basis.lx.meta.lx new file mode 100644 index 0000000..d419662 --- /dev/null +++ b/Luxe/shaders/pixel_text.material_basis.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "98e2a49b-90d8-49f3-81a7-f051a043af42" diff --git a/Luxe/shaders/pixel_text_ui.emsl b/Luxe/shaders/pixel_text_ui.emsl index 5740566..b2b3a30 100644 --- a/Luxe/shaders/pixel_text_ui.emsl +++ b/Luxe/shaders/pixel_text_ui.emsl @@ -109,7 +109,7 @@ stage fragment frag( if(outside_mask) { discard; // stage.color[0] = float4(1,0.2,0.3,1); - return; + //return; } float4 mask = texture(input.ui.tex_mask, in.mask_uv); @@ -127,7 +127,7 @@ stage fragment frag( if(my_clip != 0 && mask_clip < my_clip) { discard; // stage.color[0] = float4(0,1,1,0.2); - return; + //return; } int page = int(in.page); diff --git a/Luxe/shaders/pixel_text_ui.emsl.meta.lx b/Luxe/shaders/pixel_text_ui.emsl.meta.lx new file mode 100644 index 0000000..2b1f084 --- /dev/null +++ b/Luxe/shaders/pixel_text_ui.emsl.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "51b27bf3-812f-4f7d-9354-c91f99c34546" diff --git a/Luxe/shaders/pixel_text_ui.material_basis.lx.meta.lx b/Luxe/shaders/pixel_text_ui.material_basis.lx.meta.lx new file mode 100644 index 0000000..edea37f --- /dev/null +++ b/Luxe/shaders/pixel_text_ui.material_basis.lx.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "af99bd92-3b37-4d67-91af-0c22bdad1c8b" diff --git a/Luxe/shaders/pixel_text_ui.material_basis.lx b/Luxe/shaders/pixel_text_ui.material_basis.lx_uuu similarity index 96% rename from Luxe/shaders/pixel_text_ui.material_basis.lx rename to Luxe/shaders/pixel_text_ui.material_basis.lx_uuu index 0b1bfee..b73c52a 100644 --- a/Luxe/shaders/pixel_text_ui.material_basis.lx +++ b/Luxe/shaders/pixel_text_ui.material_basis.lx_uuu @@ -1,130 +1,130 @@ -material_basis = { - vertex_format = "luxe.ui_font" - shaders = { - vertex = { library="shaders/pixel_text_ui" function="vert" } - fragment = { library="shaders/pixel_text_ui" function="frag" } - } - depth_test = true - depth_write = true - depth_compare = "less_equal" - stencil_test = false - write_mask = { red=true green=true blue=true alpha=true } - blending = true - alpha_blend = "add" - rgb_blend = "add" - src_alpha = "source_alpha" - src_rgb = "source_alpha" - dest_alpha = "one_minus_source_alpha" - dest_rgb = "one_minus_source_alpha" - blend_color = [0 0 0 0] - cull = "none" - winding = "counter_clockwise" - layers = ["default"] - inputs = { - ui.tex_mask = { - type = "image" - value = { - type = "image2D" - sampler_state = "nearest_clamp" - } - } - font.page0 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page1 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page2 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page3 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page4 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page5 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page6 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - font.page7 = { - type = "image" - value = { - type = "image2D" - sampler_state = "linear_repeat" - } - } - // font.pages = { - // type = "image" - // count = 8 - // value = [ - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // { - // type = "image2D" - // sampler_state = "linear_repeat" - // } - // ] - // } - ui.canvas_size = { - type = "float2" - value = [1 1] - } - } +material_basis = { + vertex_format = "luxe.ui_font" + shaders = { + vertex = { library="shaders/pixel_text_ui" function="vert" } + fragment = { library="shaders/pixel_text_ui" function="frag" } + } + depth_test = true + depth_write = true + depth_compare = "less_equal" + stencil_test = false + write_mask = { red=true green=true blue=true alpha=true } + blending = true + alpha_blend = "add" + rgb_blend = "add" + src_alpha = "source_alpha" + src_rgb = "source_alpha" + dest_alpha = "one_minus_source_alpha" + dest_rgb = "one_minus_source_alpha" + blend_color = [0 0 0 0] + cull = "none" + winding = "counter_clockwise" + layers = ["default"] + inputs = { + ui.tex_mask = { + type = "image" + value = { + type = "image2D" + sampler_state = "nearest_clamp" + } + } + font.page0 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page1 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page2 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page3 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page4 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page5 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page6 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + font.page7 = { + type = "image" + value = { + type = "image2D" + sampler_state = "linear_repeat" + } + } + // font.pages = { + // type = "image" + // count = 8 + // value = [ + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // { + // type = "image2D" + // sampler_state = "linear_repeat" + // } + // ] + // } + ui.canvas_size = { + type = "float2" + value = [1 1] + } + } } \ No newline at end of file diff --git a/Luxe/shaders/pixel_text_ui.material_basis.lx_uuu.meta.lx b/Luxe/shaders/pixel_text_ui.material_basis.lx_uuu.meta.lx new file mode 100644 index 0000000..78a631e --- /dev/null +++ b/Luxe/shaders/pixel_text_ui.material_basis.lx_uuu.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "f5ecc6df-128b-47d1-a714-13141b885cd6" diff --git a/Luxe/shaders/upscale.emsl.meta.lx b/Luxe/shaders/upscale.emsl.meta.lx new file mode 100644 index 0000000..9083ce3 --- /dev/null +++ b/Luxe/shaders/upscale.emsl.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "bfdd97a1-2508-4900-836e-208f00850179" diff --git a/Luxe/shaders/wip_button.emsl.meta.lx b/Luxe/shaders/wip_button.emsl.meta.lx new file mode 100644 index 0000000..f806399 --- /dev/null +++ b/Luxe/shaders/wip_button.emsl.meta.lx @@ -0,0 +1,2 @@ +tags = [] +uuid = "1356b469-4d46-4065-8dc0-504e105819f4"