From 865accacca319ce52ae949a0d273c19b7619a963 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 28 Oct 2021 12:56:52 +0300 Subject: [PATCH] [Minimal] Handler and Manager script update --- .../controllers/managers/physics_manager.gd | 3 ++- .../character/player/player_body_handler.gd | 16 ++++++++++++---- .../character/player/player_node_handler.gd | 6 +++--- .../handlers/system/state/user_state_handler.gd | 17 +++++++++-------- .../vectoral_direction_preset_handler.gd | 5 +---- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Alens/movementSystem0.0.3/source/assets/scripts/controllers/managers/physics_manager.gd b/Alens/movementSystem0.0.3/source/assets/scripts/controllers/managers/physics_manager.gd index 38c4d54..d229af6 100644 --- a/Alens/movementSystem0.0.3/source/assets/scripts/controllers/managers/physics_manager.gd +++ b/Alens/movementSystem0.0.3/source/assets/scripts/controllers/managers/physics_manager.gd @@ -1,4 +1,5 @@ extends Node -func _ready(): +func update(userStateInstance): + userStateInstance.rotateBy(-1) pass diff --git a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_body_handler.gd b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_body_handler.gd index 8a4a48e..6687013 100644 --- a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_body_handler.gd +++ b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_body_handler.gd @@ -15,15 +15,23 @@ var physicsManagerInstance = preload("res://source/assets/scripts/controllers/ma # Local class variables var vectoralDirectionPreset +var userInput +var userState +var VDIR func _ready(): - vectoralDirectionPreset = vectoralDirectionPresetInstance.getState() + vectoralDirectionPreset = vectoralDirectionPresetInstance.getState(userStateInstance.update()) func _process(delta): # Update data-handler returned states - var userInput = userInputInstance.update() - var userState = userStateInstance.update() + userInput = userInputInstance.update() + userState = userStateInstance.update() # Send the returned states through processors - var VDIR = VDIRprocessorInstance.process(userState, vectoralDirectionPreset) + VDIR = VDIRprocessorInstance.process(userState, vectoralDirectionPreset) # Give the resulting data to game controllers + physicsManagerInstance.update(userStateInstance) + physics_process(delta) pass + +func physics_process(delta): + rotation_degrees = userState["rotation"] diff --git a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_node_handler.gd b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_node_handler.gd index f2e5697..a4d7775 100644 --- a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_node_handler.gd +++ b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/character/player/player_node_handler.gd @@ -1,9 +1,9 @@ extends Node2D -func _ready(): - pass +func statePassback(): + return {"node_global_position": transform.origin, "rotation": null} -func set_scale(scale): +func set_scale(scale) -> void: $player_body/player_sprite_na.scale = Vector2(scale, scale) $player_body/player_sprite.scale = Vector2(scale, scale) $player_body/player_collider.scale = Vector2(scale, scale) diff --git a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/state/user_state_handler.gd b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/state/user_state_handler.gd index 6e5d603..bbbd3c5 100644 --- a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/state/user_state_handler.gd +++ b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/state/user_state_handler.gd @@ -2,14 +2,15 @@ extends Node var userState = {} -func _init() -> void: - userState = { - "state": false - } - pass +var rotationalTracker = 0 + +func rotateBy(amount): + rotationalTracker += amount + if rotationalTracker == 361: rotationalTracker = 1 + elif rotationalTracker == -361: rotationalTracker = -1 func update(): - userState = { - "state": true - } + userState = preload("res://source/assets/scripts/handlers/character/player/player_node_handler.gd").new().statePassback() + # IF necessary process and update and correct userState + userState["rotation"] = rotationalTracker return userState diff --git a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/vectoralPresets/vectoral_direction_preset_handler.gd b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/vectoralPresets/vectoral_direction_preset_handler.gd index 6ae0e61..6d253f6 100644 --- a/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/vectoralPresets/vectoral_direction_preset_handler.gd +++ b/Alens/movementSystem0.0.3/source/assets/scripts/handlers/system/vectoralPresets/vectoral_direction_preset_handler.gd @@ -2,7 +2,7 @@ extends Node var vectoralState = {} -func _ready() -> void: +func getState(userState): vectoralState = { "0": { # Source (Client) positional rotation vectors "0": { # Primary source positional vector @@ -56,7 +56,4 @@ func _ready() -> void: } } } - pass - -func getState(): return vectoralState