Browse Source

Moving PREFABs out of Globals and removing Globals autoload

pull/22/head
Ryan Reed 1 month ago
parent
commit
1688e445c5
6 changed files with 5 additions and 9 deletions
  1. +0
    -5
      autoloads/globals.gd
  2. +0
    -1
      autoloads/globals.gd.uid
  3. +0
    -1
      project.godot
  4. +1
    -0
      scenes/blocks/block.gd
  5. +2
    -0
      scenes/blocks/dropped_block.gd
  6. +2
    -2
      scenes/world/world.gd

+ 0
- 5
autoloads/globals.gd View File

@ -1,5 +0,0 @@
extends Node
const BLOCK_PREFAB: PackedScene = preload("res://scenes/blocks/block.tscn")
const DROPPED_BLOCK_PREFAB: PackedScene = preload("res://scenes/blocks/dropped_block.tscn")

+ 0
- 1
autoloads/globals.gd.uid View File

@ -1 +0,0 @@
uid://cp6sum1t6el0a

+ 0
- 1
project.godot View File

@ -18,7 +18,6 @@ config/icon="uid://f6hee5t26uqt"
[autoload]
Globals="*res://autoloads/globals.gd"
EntityManager="*res://autoloads/entity_manager.gd"
InventoryManager="*res://autoloads/inventory_manager.gd"
DBItems="*res://autoloads/db_items.gd"


+ 1
- 0
scenes/blocks/block.gd View File

@ -1,6 +1,7 @@
class_name Block
extends StaticBody3D
const PREFAB: PackedScene = preload("res://scenes/blocks/block.tscn")
@export var block_mesh: BlockMesh
@export var collision_shape: CollisionShape3D


+ 2
- 0
scenes/blocks/dropped_block.gd View File

@ -2,6 +2,8 @@ class_name DroppedBlock
extends RigidBody3D
const PREFAB: PackedScene = preload("res://scenes/blocks/dropped_block.tscn")
## The amount of time to wait before PickupArea is set to monitorable[br]
## This is to ensure that the item isn't picked up immediately after throwing
@export var pickup_timeout: int = 1


+ 2
- 2
scenes/world/world.gd View File

@ -64,14 +64,14 @@ func spawn_player(player_position: Transform3D) -> void:
func _create_block(id: String, block_position: Vector3) -> void:
var block: Block = Globals.BLOCK_PREFAB.instantiate()
var block: Block = Block.PREFAB.instantiate()
block.position = block_position
block.set_id(id)
blocks_container.add_child(block)
func _create_dropped_block(id: String, start_position: Vector3, direction: Vector3 = Vector3.ZERO, velocity: float = 0.0) -> void:
var block: DroppedBlock = Globals.DROPPED_BLOCK_PREFAB.instantiate()
var block: DroppedBlock = DroppedBlock.PREFAB.instantiate()
dropped_items_container.add_child(block)
block.initialize(id, start_position, direction, velocity)


Loading…
Cancel
Save