From a79ae2402b516d29fd15269e5da6a89a2810ab5d Mon Sep 17 00:00:00 2001 From: karl Date: Fri, 22 Nov 2019 12:15:51 +0100 Subject: [PATCH] Move materials to their own top-level folder --- Characters/Player/UI/UI.tscn | 3 ++- Level/Machinations/FactoryGameplay.tscn | 2 +- {Things/ReusableMaterials => Materials}/Glow.tres | 0 .../Pipe_Dream.tres | 0 .../Textures}/pillLevel_fill.png | Bin .../Textures}/pillLevel_fill.png.import | 6 +++--- Things/Door/Door.tscn | 3 ++- Things/Key/Key.tscn | 3 ++- Things/Keycard/Keycard.tscn | 13 ++++++------- Things/Lever/Lever.tscn | 3 ++- Things/Pipes/EckiPipe.tscn | 3 ++- Things/Pipes/StraightForkPipe.tscn | 3 ++- Things/Pipes/StraightPipe.tscn | 3 ++- 13 files changed, 24 insertions(+), 18 deletions(-) rename {Things/ReusableMaterials => Materials}/Glow.tres (100%) rename {Things/ReusableMaterials => Materials}/Pipe_Dream.tres (100%) rename {Things/ReusableMaterials => Resources/Textures}/pillLevel_fill.png (100%) rename {Things/ReusableMaterials => Resources/Textures}/pillLevel_fill.png.import (66%) diff --git a/Characters/Player/UI/UI.tscn b/Characters/Player/UI/UI.tscn index 52126ae..df31ff1 100644 --- a/Characters/Player/UI/UI.tscn +++ b/Characters/Player/UI/UI.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Characters/Player/UI/UI.gd" type="Script" id=1] -[ext_resource path="res://Things/ReusableMaterials/pillLevel_fill.png" type="Texture" id=2] +[ext_resource path="res://Resources/Textures/pillLevel_fill.png" type="Texture" id=2] + [node name="HUD" type="Control"] anchor_right = 1.0 diff --git a/Level/Machinations/FactoryGameplay.tscn b/Level/Machinations/FactoryGameplay.tscn index 5ffb44d..e22be2b 100644 --- a/Level/Machinations/FactoryGameplay.tscn +++ b/Level/Machinations/FactoryGameplay.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://Level/Machinations/PipeGame.gd" type="Script" id=1] [ext_resource path="res://Things/Pipes/EckiPipe.tscn" type="PackedScene" id=2] -[ext_resource path="res://Things/ReusableMaterials/Pipe_Dream.tres" type="Material" id=3] +[ext_resource path="res://Materials/Pipe_Dream.tres" type="Material" id=3] [ext_resource path="res://Things/Pipes/StraightPipe.tscn" type="PackedScene" id=4] [ext_resource path="res://Things/Pipes/StraightForkPipe.tscn" type="PackedScene" id=5] [ext_resource path="res://Things/Lever/Lever.tscn" type="PackedScene" id=6] diff --git a/Things/ReusableMaterials/Glow.tres b/Materials/Glow.tres similarity index 100% rename from Things/ReusableMaterials/Glow.tres rename to Materials/Glow.tres diff --git a/Things/ReusableMaterials/Pipe_Dream.tres b/Materials/Pipe_Dream.tres similarity index 100% rename from Things/ReusableMaterials/Pipe_Dream.tres rename to Materials/Pipe_Dream.tres diff --git a/Things/ReusableMaterials/pillLevel_fill.png b/Resources/Textures/pillLevel_fill.png similarity index 100% rename from Things/ReusableMaterials/pillLevel_fill.png rename to Resources/Textures/pillLevel_fill.png diff --git a/Things/ReusableMaterials/pillLevel_fill.png.import b/Resources/Textures/pillLevel_fill.png.import similarity index 66% rename from Things/ReusableMaterials/pillLevel_fill.png.import rename to Resources/Textures/pillLevel_fill.png.import index 276d2a2..e7ce56d 100644 --- a/Things/ReusableMaterials/pillLevel_fill.png.import +++ b/Resources/Textures/pillLevel_fill.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/pillLevel_fill.png-fdb431190d360a95b9350b24d68930cb.stex" +path="res://.import/pillLevel_fill.png-6a491fb74599bcf3a4bd9c492369d636.stex" metadata={ "vram_texture": false } [deps] -source_file="res://Things/ReusableMaterials/pillLevel_fill.png" -dest_files=[ "res://.import/pillLevel_fill.png-fdb431190d360a95b9350b24d68930cb.stex" ] +source_file="res://Resources/Textures/pillLevel_fill.png" +dest_files=[ "res://.import/pillLevel_fill.png-6a491fb74599bcf3a4bd9c492369d636.stex" ] [params] diff --git a/Things/Door/Door.tscn b/Things/Door/Door.tscn index 66c01fe..89ed1da 100644 --- a/Things/Door/Door.tscn +++ b/Things/Door/Door.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://Things/Door/Door.gd" type="Script" id=1] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=2] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=2] + [sub_resource type="CubeMesh" id=1] diff --git a/Things/Key/Key.tscn b/Things/Key/Key.tscn index 558fe86..155b3f7 100644 --- a/Things/Key/Key.tscn +++ b/Things/Key/Key.tscn @@ -2,10 +2,11 @@ [ext_resource path="res://Things/Key/Key.gd" type="Script" id=1] [ext_resource path="res://Resources/Models/key/Material.material" type="Material" id=2] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] [ext_resource path="res://Resources/Models/key/key.dae" type="PackedScene" id=4] + [sub_resource type="ArrayMesh" id=1] resource_name = "Cube.001" surfaces/0 = { diff --git a/Things/Keycard/Keycard.tscn b/Things/Keycard/Keycard.tscn index 7443d09..0141046 100644 --- a/Things/Keycard/Keycard.tscn +++ b/Things/Keycard/Keycard.tscn @@ -3,14 +3,13 @@ [ext_resource path="res://Things/Keycard/Keycard.gd" type="Script" id=1] [ext_resource path="res://Resources/Models/keycard/Material_002.material" type="Material" id=2] [ext_resource path="res://Resources/Models/keycard/Material.material" type="Material" id=3] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=4] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=4] [ext_resource path="res://Resources/Models/keycard/keycard.dae" type="PackedScene" id=5] - [sub_resource type="ArrayMesh" id=1] resource_name = "Cube" surfaces/0 = { -"aabb": AABB( 1, -1, -1, 1.00136e-005, 2, 2.00001 ), +"aabb": AABB( 1, -1, -1, 1.00136e-05, 2, 2.00001 ), "array_data": PoolByteArray( 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 51, 59, 0, 0, 128, 63, 0, 0, 128, 191, 129, 202, 89, 63, 127, 0, 0, 0, 0, 0, 129, 127, 198, 44, 0, 60, 0, 0, 128, 63, 0, 0, 128, 191, 154, 153, 89, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 60, 0, 0, 128, 63, 205, 204, 76, 191, 0, 0, 128, 191, 127, 0, 0, 0, 0, 0, 129, 127, 0, 60, 51, 59, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 191, 127, 0, 0, 0, 0, 0, 130, 127, 0, 60, 102, 46, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 154, 153, 89, 63, 127, 0, 0, 0, 0, 0, 129, 127, 204, 44, 0, 0, 0, 0, 128, 63, 205, 204, 76, 63, 0, 0, 128, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 102, 46 ), "array_index_data": PoolByteArray( 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 3, 0, 3, 0, 0, 0, 4, 0, 4, 0, 6, 0, 5, 0, 6, 0, 4, 0, 7, 0, 7, 0, 4, 0, 0, 0 ), "blend_shape_data": [ ], @@ -36,7 +35,7 @@ surfaces/1 = { "vertex_count": 42 } -[sub_resource type="ArrayMesh" id=3] +[sub_resource type="ArrayMesh" id=2] surfaces/0 = { "aabb": AABB( -1.06509, -1.07632, -1.07551, 2.13023, 2.15263, 2.15104 ), "array_data": PoolByteArray( 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 51, 59, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 127, 0, 0, 0, 0, 0, 129, 127, 198, 44, 0, 60, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 127, 0, 0, 0, 0, 0, 129, 127, 0, 60, 51, 59, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 127, 0, 0, 0, 0, 0, 130, 127, 0, 60, 102, 46, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 127, 0, 0, 0, 0, 0, 129, 127, 102, 59, 0, 0, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 127, 0, 0, 0, 0, 0, 129, 127, 204, 44, 0, 0, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 127, 0, 0, 0, 0, 0, 129, 127, 0, 0, 102, 46, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 58, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 0, 76, 101, 0, 126, 250, 4, 129, 0, 57, 0, 56, 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 56, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 0, 127, 0, 127, 0, 0, 129, 0, 0, 0, 60, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 54, 0, 52, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 57, 0, 52, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 191, 76, 170, 137, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 57, 0, 52, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 54, 104, 48, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 0, 180, 155, 0, 127, 0, 0, 127, 0, 54, 0, 52, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 57, 117, 38, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 0, 0, 60, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 0, 180, 101, 0, 126, 0, 0, 129, 0, 54, 130, 38, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 130, 38, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 0, 0, 60, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 129, 0, 0, 126, 0, 0, 127, 0, 57, 117, 38, 4, 85, 136, 191, 185, 204, 78, 191, 76, 170, 137, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 54, 0, 52, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 54, 104, 48, 155, 225, 135, 191, 155, 225, 135, 191, 22, 255, 101, 63, 129, 0, 0, 0, 0, 10, 130, 127, 0, 54, 130, 38, 187, 224, 135, 63, 187, 224, 135, 63, 95, 52, 102, 191, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 63, 191, 196, 137, 63, 79, 164, 94, 63, 0, 76, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 4, 85, 136, 63, 107, 204, 86, 63, 4, 85, 136, 63, 0, 0, 127, 0, 99, 79, 0, 127, 0, 57, 0, 58, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 0, 0, 129, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 63, 185, 204, 78, 63, 76, 170, 137, 191, 0, 76, 155, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 63, 191, 196, 137, 191, 79, 164, 94, 191, 0, 180, 155, 0, 125, 14, 246, 129, 0, 0, 0, 60, 146, 224, 135, 63, 198, 225, 135, 191, 20, 99, 102, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 57, 117, 38, 14, 86, 136, 63, 174, 199, 78, 191, 170, 169, 137, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 0, 181, 101, 0, 127, 0, 0, 129, 0, 0, 0, 60, 187, 224, 135, 191, 187, 224, 135, 191, 95, 52, 102, 191, 0, 129, 0, 0, 237, 0, 131, 129, 0, 54, 104, 48, 251, 83, 136, 191, 199, 209, 78, 191, 237, 170, 137, 63, 129, 0, 0, 0, 0, 126, 8, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 63, 129, 0, 0, 0, 0, 59, 112, 129, 0, 57, 0, 56, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 63, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 187, 224, 135, 191, 191, 196, 137, 63, 79, 164, 94, 191, 129, 0, 0, 0, 127, 0, 0, 127, 0, 0, 0, 60, 4, 85, 136, 191, 107, 204, 86, 63, 4, 85, 136, 191, 129, 0, 0, 0, 0, 59, 112, 129, 0, 0, 0, 60 ), @@ -49,7 +48,7 @@ surfaces/0 = { "vertex_count": 50 } -[sub_resource type="BoxShape" id=2] +[sub_resource type="BoxShape" id=3] [node name="Keycard" type="StaticBody" groups=[ "Touchables", @@ -65,7 +64,7 @@ material/1 = null [node name="Outline" type="MeshInstance" parent="KeycardModel"] visible = false -mesh = SubResource( 3 ) +mesh = SubResource( 2 ) material/0 = ExtResource( 4 ) [node name="weirdModel" parent="." instance=ExtResource( 5 )] @@ -74,4 +73,4 @@ visible = false [node name="CollisionShape" type="CollisionShape" parent="."] transform = Transform( 0.02, 0, 0, 0, 0.08, 0, 0, 0, 0.12, 0, 0, 0 ) -shape = SubResource( 2 ) +shape = SubResource( 3 ) diff --git a/Things/Lever/Lever.tscn b/Things/Lever/Lever.tscn index 3b8679c..7765602 100644 --- a/Things/Lever/Lever.tscn +++ b/Things/Lever/Lever.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://Things/Lever/Lever.gd" type="Script" id=1] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=2] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=2] + [sub_resource type="CubeMesh" id=1] diff --git a/Things/Pipes/EckiPipe.tscn b/Things/Pipes/EckiPipe.tscn index 95b7366..de1c7f7 100644 --- a/Things/Pipes/EckiPipe.tscn +++ b/Things/Pipes/EckiPipe.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Resources/Models/eckiPipe/Material.material" type="Material" id=2] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] + [sub_resource type="ArrayMesh" id=1] diff --git a/Things/Pipes/StraightForkPipe.tscn b/Things/Pipes/StraightForkPipe.tscn index 9fbf2ce..0f06aac 100644 --- a/Things/Pipes/StraightForkPipe.tscn +++ b/Things/Pipes/StraightForkPipe.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Resources/Models/straightForkPipe/Material_001.material" type="Material" id=2] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] + [sub_resource type="ArrayMesh" id=1] diff --git a/Things/Pipes/StraightPipe.tscn b/Things/Pipes/StraightPipe.tscn index 9f315a8..9bac312 100644 --- a/Things/Pipes/StraightPipe.tscn +++ b/Things/Pipes/StraightPipe.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Resources/Models/straightPipe/Material_001.material" type="Material" id=2] -[ext_resource path="res://Things/ReusableMaterials/Glow.tres" type="Material" id=3] +[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] + [sub_resource type="ArrayMesh" id=1]