From 42fd81b914e864cc640c266093d14c413a3a1cfe Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Wed, 17 Jun 2020 17:31:12 +0200 Subject: [PATCH] organize assets folder --- .../{ => artworks}/escher_convex_concave.jpg | Bin .../escher_convex_concave.jpg.import | 6 ++-- assets/{ => artworks}/escher_lizards.jpg | Bin .../escher_lizards.jpg.import} | 6 ++-- assets/{ => artworks}/hokusai.jpg | Bin assets/{ => artworks}/hokusai.jpg.import | 6 ++-- assets/{ => logo}/logo.svg | 0 .../logo.svg.import} | 6 ++-- assets/{ => logo}/logo_512.png | Bin .../logo_512.png.import} | 6 ++-- assets/{ => logo}/logo_android_192.png | Bin assets/logo/logo_android_192.png.import | 34 ++++++++++++++++++ assets/{ => logo}/logo_android_bg_432.png | Bin .../{ => logo}/logo_android_bg_432.png.import | 6 ++-- assets/{ => logo}/logo_android_fg_432.png | Bin .../{ => logo}/logo_android_fg_432.png.import | 6 ++-- src/Piece.tscn | 5 +-- src/Taquin.tscn | 2 +- 18 files changed, 59 insertions(+), 24 deletions(-) rename assets/{ => artworks}/escher_convex_concave.jpg (100%) rename assets/{ => artworks}/escher_convex_concave.jpg.import (65%) rename assets/{ => artworks}/escher_lizards.jpg (100%) rename assets/{logo_android_192.png.import => artworks/escher_lizards.jpg.import} (67%) rename assets/{ => artworks}/hokusai.jpg (100%) rename assets/{ => artworks}/hokusai.jpg.import (70%) rename assets/{ => logo}/logo.svg (100%) rename assets/{logo_512.png.import => logo/logo.svg.import} (70%) rename assets/{ => logo}/logo_512.png (100%) rename assets/{escher_lizards.jpg.import => logo/logo_512.png.import} (68%) rename assets/{ => logo}/logo_android_192.png (100%) create mode 100644 assets/logo/logo_android_192.png.import rename assets/{ => logo}/logo_android_bg_432.png (100%) rename assets/{ => logo}/logo_android_bg_432.png.import (66%) rename assets/{ => logo}/logo_android_fg_432.png (100%) rename assets/{ => logo}/logo_android_fg_432.png.import (66%) diff --git a/assets/escher_convex_concave.jpg b/assets/artworks/escher_convex_concave.jpg similarity index 100% rename from assets/escher_convex_concave.jpg rename to assets/artworks/escher_convex_concave.jpg diff --git a/assets/escher_convex_concave.jpg.import b/assets/artworks/escher_convex_concave.jpg.import similarity index 65% rename from assets/escher_convex_concave.jpg.import rename to assets/artworks/escher_convex_concave.jpg.import index 0c1f44d..1d12d7a 100644 --- a/assets/escher_convex_concave.jpg.import +++ b/assets/artworks/escher_convex_concave.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/escher_convex_concave.jpg-493a4b3d286c5a35b8ae5646f4eba464.stex" +path="res://.import/escher_convex_concave.jpg-aad7b984721eed80e7b3645478172e11.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/escher_convex_concave.jpg" -dest_files=[ "res://.import/escher_convex_concave.jpg-493a4b3d286c5a35b8ae5646f4eba464.stex" ] +source_file="res://assets/artworks/escher_convex_concave.jpg" +dest_files=[ "res://.import/escher_convex_concave.jpg-aad7b984721eed80e7b3645478172e11.stex" ] [params] diff --git a/assets/escher_lizards.jpg b/assets/artworks/escher_lizards.jpg similarity index 100% rename from assets/escher_lizards.jpg rename to assets/artworks/escher_lizards.jpg diff --git a/assets/logo_android_192.png.import b/assets/artworks/escher_lizards.jpg.import similarity index 67% rename from assets/logo_android_192.png.import rename to assets/artworks/escher_lizards.jpg.import index dbe161e..ae769b0 100644 --- a/assets/logo_android_192.png.import +++ b/assets/artworks/escher_lizards.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/logo_android_192.png-1220f84fba9a9fba0e7f4c4957357ec2.stex" +path="res://.import/escher_lizards.jpg-6d8ffd09737747dd30c293cf429cf003.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/logo_android_192.png" -dest_files=[ "res://.import/logo_android_192.png-1220f84fba9a9fba0e7f4c4957357ec2.stex" ] +source_file="res://assets/artworks/escher_lizards.jpg" +dest_files=[ "res://.import/escher_lizards.jpg-6d8ffd09737747dd30c293cf429cf003.stex" ] [params] diff --git a/assets/hokusai.jpg b/assets/artworks/hokusai.jpg similarity index 100% rename from assets/hokusai.jpg rename to assets/artworks/hokusai.jpg diff --git a/assets/hokusai.jpg.import b/assets/artworks/hokusai.jpg.import similarity index 70% rename from assets/hokusai.jpg.import rename to assets/artworks/hokusai.jpg.import index 5ab0d8e..718b5f2 100644 --- a/assets/hokusai.jpg.import +++ b/assets/artworks/hokusai.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/hokusai.jpg-83f17a2183b2fd26b068c7dcded990a8.stex" +path="res://.import/hokusai.jpg-e34bef5c2c01e91fd3f7fbd65bf1bb63.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/hokusai.jpg" -dest_files=[ "res://.import/hokusai.jpg-83f17a2183b2fd26b068c7dcded990a8.stex" ] +source_file="res://assets/artworks/hokusai.jpg" +dest_files=[ "res://.import/hokusai.jpg-e34bef5c2c01e91fd3f7fbd65bf1bb63.stex" ] [params] diff --git a/assets/logo.svg b/assets/logo/logo.svg similarity index 100% rename from assets/logo.svg rename to assets/logo/logo.svg diff --git a/assets/logo_512.png.import b/assets/logo/logo.svg.import similarity index 70% rename from assets/logo_512.png.import rename to assets/logo/logo.svg.import index ff4c8a2..0bf65f7 100644 --- a/assets/logo_512.png.import +++ b/assets/logo/logo.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/logo_512.png-0ff81bcb56b31aba7470bed308e2a1d9.stex" +path="res://.import/logo.svg-f0fea7f4c0900e3cf3563bd5e43c48d1.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/logo_512.png" -dest_files=[ "res://.import/logo_512.png-0ff81bcb56b31aba7470bed308e2a1d9.stex" ] +source_file="res://assets/logo/logo.svg" +dest_files=[ "res://.import/logo.svg-f0fea7f4c0900e3cf3563bd5e43c48d1.stex" ] [params] diff --git a/assets/logo_512.png b/assets/logo/logo_512.png similarity index 100% rename from assets/logo_512.png rename to assets/logo/logo_512.png diff --git a/assets/escher_lizards.jpg.import b/assets/logo/logo_512.png.import similarity index 68% rename from assets/escher_lizards.jpg.import rename to assets/logo/logo_512.png.import index 7141713..1aa8a6a 100644 --- a/assets/escher_lizards.jpg.import +++ b/assets/logo/logo_512.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/escher_lizards.jpg-7c78103b5c79b51d60a6549be5e01a43.stex" +path="res://.import/logo_512.png-52e0380d6068282002ce7e4da540a4c8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/escher_lizards.jpg" -dest_files=[ "res://.import/escher_lizards.jpg-7c78103b5c79b51d60a6549be5e01a43.stex" ] +source_file="res://assets/logo/logo_512.png" +dest_files=[ "res://.import/logo_512.png-52e0380d6068282002ce7e4da540a4c8.stex" ] [params] diff --git a/assets/logo_android_192.png b/assets/logo/logo_android_192.png similarity index 100% rename from assets/logo_android_192.png rename to assets/logo/logo_android_192.png diff --git a/assets/logo/logo_android_192.png.import b/assets/logo/logo_android_192.png.import new file mode 100644 index 0000000..ab9f3a5 --- /dev/null +++ b/assets/logo/logo_android_192.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/logo_android_192.png-d1092f8bdc9b8ae234b5684d3089068d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/logo/logo_android_192.png" +dest_files=[ "res://.import/logo_android_192.png-d1092f8bdc9b8ae234b5684d3089068d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/logo_android_bg_432.png b/assets/logo/logo_android_bg_432.png similarity index 100% rename from assets/logo_android_bg_432.png rename to assets/logo/logo_android_bg_432.png diff --git a/assets/logo_android_bg_432.png.import b/assets/logo/logo_android_bg_432.png.import similarity index 66% rename from assets/logo_android_bg_432.png.import rename to assets/logo/logo_android_bg_432.png.import index 6137c1e..74d2bb9 100644 --- a/assets/logo_android_bg_432.png.import +++ b/assets/logo/logo_android_bg_432.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/logo_android_bg_432.png-3d49736cb9d22a590bdb12d866542e63.stex" +path="res://.import/logo_android_bg_432.png-bed8240198b34da49346f00ca02dd189.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/logo_android_bg_432.png" -dest_files=[ "res://.import/logo_android_bg_432.png-3d49736cb9d22a590bdb12d866542e63.stex" ] +source_file="res://assets/logo/logo_android_bg_432.png" +dest_files=[ "res://.import/logo_android_bg_432.png-bed8240198b34da49346f00ca02dd189.stex" ] [params] diff --git a/assets/logo_android_fg_432.png b/assets/logo/logo_android_fg_432.png similarity index 100% rename from assets/logo_android_fg_432.png rename to assets/logo/logo_android_fg_432.png diff --git a/assets/logo_android_fg_432.png.import b/assets/logo/logo_android_fg_432.png.import similarity index 66% rename from assets/logo_android_fg_432.png.import rename to assets/logo/logo_android_fg_432.png.import index 3f5d2ce..6abda99 100644 --- a/assets/logo_android_fg_432.png.import +++ b/assets/logo/logo_android_fg_432.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/logo_android_fg_432.png-226bb9b0d358740d3f48e34754ed5e2e.stex" +path="res://.import/logo_android_fg_432.png-41c23e93a296f808ef139e74532dbbec.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/logo_android_fg_432.png" -dest_files=[ "res://.import/logo_android_fg_432.png-226bb9b0d358740d3f48e34754ed5e2e.stex" ] +source_file="res://assets/logo/logo_android_fg_432.png" +dest_files=[ "res://.import/logo_android_fg_432.png-41c23e93a296f808ef139e74532dbbec.stex" ] [params] diff --git a/src/Piece.tscn b/src/Piece.tscn index 17ba4b2..8055fa6 100644 --- a/src/Piece.tscn +++ b/src/Piece.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=19 format=2] [ext_resource path="res://src/Piece.gd" type="Script" id=1] -[ext_resource path="res://assets/escher_lizards.jpg" type="Texture" id=2] +[ext_resource path="res://assets/artworks/escher_lizards.jpg" type="Texture" id=3] [sub_resource type="VisualShaderNodeExpression" id=1] output_port_for_preview = 0 @@ -253,10 +253,11 @@ shader = SubResource( 15 ) shader_param/reflection = false shader_param/scale = Vector3( 0.25, 0.25, 1 ) shader_param/offset = Vector3( 0, 0, 0 ) +shader_param/artwork = ExtResource( 3 ) [node name="Piece" type="Node2D"] script = ExtResource( 1 ) -texture = ExtResource( 2 ) +texture = ExtResource( 3 ) [node name="ColorRect" type="ColorRect" parent="."] material = SubResource( 16 ) diff --git a/src/Taquin.tscn b/src/Taquin.tscn index 8672b56..b62bd23 100644 --- a/src/Taquin.tscn +++ b/src/Taquin.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://src/Piece.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/sounds/PM_BBI_Bullet_Impact_Hit_Body_Flesh_2.wav" type="AudioStream" id=3] [ext_resource path="res://assets/taqin_theme.tres" type="Theme" id=4] -[ext_resource path="res://assets/escher_convex_concave.jpg" type="Texture" id=5] +[ext_resource path="res://assets/artworks/escher_convex_concave.jpg" type="Texture" id=5] [sub_resource type="Animation" id=1] resource_name = "MovingPiece"