Prey is now reflected to be smooth across periodic boundary too
This commit is contained in:
parent
4160361145
commit
8de3ee2c9a
|
|
@ -1,6 +1,10 @@
|
||||||
extends Node
|
extends Node
|
||||||
|
|
||||||
var screen_size = Vector2(1920.0, 1080.0) # Default screen size (this is a float for some reason)
|
var screen_size = Vector2(1920.0, 1080.0) # Default screen size (this is a float for some reason)
|
||||||
|
var viewport_size
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
viewport_size = get_viewport().get_visible_rect().size
|
||||||
|
|
||||||
# TODO: This needs to be called from a script inheriting a CharacterBody2D (e.g. the player)
|
# TODO: This needs to be called from a script inheriting a CharacterBody2D (e.g. the player)
|
||||||
# Alternative would be to pass the player reference to this script (which might be better?)
|
# Alternative would be to pass the player reference to this script (which might be better?)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ extends CharacterBody2D
|
||||||
@export var speed = 200
|
@export var speed = 200
|
||||||
var damage = 1
|
var damage = 1
|
||||||
|
|
||||||
func _ready():
|
func _ready() -> void:
|
||||||
var screen_size = get_viewport_rect().size
|
var screen_size = get_viewport_rect().size
|
||||||
GameManager.init_screen_size(screen_size.x, screen_size.y)
|
GameManager.init_screen_size(screen_size.x, screen_size.y)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,30 @@ extends AbstractPrey2D
|
||||||
|
|
||||||
@onready var sprite = get_node("AnimatedSprite2D")
|
@onready var sprite = get_node("AnimatedSprite2D")
|
||||||
|
|
||||||
|
# Mirroed sprites for periodic boundary
|
||||||
|
var mirrorSprite1: Node2D
|
||||||
|
var mirrorSprite2: Node2D
|
||||||
|
var mirrorSprite3: Node2D
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
$AnimatedSprite2D.animation = "Healthy"
|
$AnimatedSprite2D.animation = "Healthy"
|
||||||
$AnimatedSprite2D.play()
|
$AnimatedSprite2D.play()
|
||||||
pass # Replace with function body.
|
|
||||||
|
mirrorSprite1 = sprite.duplicate()
|
||||||
|
mirrorSprite2 = sprite.duplicate()
|
||||||
|
mirrorSprite3 = sprite.duplicate()
|
||||||
|
|
||||||
|
add_child(mirrorSprite1)
|
||||||
|
add_child(mirrorSprite2)
|
||||||
|
add_child(mirrorSprite3)
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
func _process(delta: float) -> void:
|
func _process(delta: float) -> void:
|
||||||
return
|
# Boundary mirroring
|
||||||
|
_handle_wrapping()
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
self.move(Vector3(randfn(0, 1), randfn(0, 1), 0))
|
self.move(Vector3(randfn(0, 1), randfn(0, 1), 0))
|
||||||
|
|
@ -42,3 +56,94 @@ func handle_collision_player(player):
|
||||||
self.die()
|
self.die()
|
||||||
else:
|
else:
|
||||||
sprite.play("Injured")
|
sprite.play("Injured")
|
||||||
|
|
||||||
|
# FIXME: Doesn't work with injured sprite
|
||||||
|
# Mirroring table:
|
||||||
|
# |---|---|---|---|
|
||||||
|
# | 4 | 3 | 4 | 3 |
|
||||||
|
# |---|===|===|---|
|
||||||
|
# | 1 ǁ 2 | 1 ǁ 2 |
|
||||||
|
# |---ǁ---|---ǁ---|
|
||||||
|
# | 4 ǁ 3 | 4 ǁ 3 |
|
||||||
|
# |---|===|===|---|
|
||||||
|
# | 1 | 2 | 1 | 2 |
|
||||||
|
# |---|---|---|---|
|
||||||
|
# If less than viewport size away from an edge, mirror over that edge (for seamless boundary)
|
||||||
|
# NOTE: For this to look correctly the camera size should be smaller than half the screen port (in
|
||||||
|
# any one dimension. Ideally, the difference between camera size and half the screen port is
|
||||||
|
# at least the size of the prey sprite)
|
||||||
|
func _handle_wrapping():
|
||||||
|
mirrorSprite1.visible = false
|
||||||
|
mirrorSprite2.visible = false
|
||||||
|
mirrorSprite3.visible = false
|
||||||
|
|
||||||
|
# TODO: Assume viewport size << screen size and only draw according to GameManager.viewport_size
|
||||||
|
# Find corresponding section of the screen
|
||||||
|
if position.x < GameManager.screen_size.x/2 and position.y < GameManager.screen_size.y/2:
|
||||||
|
# 2
|
||||||
|
mirrorSprite1.visible = true
|
||||||
|
mirrorSprite2.visible = true
|
||||||
|
mirrorSprite3.visible = true
|
||||||
|
|
||||||
|
# Right
|
||||||
|
#mirrorSprite1.position = Vector2(sprite.position.x + GameManager.screen_size.x, sprite.position.y)
|
||||||
|
mirrorSprite1.position = Vector2(GameManager.screen_size.x, 0)
|
||||||
|
# Diag
|
||||||
|
#mirrorSprite2.position = Vector2(sprite.position.x + GameManager.screen_size.x, sprite.position.y + GameManager.screen_size.y)
|
||||||
|
mirrorSprite3.position = Vector2(GameManager.screen_size.x, GameManager.screen_size.y)
|
||||||
|
# Bottom
|
||||||
|
#mirrorSprite3.position = Vector2(sprite.position.x, sprite.position.y + GameManager.screen_size.y)
|
||||||
|
mirrorSprite2.position = Vector2(0, GameManager.screen_size.y)
|
||||||
|
|
||||||
|
|
||||||
|
elif position.x < GameManager.screen_size.x/2:
|
||||||
|
# 3
|
||||||
|
mirrorSprite1.visible = true
|
||||||
|
mirrorSprite2.visible = true
|
||||||
|
mirrorSprite3.visible = true
|
||||||
|
|
||||||
|
# Top
|
||||||
|
#mirrorSprite1.position = Vector2(sprite.position.x, sprite.position.y - GameManager.screen_size.y)
|
||||||
|
mirrorSprite1.position = Vector2(0, - GameManager.screen_size.y)
|
||||||
|
# Diag
|
||||||
|
#mirrorSprite2.position = Vector2(sprite.position.x + GameManager.screen_size.x, sprite.position.y - GameManager.screen_size.y)
|
||||||
|
mirrorSprite2.position = Vector2(GameManager.screen_size.x, - GameManager.screen_size.y)
|
||||||
|
# Right
|
||||||
|
#mirrorSprite3.position = Vector2(sprite.position.x + GameManager.screen_size.x, sprite.position.y)
|
||||||
|
mirrorSprite3.position = Vector2(GameManager.screen_size.x, 0)
|
||||||
|
|
||||||
|
|
||||||
|
elif position.y < GameManager.screen_size.y/2:
|
||||||
|
# 1
|
||||||
|
mirrorSprite1.visible = true
|
||||||
|
mirrorSprite2.visible = true
|
||||||
|
mirrorSprite3.visible = true
|
||||||
|
|
||||||
|
# Left
|
||||||
|
#mirrorSprite1.position = Vector2(sprite.position.x - GameManager.screen_size.x, sprite.position.y)
|
||||||
|
mirrorSprite1.position = Vector2(- GameManager.screen_size.x, 0)
|
||||||
|
# Bottom
|
||||||
|
#mirrorSprite2.position = Vector2(sprite.position.x, sprite.position.y + GameManager.screen_size.y)
|
||||||
|
mirrorSprite2.position = Vector2(0, GameManager.screen_size.y)
|
||||||
|
# Diag
|
||||||
|
#mirrorSprite3.position = Vector2(sprite.position.x - GameManager.screen_size.x, sprite.position.y + GameManager.screen_size.y)
|
||||||
|
mirrorSprite3.position = Vector2(- GameManager.screen_size.x, GameManager.screen_size.y)
|
||||||
|
|
||||||
|
|
||||||
|
else:
|
||||||
|
# 4
|
||||||
|
mirrorSprite1.visible = true
|
||||||
|
mirrorSprite2.visible = true
|
||||||
|
mirrorSprite3.visible = true
|
||||||
|
|
||||||
|
# Left
|
||||||
|
#mirrorSprite1.position = Vector2(sprite.position.x - GameManager.screen_size.x, sprite.position.y)
|
||||||
|
mirrorSprite1.position = Vector2(- GameManager.screen_size.x, 0)
|
||||||
|
# Diag
|
||||||
|
#mirrorSprite2.position = Vector2(sprite.position.x - GameManager.screen_size.x, sprite.position.y - GameManager.screen_size.y)
|
||||||
|
mirrorSprite2.position = Vector2(- GameManager.screen_size.x, - GameManager.screen_size.y)
|
||||||
|
# Top
|
||||||
|
#mirrorSprite3.position = Vector2(sprite.position.x, sprite.position.y - GameManager.screen_size.y)
|
||||||
|
mirrorSprite3.position = Vector2(0, - GameManager.screen_size.y)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,3 +25,4 @@ func spawn_creature(scene, position: Vector2) -> void:
|
||||||
var instance = scene.instantiate()
|
var instance = scene.instantiate()
|
||||||
instance.position = position
|
instance.position = position
|
||||||
add_child(instance)
|
add_child(instance)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue