Cleanup and stuff
This commit is contained in:
parent
72bcd912bb
commit
4c64946609
5 changed files with 8 additions and 11 deletions
|
@ -13,7 +13,7 @@ var animationTick = 0
|
||||||
var filtering = false
|
var filtering = false
|
||||||
|
|
||||||
#Object Selection
|
#Object Selection
|
||||||
var heldSprite = null
|
var heldSprite: SpriteObject = null
|
||||||
var lastArray = []
|
var lastArray = []
|
||||||
var i = 0
|
var i = 0
|
||||||
|
|
||||||
|
@ -48,8 +48,6 @@ var micResetTime = 180
|
||||||
|
|
||||||
var updatePusherNode = null
|
var updatePusherNode = null
|
||||||
|
|
||||||
var rand = RandomNumberGenerator.new()
|
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
spectrum = AudioServer.get_bus_effect_instance(1, 1)
|
spectrum = AudioServer.get_bus_effect_instance(1, 1)
|
||||||
|
|
||||||
|
@ -277,10 +275,10 @@ func blinking():
|
||||||
blinkTick += 1
|
blinkTick += 1
|
||||||
if blinkTick == 0:
|
if blinkTick == 0:
|
||||||
blink = false
|
blink = false
|
||||||
if rand.randf_range(-1.0,1.0) > 0.5:
|
if randf_range(-1.0,1.0) > 0.5:
|
||||||
blinkTick = (420 * blinkSpeed) + 1
|
blinkTick = (420 * blinkSpeed) + 1
|
||||||
if blinkTick > 420 * blinkSpeed:
|
if blinkTick > 420 * blinkSpeed:
|
||||||
if rand.randi() % int(blinkChance) == 0:
|
if randi() % int(blinkChance) == 0:
|
||||||
blink = true
|
blink = true
|
||||||
|
|
||||||
blinkTick = -12
|
blinkTick = -12
|
||||||
|
|
1
global-input-reading/.gdignore
Normal file
1
global-input-reading/.gdignore
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -271,9 +271,7 @@ func swapMode():
|
||||||
|
|
||||||
#Adds sprite object to scene
|
#Adds sprite object to scene
|
||||||
func add_image(path):
|
func add_image(path):
|
||||||
|
var id = randi()
|
||||||
var rand = RandomNumberGenerator.new()
|
|
||||||
var id = rand.randi()
|
|
||||||
|
|
||||||
var sprite = spriteObject.instantiate()
|
var sprite = spriteObject.instantiate()
|
||||||
sprite.path = path
|
sprite.path = path
|
||||||
|
@ -461,8 +459,7 @@ func _on_replace_dialog_visibility_changed():
|
||||||
func _on_duplicate_button_pressed():
|
func _on_duplicate_button_pressed():
|
||||||
if Global.heldSprite == null:
|
if Global.heldSprite == null:
|
||||||
return
|
return
|
||||||
var rand = RandomNumberGenerator.new()
|
var id = randi()
|
||||||
var id = rand.randi()
|
|
||||||
|
|
||||||
var sprite = spriteObject.instantiate()
|
var sprite = spriteObject.instantiate()
|
||||||
sprite.path = Global.heldSprite.path
|
sprite.path = Global.heldSprite.path
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
extends Node2D
|
extends Node2D
|
||||||
|
class_name SpriteObject
|
||||||
|
|
||||||
var type = "sprite"
|
var type = "sprite"
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ func _on_bounce_gravity_value_changed(value):
|
||||||
|
|
||||||
Global.pushUpdate("Bounce gravity value changed.")
|
Global.pushUpdate("Bounce gravity value changed.")
|
||||||
|
|
||||||
func costumeButtonsPressed(label,id):
|
func costumeButtonsPressed(label: Label, id):
|
||||||
label.text = "AWAITING INPUT"
|
label.text = "AWAITING INPUT"
|
||||||
await Global.main.emptiedCapture
|
await Global.main.emptiedCapture
|
||||||
awaitingCostumeInput = id - 1
|
awaitingCostumeInput = id - 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue