From 20530bfd322970d20d79b7cf6538d8c28c670290 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 16 Sep 2025 12:02:37 +0200 Subject: [PATCH] changed folder structure --- building.gd => buildings/building.gd | 0 building.gd.uid => buildings/building.gd.uid | 0 building.gdshader => buildings/building.gdshader | 0 .../building.gdshader.uid | 0 building.tscn => buildings/building.tscn | 0 building_mesh.gd => buildings/building_mesh.gd | 0 .../building_mesh.gd.uid | 0 ghost.gd => enemies/ghost.gd | 0 ghost.gd.uid => enemies/ghost.gd.uid | 0 ghost.tscn => enemies/ghost.tscn | 0 player.gd => player/player.gd | 0 player.gd.uid => player/player.gd.uid | 0 player.tscn => player/player.tscn | 0 player_walk.png => player/player_walk.png | Bin .../player_walk.png.import | 12 +++++++++--- earth_aligner.gd => utils/earth_aligner.gd | 0 earth_aligner.gd.uid => utils/earth_aligner.gd.uid | 0 earth_aligner.tscn => utils/earth_aligner.tscn | 0 .../building_generator.gd | 0 .../building_generator.gd.uid | 0 draw_circle.gd => world/draw_circle.gd | 0 draw_circle.gd.uid => world/draw_circle.gd.uid | 0 earth.tscn => world/earth.tscn | 8 +++++--- grid.gd => world/grid.gd | 5 +++-- grid.gd.uid => world/grid.gd.uid | 0 25 files changed, 17 insertions(+), 8 deletions(-) rename building.gd => buildings/building.gd (100%) rename building.gd.uid => buildings/building.gd.uid (100%) rename building.gdshader => buildings/building.gdshader (100%) rename building.gdshader.uid => buildings/building.gdshader.uid (100%) rename building.tscn => buildings/building.tscn (100%) rename building_mesh.gd => buildings/building_mesh.gd (100%) rename building_mesh.gd.uid => buildings/building_mesh.gd.uid (100%) rename ghost.gd => enemies/ghost.gd (100%) rename ghost.gd.uid => enemies/ghost.gd.uid (100%) rename ghost.tscn => enemies/ghost.tscn (100%) rename player.gd => player/player.gd (100%) rename player.gd.uid => player/player.gd.uid (100%) rename player.tscn => player/player.tscn (100%) rename player_walk.png => player/player_walk.png (100%) rename player_walk.png.import => player/player_walk.png.import (59%) rename earth_aligner.gd => utils/earth_aligner.gd (100%) rename earth_aligner.gd.uid => utils/earth_aligner.gd.uid (100%) rename earth_aligner.tscn => utils/earth_aligner.tscn (100%) rename building_generator.gd => world/building_generator.gd (100%) rename building_generator.gd.uid => world/building_generator.gd.uid (100%) rename draw_circle.gd => world/draw_circle.gd (100%) rename draw_circle.gd.uid => world/draw_circle.gd.uid (100%) rename earth.tscn => world/earth.tscn (64%) rename grid.gd => world/grid.gd (90%) rename grid.gd.uid => world/grid.gd.uid (100%) diff --git a/building.gd b/buildings/building.gd similarity index 100% rename from building.gd rename to buildings/building.gd diff --git a/building.gd.uid b/buildings/building.gd.uid similarity index 100% rename from building.gd.uid rename to buildings/building.gd.uid diff --git a/building.gdshader b/buildings/building.gdshader similarity index 100% rename from building.gdshader rename to buildings/building.gdshader diff --git a/building.gdshader.uid b/buildings/building.gdshader.uid similarity index 100% rename from building.gdshader.uid rename to buildings/building.gdshader.uid diff --git a/building.tscn b/buildings/building.tscn similarity index 100% rename from building.tscn rename to buildings/building.tscn diff --git a/building_mesh.gd b/buildings/building_mesh.gd similarity index 100% rename from building_mesh.gd rename to buildings/building_mesh.gd diff --git a/building_mesh.gd.uid b/buildings/building_mesh.gd.uid similarity index 100% rename from building_mesh.gd.uid rename to buildings/building_mesh.gd.uid diff --git a/ghost.gd b/enemies/ghost.gd similarity index 100% rename from ghost.gd rename to enemies/ghost.gd diff --git a/ghost.gd.uid b/enemies/ghost.gd.uid similarity index 100% rename from ghost.gd.uid rename to enemies/ghost.gd.uid diff --git a/ghost.tscn b/enemies/ghost.tscn similarity index 100% rename from ghost.tscn rename to enemies/ghost.tscn diff --git a/player.gd b/player/player.gd similarity index 100% rename from player.gd rename to player/player.gd diff --git a/player.gd.uid b/player/player.gd.uid similarity index 100% rename from player.gd.uid rename to player/player.gd.uid diff --git a/player.tscn b/player/player.tscn similarity index 100% rename from player.tscn rename to player/player.tscn diff --git a/player_walk.png b/player/player_walk.png similarity index 100% rename from player_walk.png rename to player/player_walk.png diff --git a/player_walk.png.import b/player/player_walk.png.import similarity index 59% rename from player_walk.png.import rename to player/player_walk.png.import index 37dc416..ab112ae 100644 --- a/player_walk.png.import +++ b/player/player_walk.png.import @@ -3,21 +3,23 @@ importer="texture" type="CompressedTexture2D" uid="uid://cyvxm1hf1rc12" -path="res://.godot/imported/player_walk.png-dd7b13f797aca66ef3a8a41ed9897826.ctex" +path="res://.godot/imported/player_walk.png-59515d82f701e5545419ecd7b3460e66.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://player_walk.png" -dest_files=["res://.godot/imported/player_walk.png-dd7b13f797aca66ef3a8a41ed9897826.ctex"] +source_file="res://player/player_walk.png" +dest_files=["res://.godot/imported/player_walk.png-59515d82f701e5545419ecd7b3460e66.ctex"] [params] compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 @@ -25,6 +27,10 @@ mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false diff --git a/earth_aligner.gd b/utils/earth_aligner.gd similarity index 100% rename from earth_aligner.gd rename to utils/earth_aligner.gd diff --git a/earth_aligner.gd.uid b/utils/earth_aligner.gd.uid similarity index 100% rename from earth_aligner.gd.uid rename to utils/earth_aligner.gd.uid diff --git a/earth_aligner.tscn b/utils/earth_aligner.tscn similarity index 100% rename from earth_aligner.tscn rename to utils/earth_aligner.tscn diff --git a/building_generator.gd b/world/building_generator.gd similarity index 100% rename from building_generator.gd rename to world/building_generator.gd diff --git a/building_generator.gd.uid b/world/building_generator.gd.uid similarity index 100% rename from building_generator.gd.uid rename to world/building_generator.gd.uid diff --git a/draw_circle.gd b/world/draw_circle.gd similarity index 100% rename from draw_circle.gd rename to world/draw_circle.gd diff --git a/draw_circle.gd.uid b/world/draw_circle.gd.uid similarity index 100% rename from draw_circle.gd.uid rename to world/draw_circle.gd.uid diff --git a/earth.tscn b/world/earth.tscn similarity index 64% rename from earth.tscn rename to world/earth.tscn index 9b23b4a..9f3c9cd 100644 --- a/earth.tscn +++ b/world/earth.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://jjoyj1ldafkf"] +[gd_scene load_steps=5 format=3 uid="uid://jjoyj1ldafkf"] -[ext_resource type="Script" uid="uid://b5fhsy1xlreco" path="res://draw_circle.gd" id="2_2bhor"] -[ext_resource type="Script" path="res://grid.gd" id="3_2bhor"] +[ext_resource type="Script" uid="uid://b5fhsy1xlreco" path="res://world/draw_circle.gd" id="2_2bhor"] +[ext_resource type="Script" uid="uid://m3vyyfk8gnma" path="res://world/grid.gd" id="3_2bhor"] +[ext_resource type="PackedScene" uid="uid://djawvtdwp423v" path="res://buildings/building.tscn" id="3_nihcy"] [sub_resource type="CircleShape2D" id="CircleShape2D_5i67w"] radius = 3000.0 @@ -23,4 +24,5 @@ ground_radius = 3000.0 cell_height = 300.0 num_collumns = 60 debug = true +packed_buildings = Array[PackedScene]([ExtResource("3_nihcy")]) metadata/_custom_type_script = "uid://m3vyyfk8gnma" diff --git a/grid.gd b/world/grid.gd similarity index 90% rename from grid.gd rename to world/grid.gd index dfabf26..048e65a 100644 --- a/grid.gd +++ b/world/grid.gd @@ -5,6 +5,8 @@ class_name Grid extends Node2D @export var num_collumns : int @export var debug : bool +@export var packed_buildings : Array[PackedScene] + var buildings : Array[Building] = [] func _draw() -> void: @@ -33,11 +35,10 @@ func add_building_to_collumn(building : Building, collumn : int): # for testing func _ready() -> void: - var packed : PackedScene = preload("res://building.tscn") for i in range(100): - var test_building = packed.instantiate() + var test_building = packed_buildings[0].instantiate() var collumn = randi() % 60 add_building_to_collumn(test_building, collumn) diff --git a/grid.gd.uid b/world/grid.gd.uid similarity index 100% rename from grid.gd.uid rename to world/grid.gd.uid