flippped_trajectory_enabled

yo
This commit is contained in:
Moonshrike 2021-11-18 20:40:31 +02:00
parent fbda5ea0f5
commit e38b18bdc8
8 changed files with 67 additions and 104 deletions

View File

@ -1,10 +1,9 @@
extends Line2D
export var speed_hyper = 100
export var speed_hyper = 130
var velocity = Vector2(0, 0)
var dot_position = Vector2(0, 0)
var x = 10
var time = 0.05
var a_parameter = Global.get('user_input').a_param_hyper
@ -16,21 +15,21 @@ func _ready():
func trajectory():
func trajectory(delta):
while dot_position.x < 2000:
if pos.x > 0:
add_point(dot_position)
velocity.x = 10
velocity.y = a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * 0.06944
time += 0.06944
dot_position += velocity * speed_hyper * delta
time += delta
if pos.x < 0:
add_point(dot_position)
velocity.x = 10
velocity.y = -a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * 0.06944
time += 0.06944
dot_position += velocity * speed_hyper * delta
time += delta
func _process(_delta):
trajectory()
func _process(delta):
trajectory(delta)
update()

View File

@ -8,14 +8,6 @@ var time = 0
var a_parameter = -Global.get('user_input').a_param_line
#func _draw():
# if dot_position.x < 1000:
# velocity.y = 10 * a_parameter
# velocity.x = 10
# dot_position += velocity * speed * 0.06944
# draw_circle(dot_position, 2, Color(225, 225, 225))
# time += 0.06944
func trajectory():
while dot_position.x < 2000:

View File

@ -6,12 +6,12 @@ var velocity = Vector2()
var player_owner = 0
var time = 0
var a_parameter = 0
var a_parameter = -Global.get('user_input').a_param_line
func follow_line_trajectory():
a_parameter = -Global.get('user_input').a_param_line
velocity.x = time
velocity.y = time*a_parameter

View File

@ -32,21 +32,8 @@ func trajectory(delta):
dot_position += velocity * speed_parab * delta
time += delta
func is_flipped():
while len(pos_diff) < 2:
pos_diff.append(rot)
if cos(pos):
pass
if pos_diff[0] + pos_diff[1] > pos_diff[1] or pos_diff[0] + pos_diff[1] > pos_diff[0]:
pass
if pos_diff[1].x/pos_diff[0].x < 0:
return true
func _process(delta):
#if is_flipped():
#clear_points()
trajectory(delta)
update()

View File

@ -10,14 +10,6 @@ var amplitude = Global.get('user_input').amp
var frequency = Global.get('user_input').freq
#func _draw():
# if dot_position.x < 1000:
# velocity.y = amplitude * cos(time * frequency)
# velocity.x = 5
# dot_position += velocity * speed * 0.06944
# draw_circle(dot_position, 2, Color(225, 225, 225))
# time += 0.06944
func trajectory(delta):
while dot_position.x < 2000:
add_point(dot_position)

View File

@ -1,29 +1,36 @@
extends Control
var FuncItLine
func _ready():
Global.set('control', self)
FuncItLine = 'line'
func _on_line_pressed() -> void:
FuncItLine = 'line'
Global.get('user_input').get_node('line').visible = true
Global.get('user_input').get_node('parabol').visible = false
Global.get('user_input').get_node('hyperbol').visible = false
Global.get('user_input').get_node('sin').visible = false
Global.get('player').enable_trajectory_line('line')
Global.get('player').trajectory = 'line'
func _on_parabol_pressed() -> void:
FuncItLine = 'parab'
Global.get('user_input').get_node('parabol').visible = true
Global.get('user_input').get_node('line').visible = false
Global.get('user_input').get_node('hyperbol').visible = false
Global.get('user_input').get_node('sin').visible = false
Global.get('player').enable_trajectory_line('parab')
Global.get('player').trajectory = 'parab'
func _on_hyperbol_pressed() -> void:
FuncItLine = 'hyper'
Global.get('user_input').get_node('hyperbol').visible = true
Global.get('user_input').get_node('sin').visible = false
Global.get('user_input').get_node('line').visible = false
@ -33,10 +40,16 @@ func _on_hyperbol_pressed() -> void:
func _on_sine_pressed() -> void:
FuncItLine = 'sine'
Global.get('user_input').get_node('sin').visible = true
Global.get('user_input').get_node('line').visible = false
Global.get('user_input').get_node('hyperbol').visible = false
Global.get('user_input').get_node('parabol').visible = false
Global.get('player').enable_trajectory_line('sine')
Global.get('player').trajectory = 'sine'
func _physics_process(delta):
FuncItLine
if Input.is_action_pressed("input_left") or Input.is_action_pressed('input_right'):
Global.get('player').enable_trajectory_line(FuncItLine)

