Merge branch 'main' of https://git.brixserver.uk/BrixsBang/Photo_Game

Objects/Instant Camera.glb.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://djswo64leq8be"
-path="res://.godot/imported/Instant Camera.glb-d676c6496e8f2fa30a1886c422ab8f14.scn"
+path="res://.godot/imported/Instant Camera.glb-4901d17599fa8e671cf578b73318b5a9.scn"
 
 [deps]
 
-source_file="res://Immagini/Instant Camera.glb"
-dest_files=["res://.godot/imported/Instant Camera.glb-d676c6496e8f2fa30a1886c422ab8f14.scn"]
+source_file="res://Objects/Instant Camera.glb"
+dest_files=["res://.godot/imported/Instant Camera.glb-4901d17599fa8e671cf578b73318b5a9.scn"]
 
 [params]
 

Objects/icon.svg.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cl0v7agi67fbp"
-path="res://.godot/imported/icon.svg-6ee88c14468cec77998a5495cdcdb4e8.ctex"
+path="res://.godot/imported/icon.svg-0bc1850f5267a5fb709b15e289b919c5.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Immagini/icon.svg"
-dest_files=["res://.godot/imported/icon.svg-6ee88c14468cec77998a5495cdcdb4e8.ctex"]
+source_file="res://Objects/icon.svg"
+dest_files=["res://.godot/imported/icon.svg-0bc1850f5267a5fb709b15e289b919c5.ctex"]
 
 [params]
 

Objects/image.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://0pl04wrfx36e"
-path="res://.godot/imported/image.png-8d623c43e757da6951aebe337a8c0088.ctex"
+path="res://.godot/imported/image.png-9c9a959aeb17347cd811f45aee7fe950.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Immagini/image.png"
-dest_files=["res://.godot/imported/image.png-8d623c43e757da6951aebe337a8c0088.ctex"]
+source_file="res://Objects/image.png"
+dest_files=["res://.godot/imported/image.png-9c9a959aeb17347cd811f45aee7fe950.ctex"]
 
 [params]
 

Objects/open book.glb.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://roh2pkd0qx72"
-path="res://.godot/imported/open book.glb-f78a289fb2e101287e54b692e2f3f62f.scn"
+path="res://.godot/imported/open book.glb-b54258652a1ffbea0c079224c914eb08.scn"
 
 [deps]
 
-source_file="res://Immagini/open book.glb"
-dest_files=["res://.godot/imported/open book.glb-f78a289fb2e101287e54b692e2f3f62f.scn"]
+source_file="res://Objects/open book.glb"
+dest_files=["res://.godot/imported/open book.glb-b54258652a1ffbea0c079224c914eb08.scn"]
 
 [params]
 

Objects/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dvyv0o1c7ynqq"
-path="res://.godot/imported/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png-29476413e0699411187377d79c742911.ctex"
+path="res://.godot/imported/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png-ae5658519a41a8340263cadc5c3e24dc.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Immagini/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png"
-dest_files=["res://.godot/imported/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png-29476413e0699411187377d79c742911.ctex"]
+source_file="res://Objects/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png"
+dest_files=["res://.godot/imported/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png-ae5658519a41a8340263cadc5c3e24dc.ctex"]
 
 [params]
 

Scene/base.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://b2chtre60m62g" path="res://Script/base.gd" id="1_iwpok"]
 [ext_resource type="PackedScene" uid="uid://mcavsjo6dgd0" path="res://Scene/player.tscn" id="3_x5x41"]
-[ext_resource type="PackedScene" uid="uid://bk2nxxt5jfmhw" path="res://visto.tscn" id="4_pntdf"]
+[ext_resource type="PackedScene" uid="uid://bk2nxxt5jfmhw" path="res://Scene/visto.tscn" id="4_pntdf"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_g5ejs"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)

Scene/open_book.tscn

@@ -1,5 +1,5 @@
 [gd_scene load_steps=2 format=3 uid="uid://b3divkll7y164"]
 
-[ext_resource type="PackedScene" uid="uid://roh2pkd0qx72" path="res://Immagini/open book.glb" id="1_uumnn"]
+[ext_resource type="PackedScene" uid="uid://roh2pkd0qx72" path="res://Objects/open book.glb" id="1_jxyn1"]
 
-[node name="open book" instance=ExtResource("1_uumnn")]
+[node name="open book" instance=ExtResource("1_jxyn1")]

Scene/player.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=20 format=3 uid="uid://mcavsjo6dgd0"]
 
-[ext_resource type="PackedScene" uid="uid://djswo64leq8be" path="res://Immagini/Instant Camera.glb" id="1_4flbx"]
-[ext_resource type="PackedScene" uid="uid://roh2pkd0qx72" path="res://Immagini/open book.glb" id="1_58ae2"]
+[ext_resource type="PackedScene" uid="uid://djswo64leq8be" path="res://Objects/Instant Camera.glb" id="1_4flbx"]
+[ext_resource type="PackedScene" uid="uid://roh2pkd0qx72" path="res://Objects/open book.glb" id="1_58ae2"]
 [ext_resource type="Script" uid="uid://cfekp6e2bhs4s" path="res://Scene/player.tres.gd" id="1_ivevv"]
-[ext_resource type="Texture2D" uid="uid://dvyv0o1c7ynqq" path="res://Immagini/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png" id="2_onrkg"]
+[ext_resource type="Texture2D" uid="uid://dvyv0o1c7ynqq" path="res://Objects/vector-target-aim-simple-zoom-focus-icon-camera-frame-photo-viewfinder-screen-line-symbol_536875-203(1).png" id="2_onrkg"]
 [ext_resource type="Shader" uid="uid://xp6bfrjh0pdg" path="res://ctr.gdshader" id="3_xa75v"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_hqtel"]

Scene/visto.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://bk2nxxt5jfmhw"]
 
-[ext_resource type="Script" uid="uid://br3i356g3fo3f" path="res://ball.gd" id="1_6drh8"]
+[ext_resource type="Script" uid="uid://br3i356g3fo3f" path="res://Script/ball.gd" id="1_6drh8"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_u2vub"]
 

project.godot

@@ -13,7 +13,7 @@ config_version=5
 config/name="GIOCO DI PROVA"
 run/main_scene="uid://g3ocaiur6ojd"
 config/features=PackedStringArray("4.4", "Forward Plus")
-config/icon="res://Immagini/icon.svg"
+config/icon="res://Objects/icon.svg"
 
 [global_group]