From 99ff9594e5bb5bf4a933785b356e821f6dcd9ce8 Mon Sep 17 00:00:00 2001 From: zenoamaro Date: Sun, 30 Jun 2019 02:07:12 +0200 Subject: [PATCH] Float trajectory alpha --- constants.js | 1 + main.js | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/constants.js b/constants.js index 1f55521..c0c35b2 100644 --- a/constants.js +++ b/constants.js @@ -28,6 +28,7 @@ export const PROJECTILE_ITERATIONS_PER_FRAME = 30; export const PROJECTILE_ITERATION_PROGRESS = 0.01; export const PROJECTILE_MIN_SOUND_FREQUENCY = 220; export const PROJECTILE_MAX_SOUND_FREQUENCY = 2200; +export const TRAJECTORY_FADE_SPEED = 0.6; export const PARTICLE_AMOUNT = 30; export const PARTICLE_MIN_POWER_FACTOR = 0.4; diff --git a/main.js b/main.js index 13bc5a3..9b5f85c 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -import {H, PROJECTILE_MAX_SOUND_FREQUENCY, MAX_WIND, PROJECTILE_MIN_SOUND_FREQUENCY, PLAYER_COLORS, PLAYER_INITIAL_POWER, PROJECTILE_POWER_REDUCTION_FACTOR, W, Z, PROJECTILE_ITERATIONS_PER_FRAME, PROJECTILE_ITERATION_PROGRESS, PLAYER_MAX_ENERGY, PLAYER_ENERGY_POWER_MULTIPLIER, PLAYER_FALL_DAMAGE_FACTOR, PLAYER_FALL_DAMAGE_HEIGHT, PLAYER_WEAPON_CHANGE_DELAY, PARTICLE_AMOUNT, PROJECTILE_WIND_REDUCTION_FACTOR, PARTICLE_POWER_REDUCTION_FACTOR, PARTICLE_WIND_REDUCTION_FACTOR, PARTICLE_MIN_POWER_FACTOR, PARTICLE_MAX_POWER_FACTOR, PARTICLE_MIN_LIFETIME, PARTICLE_TIME_FACTOR, PLAYER_EXPLOSION_PARTICLE_POWER, EXPLOSION_SHAKE_REDUCTION_FACTOR, MAX_EXPLOSION_SHAKE_FACTOR} from './constants.js'; +import {H, PROJECTILE_MAX_SOUND_FREQUENCY, MAX_WIND, PROJECTILE_MIN_SOUND_FREQUENCY, PLAYER_COLORS, PLAYER_INITIAL_POWER, PROJECTILE_POWER_REDUCTION_FACTOR, W, Z, PROJECTILE_ITERATIONS_PER_FRAME, PROJECTILE_ITERATION_PROGRESS, PLAYER_MAX_ENERGY, PLAYER_ENERGY_POWER_MULTIPLIER, PLAYER_FALL_DAMAGE_FACTOR, PLAYER_FALL_DAMAGE_HEIGHT, PLAYER_WEAPON_CHANGE_DELAY, PARTICLE_AMOUNT, PROJECTILE_WIND_REDUCTION_FACTOR, PARTICLE_POWER_REDUCTION_FACTOR, PARTICLE_WIND_REDUCTION_FACTOR, PARTICLE_MIN_POWER_FACTOR, PARTICLE_MAX_POWER_FACTOR, PARTICLE_MIN_LIFETIME, PARTICLE_TIME_FACTOR, PLAYER_EXPLOSION_PARTICLE_POWER, EXPLOSION_SHAKE_REDUCTION_FACTOR, MAX_EXPLOSION_SHAKE_FACTOR, TRAJECTORY_FADE_SPEED} from './constants.js'; import {createCanvas, drawLine, drawRect, drawText, loop, plot, drawLineVirtual} from './gfx.js'; import {key} from './input.js'; import {clamp, deg2rad, parable, randomInt, vec, wrap, random} from './math.js'; @@ -17,7 +17,6 @@ let currentPlayer = 0; let projectile = null; let explosion = null; let wind = 0; -let fadeCount = 0; let lastWeaponChangeTime = 0; let particles = []; let screenShake = 0; @@ -167,10 +166,7 @@ function update() { } } - if (++fadeCount % 3 === 0) { - fadeTrajectories(2); - fadeCount = 0; - } + fadeTrajectories(TRAJECTORY_FADE_SPEED); let trajectory = drawLineVirtual( prevProjectile.x, prevProjectile.y,