diff options
| -rw-r--r-- | Main.tscn | 2 | ||||
| -rw-r--r-- | project.godot | 4 | ||||
| -rw-r--r-- | world/World.gd (renamed from World.gd) | 0 | ||||
| -rw-r--r-- | world/World.tscn (renamed from World.tscn) | 4 | ||||
| -rw-r--r-- | world/chunk/Chunk.gd (renamed from Chunk.gd) | 0 | ||||
| -rw-r--r-- | world/chunk/Chunk.tscn (renamed from Chunk.tscn) | 8 | ||||
| -rw-r--r-- | world/chunk/ChunkGen.gd (renamed from ChunkGen.gd) | 2 | ||||
| -rw-r--r-- | world/chunk/ChunkLoader.gd (renamed from ChunkLoader.gd) | 2 | ||||
| -rw-r--r-- | world/chunk/helper/ChunkedCSGMesh.gd (renamed from ChunkedCSGMesh.gd) | 0 | ||||
| -rw-r--r-- | world/chunk/helper/ChunkedMeshInstance.gd (renamed from ChunkedMeshInstance.gd) | 0 | ||||
| -rw-r--r-- | world/chunk/helper/ChunkedSprite3D.gd (renamed from ChunkedSprite3D.gd) | 0 | ||||
| -rw-r--r-- | world/obstacles/Rock.gd (renamed from Rock.gd) | 0 | ||||
| -rw-r--r-- | world/obstacles/Rock.tscn (renamed from Rock.tscn) | 4 |
13 files changed, 13 insertions, 13 deletions
@@ -5,7 +5,7 @@ [ext_resource path="res://water/Water.tscn" type="PackedScene" id=3] [ext_resource path="res://Float.tscn" type="PackedScene" id=4] [ext_resource path="res://ship/ship/crate.tscn" type="PackedScene" id=5] -[ext_resource path="res://World.tscn" type="PackedScene" id=6] +[ext_resource path="res://world/World.tscn" type="PackedScene" id=6] [ext_resource path="res://Ship.gd" type="Script" id=7] [ext_resource path="res://FPS.gd" type="Script" id=8] [ext_resource path="res://Main.gd" type="Script" id=9] diff --git a/project.godot b/project.godot index a22cfe0..26f3e5b 100644 --- a/project.godot +++ b/project.godot @@ -27,8 +27,8 @@ config/icon="res://icon.png" [autoload] Settings="*res://singletons/settings.gd" -ChunkLoader="*res://ChunkLoader.gd" -ChunkGen="*res://ChunkGen.gd" +ChunkLoader="*res://world/chunk/ChunkLoader.gd" +ChunkGen="*res://world/chunk/ChunkGen.gd" [display] diff --git a/World.gd b/world/World.gd index af2ba6a..af2ba6a 100644 --- a/World.gd +++ b/world/World.gd diff --git a/World.tscn b/world/World.tscn index 37056c5..81b2201 100644 --- a/World.tscn +++ b/world/World.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://World.gd" type="Script" id=1] -[ext_resource path="res://Chunk.tscn" type="PackedScene" id=3] +[ext_resource path="res://world/World.gd" type="Script" id=1] +[ext_resource path="res://world/chunk/Chunk.tscn" type="PackedScene" id=3] [sub_resource type="SphereShape" id=24] radius = 500.0 diff --git a/Chunk.gd b/world/chunk/Chunk.gd index 7c5c1c3..7c5c1c3 100644 --- a/Chunk.gd +++ b/world/chunk/Chunk.gd diff --git a/Chunk.tscn b/world/chunk/Chunk.tscn index 8f5ea84..4ce985b 100644 --- a/Chunk.tscn +++ b/world/chunk/Chunk.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Chunk.gd" type="Script" id=1] -[ext_resource path="res://ChunkedCSGMesh.gd" type="Script" id=3] +[ext_resource path="res://world/chunk/Chunk.gd" type="Script" id=1] +[ext_resource path="res://world/chunk/helper/ChunkedCSGMesh.gd" type="Script" id=2] [sub_resource type="SphereShape" id=1] radius = 50.0 @@ -27,10 +27,10 @@ shape = SubResource( 1 ) [node name="Border" type="CSGMesh" parent="."] material_override = SubResource( 3 ) -script = ExtResource( 3 ) +script = ExtResource( 2 ) _mesh = SubResource( 2 ) [node name="CSGMesh" type="CSGMesh" parent="Border"] operation = 2 -script = ExtResource( 3 ) +script = ExtResource( 2 ) _mesh = SubResource( 4 ) diff --git a/ChunkGen.gd b/world/chunk/ChunkGen.gd index ef29365..5e99be8 100644 --- a/ChunkGen.gd +++ b/world/chunk/ChunkGen.gd @@ -35,7 +35,7 @@ func iterate_chunk(chunk,step:Vector2,cb:FuncRef): for y in range(-chunk_size_rounded.y,chunk_size_rounded.y,step.y): cb.call_func(chunk,Vector2(x,y)) -onready var Rock = preload("res://Rock.tscn") +onready var Rock = preload("res://world/obstacles/Rock.tscn") const rock_size = 5.0 func make_rock(chunk,xform:Transform): var rock = Rock.instance() diff --git a/ChunkLoader.gd b/world/chunk/ChunkLoader.gd index 90cac4f..9f1d9b3 100644 --- a/ChunkLoader.gd +++ b/world/chunk/ChunkLoader.gd @@ -2,7 +2,7 @@ extends Node var world = null -var Chunk = preload("res://Chunk.tscn") +var Chunk = preload("res://world/chunk/Chunk.tscn") var chunks = {} var loaded_chunks = {} var chunk_thread = Thread.new() diff --git a/ChunkedCSGMesh.gd b/world/chunk/helper/ChunkedCSGMesh.gd index 2b8c6db..2b8c6db 100644 --- a/ChunkedCSGMesh.gd +++ b/world/chunk/helper/ChunkedCSGMesh.gd diff --git a/ChunkedMeshInstance.gd b/world/chunk/helper/ChunkedMeshInstance.gd index dde7eda..dde7eda 100644 --- a/ChunkedMeshInstance.gd +++ b/world/chunk/helper/ChunkedMeshInstance.gd diff --git a/ChunkedSprite3D.gd b/world/chunk/helper/ChunkedSprite3D.gd index c9e0be9..c9e0be9 100644 --- a/ChunkedSprite3D.gd +++ b/world/chunk/helper/ChunkedSprite3D.gd diff --git a/Rock.gd b/world/obstacles/Rock.gd index 577e626..577e626 100644 --- a/Rock.gd +++ b/world/obstacles/Rock.gd diff --git a/Rock.tscn b/world/obstacles/Rock.tscn index f3c7316..3b50ff3 100644 --- a/Rock.tscn +++ b/world/obstacles/Rock.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://Rock.gd" type="Script" id=1] -[ext_resource path="res://ChunkedMeshInstance.gd" type="Script" id=2] +[ext_resource path="res://world/obstacles/Rock.gd" type="Script" id=1] +[ext_resource path="res://world/chunk/helper/ChunkedMeshInstance.gd" type="Script" id=2] [sub_resource type="ConvexPolygonShape" id=2] points = PoolVector3Array( 2.5, -5, 2.5, 2.5, -5, -2.5, -2.5, -5, -2.5, -2.5, -5, 2.5, 0, 5, 2.5, 0, 5, -2.5 ) |