From 7803d14fa03975d8f641063466819f17310f818a Mon Sep 17 00:00:00 2001 From: Recrown Date: Sun, 16 Jul 2017 22:10:40 -0500 Subject: [PATCH] adding explosion asset --- android/assets/particles/4PStar.png | Bin 0 -> 910 bytes android/assets/particles/explosion-s.p | 148 ++++++++++++++++++ .../zero1hd/polyjet/audio/AudioAnalyzer.java | 6 +- 3 files changed, 151 insertions(+), 3 deletions(-) create mode 100755 android/assets/particles/4PStar.png create mode 100755 android/assets/particles/explosion-s.p diff --git a/android/assets/particles/4PStar.png b/android/assets/particles/4PStar.png new file mode 100755 index 0000000000000000000000000000000000000000..1de8613201454d8da6a5962d5ab827f9d7f887d8 GIT binary patch literal 910 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KRx7?}Qfx;TbpI3Jy{x6e0Gq-}YC&%y#mu2$}V9W1R*D+4q{xmtr3PS6n5 zb68j)E!6shQ>ay=!|4wjr(ox|3i&rD=S@yOH}msa)v!-zW>$W`RlV=;+ppWtUrXBf zBV0ycEvx8k3+*UwEwjS#En*=#4+0MGv0KME9cA-lc~i3Cu_{og=!e9*vs=u7tg;H3 zd1t^Z_X9t2^lP=mEQRb?-^5yooynIF?VeC`p81=}9R6qKJzcKr+S?g-%jdCtmUcU; zq;g+GF8*+LLfzpN5e-XzOFlbxpS}4f|H353N$-4T+&=BF+3>$&h)#jxgqq^Taq(Qw z>|456^V+Ht^QPF&>V+umdlJ3v{lP!&0fho;yH^V9-JX8I?Bhxc2JU5@6H3xdq}w$9 zy!q1`P{=#QbQO!IJCCr?8v|~&y0iD%PrfhRA*$E*IMMpX|C_?1(-WpGFunXTL*`2C zDXGw=C7UJUQtvZ8FSIj1@O2*Ry7St%E+)Lbkr?^lV_U%&rNVGj3g>(&3cCH*u$ z9COszaQTR4|D=cMmjiCBFTAUn!eLuB>ptg9Y< zcve|3Bpy|&5K7bekrfdw`K`IDc|-D>MUvKcHYEgXWGJ0(wI}CJ4|?Pg~%|Mor0|F_wRN79=s72tP|a zbhvMNz(&S<77`CUy}+rf!u62EgSQo&qS6ayCge`ODUG@ub({x92|l(rzzm0n9E8p00i_>zopr0P;naApigX literal 0 HcmV?d00001 diff --git a/android/assets/particles/explosion-s.p b/android/assets/particles/explosion-s.p new file mode 100755 index 0000000..7f2ff3e --- /dev/null +++ b/android/assets/particles/explosion-s.p @@ -0,0 +1,148 @@ +point1 +- Delay - +active: false +- Duration - +lowMin: 50.0 +lowMax: 50.0 +- Count - +min: 0 +max: 30 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 250.0 +highMax: 500.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.5 +highMax: 2.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 2.0 +highMax: 8.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: 180.0 +highMax: 180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 1.0 +colors1: 0.047058824 +colors2: 0.047058824 +colors3: 1.0 +colors4: 0.92156863 +colors5: 0.047058824 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.31578946 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.74657536 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +4PStar.png diff --git a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java index 46635a2..3e5951d 100755 --- a/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java +++ b/core/src/zero1hd/polyjet/audio/AudioAnalyzer.java @@ -70,11 +70,11 @@ public class AudioAnalyzer { bassBinBegin = 1; bassBinEnd = 17; - UMBinBegin = 350; + UMBinBegin = 200; UMBinEnd = 512; - bassThresholdCalcRange = thresholdRangeCalc(0.3f); - UMThresholdCalcRange = thresholdRangeCalc(0.35f); + bassThresholdCalcRange = thresholdRangeCalc(0.28f); + UMThresholdCalcRange = thresholdRangeCalc(0.3f); Gdx.app.debug("Read freq", String.valueOf(audioData.getFormat().getSampleRate())); Gdx.app.debug("Using following bin ranges", "\nBass freq begin: " + bassBinBegin + "\nBass freq end: " + bassBinEnd + "\nMain freq begin: " + UMBinBegin + "\nMain freq end: " + UMBinEnd);