summaryrefslogtreecommitdiffstats
path: root/world
diff options
context:
space:
mode:
authordusoleil <howcansocksbereal@gmail.com>2022-09-18 19:38:35 -0400
committerdusoleil <howcansocksbereal@gmail.com>2022-09-18 19:42:01 -0400
commit32bf9d2024362d45dc351c8f1d0b3b301caf1131 (patch)
treefb6540bce94cb55c6123ecfe1327abeabea2925f /world
parentffc92ed12c6e680776d355ff9fcef70e5e28d7c8 (diff)
downloadgodot_wildjam_49-32bf9d2024362d45dc351c8f1d0b3b301caf1131.tar.gz
godot_wildjam_49-32bf9d2024362d45dc351c8f1d0b3b301caf1131.zip
Organize World Gen Stuff
Diffstat (limited to '')
-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
11 files changed, 10 insertions, 10 deletions
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 )