View File

@ -1,7 +1,5 @@
extends Control
var FuncItline = 'line'
var a_param_line = 0
var a_param_parab = 1
@ -20,29 +18,26 @@ func _ready():
func _on_line_SpinBox_value_changed(value):
a_param_line = 0
a_param_line = value
FuncItline = 'line'
Global.get('player').enable_trajectory_line('line')
Global.get('player').trajectory = 'line'
func _on_a_param_SpinBox_value_changed(value):
a_param_parab = value
FuncItline = 'parab'
Global.get('player').enable_trajectory_line('parab')
Global.get('player').trajectory = 'parab'
func _on_b_param_SpinBox_value_changed(value):
b_param_parab = value
FuncItline = 'parab'
Global.get('player').enable_trajectory_line('parab')
Global.get('player').trajectory = 'parab'
func _on_b_param_h_SpinBox_value_changed(value):
b_param_hyper = value
FuncItline = 'hyper'
if b_param_hyper != 0:
Global.get('player').enable_trajectory_line('hyper')
Global.get('player').trajectory = 'hyper'
@ -51,35 +46,20 @@ func _on_b_param_h_SpinBox_value_changed(value):
func _on_a_param_h_SpinBox_value_changed(value):
a_param_hyper = value
FuncItline = 'hyper'
Global.get('player').enable_trajectory_line('hyper')
Global.get('player').trajectory = 'hyper'
func _on_amp_SpinBox_value_changed(value):
amp = value
FuncItline = 'sine'
Global.get('player').enable_trajectory_line('sine')
Global.get('player').trajectory = 'sine'
func _on_freq_SpinBox_value_changed(value):
freq = value
FuncItline = 'sine'
Global.get('player').enable_trajectory_line('sine')
Global.get('player').trajectory = 'sine'

View File

@ -172,21 +172,6 @@
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ],
"loop": true,
"name": "move-speed-left-03",
"speed": 35.0
}, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
"loop": true,
"name": "move-speed-left-04",
"speed": 35.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "move-speed-left-01",
"speed": 35.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"loop": true,
"name": "move-speed-right-03",
@ -202,11 +187,6 @@ animations = [ {
"name": "move-speed-right-01",
"speed": 35.0
}, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
"loop": true,
"name": "boost-speed-left-04",
"speed": 55.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
"name": "move-speed-left-02",
@ -217,34 +197,44 @@ animations = [ {
"name": "move-speed-right-02",
"speed": 35.0
}, {
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ],
"loop": true,
"name": "move-speed-left-03",
"speed": 35.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
"name": "idle-speed-right-01",
"speed": 25.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "boost-speed-left-01",
"speed": 55.0
}, {
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ],
"loop": true,
"name": "boost-speed-left-03",
"speed": 55.0
}, {
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "boost-speed-left-02",
"name": "move-speed-left-01",
"speed": 35.0
}, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
"loop": true,
"name": "boost-speed-left-04",
"speed": 55.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "idle-speed-left-01",
"speed": 25.0
"name": "boost-speed-left-01",
"speed": 55.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
"loop": true,
"name": "boost-speed-right-03",
"name": "move-speed-left-04",
"speed": 35.0
}, {
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"loop": true,
"name": "boost-speed-left-02",
"speed": 55.0
}, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
@ -252,19 +242,14 @@ animations = [ {
"name": "idle-speed-left-04",
"speed": 25.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "move-speed-right-04",
"speed": 35.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"loop": true,
"name": "idle-speed-right-03",
"speed": 25.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"loop": true,
"name": "boost-speed-right-04",
"name": "boost-speed-right-03",
"speed": 55.0
}, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
@ -272,6 +257,16 @@ animations = [ {
"name": "boost-speed-right-02",
"speed": 55.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "move-speed-right-04",
"speed": 35.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "boost-speed-right-04",
"speed": 55.0
}, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
"loop": true,
"name": "idle-speed-left-03",
@ -281,6 +276,11 @@ animations = [ {
"loop": true,
"name": "idle-speed-right-04",
"speed": 25.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "idle-speed-left-01",
"speed": 25.0
} ]
[sub_resource type="CircleShape2D" id=2]
@ -313,11 +313,6 @@ radius = 41.5403
[sub_resource type="SpriteFrames" id=6]
animations = [ {
"frames": [ ExtResource( 170 ) ],
"loop": true,
"name": "02",
"speed": 5.0
}, {
"frames": [ ExtResource( 27 ) ],
"loop": true,
"name": "01",
@ -328,6 +323,11 @@ animations = [ {
"name": "03",
"speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ],
"loop": true,
"name": "02",
"speed": 5.0
}, {
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "04",