gamejam/bodypartfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter

Browse Source
This commit is contained in:
Merlar 2020-02-02 11:52:07 +00:00
commit a5e15b9ccd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Controllers/GameStateController.gd
View File

@ -88,6 +88,9 @@ func _switch_to_fighting(torso):
_fighting_scene.add_child(torso) _fighting_scene.add_child(torso)
torso.on_ingame() torso.on_ingame()
_body_count = 0
_bodies.clear()
func _switch_to_body_build(): func _switch_to_body_build():
_switch_scene(_body_build_scene, "body_build") _switch_scene(_body_build_scene, "body_build")

4
Ingame/CameraFocus.gd
View File

@ -10,13 +10,9 @@ var _x_axis = Vector3(1, 0, 0)
func _ready(): func _ready():
var cam_rot = camera.rotation_degrees var cam_rot = camera.rotation_degrees
print(cam_rot.y)
_look_at_vec = _look_at_vec.rotated(Vector3(0, 1, 0), cam_rot.y * PI/180) _look_at_vec = _look_at_vec.rotated(Vector3(0, 1, 0), cam_rot.y * PI/180)
print(_look_at_vec)
print(cam_rot.x)
_x_axis = _x_axis.rotated(Vector3(0, 1, 0), cam_rot.y * PI/180) _x_axis = _x_axis.rotated(Vector3(0, 1, 0), cam_rot.y * PI/180)
_look_at_vec = _look_at_vec.rotated(_x_axis, cam_rot.x * PI/180) _look_at_vec = _look_at_vec.rotated(_x_axis, cam_rot.x * PI/180)
print(_look_at_vec)
func _process(delta: float) -> void: func _process(delta: float) -> void: