From 61d10a4e43aea5cc60b849ce3cee718792233146 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Fri, 25 Jun 2010 15:09:45 -0700 Subject: [PATCH] Update fountain to use boolean rather than ints for true/false. Change-Id: I5e8334f53239c869caeaff45e611309cea5ba284 --- libs/rs/java/Fountain/res/raw/fountain.rs | 2 +- libs/rs/java/Fountain/res/raw/fountain_bc.bc | Bin 2920 -> 2924 bytes .../src/com/android/fountain/FountainRS.java | 2 +- .../android/fountain/ScriptC_Fountain.java | 5 +++-- .../android/fountain/ScriptField_Point.java | 19 +++++++++--------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/rs/java/Fountain/res/raw/fountain.rs b/libs/rs/java/Fountain/res/raw/fountain.rs index 6ff4c5bbea90e..ef12d9accb8d2 100644 --- a/libs/rs/java/Fountain/res/raw/fountain.rs +++ b/libs/rs/java/Fountain/res/raw/fountain.rs @@ -40,7 +40,7 @@ int root() { return 1; } -void addParticles(int rate, float x, float y, int newColor) +void addParticles(int rate, float x, float y, bool newColor) { if (newColor) { partColor.x = rsRand(0.5f, 1.0f); diff --git a/libs/rs/java/Fountain/res/raw/fountain_bc.bc b/libs/rs/java/Fountain/res/raw/fountain_bc.bc index b2006873ff18afd7a59b5c1b3a4542735488e453..ac6b7d4e5b0d0b98cc62e654dc8b21f8e9174163 100644 GIT binary patch delta 1495 zcmW+#dr%Wc9NtSVxeJ7ln1i{LAQ#@+2p5P74b~(e4@C?Q6^gZiAlhj~Q50~hd74lR ziXJ*tnNASKj;*x_sC2Z>#ZW}$xK_0QfupWm*_*gmf^AR$IKB2^Jvads>)4ZA9kZ>=4*E$6XQT zN|H-v06rJ$6-J;mMw1*!oRlFJMu-C>PxHtO%Sh(ivMNJrJmhH1iiyG&Wkt0%omhJz z6b-)w*&&_4mPa$H%h7sq_ZqZ4oZh))9Dv3I01PmQ)t8QHm7Ek=H~?iZLz8ywZglPM zaA|gMt80+zSQoVf8isCDe?qH2v@r8z48OYJJAnfkud8Q@CXukX8Iwt}8{LBFj6OKkFCE0nA&&{RxFswf)ZzeaqgpvK zXp*|d`N~|N?*f&sJw2}68f1SBQd_94^J%VgHE#5dk=L4ZPpuPo@Mu^!5{z}sie|<| zugFOmx3<~!K`io##Z}#i99ZBT=tpW|T|qZbt|uHhv%&J$2GL70aAsEYTL)2Rm)yc> zdy2!C+?|?q0qqeu#e5r%4%%$;JJ!6=X@xu(pQ1%C#G+ROA{APNuu6QIho)TjrL=Qb zwfi(ZJ~)-+P6!?4I+f@J!z2Rz-3M@_3Pox?c1gO7zNu-qYeszakg(4qq~hTq4b}u8 z6MNSSE7Lt)Q}RP5_??f2X5!soglsy_(_v|mL%^WnvL!Kvdb6;iQ$?l#Zx;RoM491b z5KMgy<4_#c2S^Dz!F&+d&x#nny{M&*ACr0m7c@tSFLKNm9vP(^`m(j# zB=Keu733J;?*aoW9FQEa8F{6agC7AoXFsziJBRD1@Sn%;J43!ih2^rN6CxC-Epu>6 zzrBc4>Itvo7n1y?qE+}-FMb5gu}%E%W7Mb&PZE3)cqj0Uwl8FXsE@@MW3d*!8khLB znVH%#GARcQhqQkBRxpKUw_@GiIzti<;Je1{nIUd1PXjD-{CDd*y>$g1F7QCjOLq{s z8{Y(hKIwusq@s|QthE>M+jboG)+soELo2N+LuHTN>zDT2%J&6y7_45UPuI(Fa+xns z##Ao4AbVi%AFoSMGu`>H=QhsiQ0}WxJArcD;8;UKvh|7b^~L#3dkY*Eb$=CypSO^f zIBHO-0&|LUy$1iIXL1>QV~mYM#SaMbm?~-*Q#6ob+YF(_AUt8qBNIw@j(%4{1e8<` zO{Q(qrO|2lUD|NuB*ti6)h)|REYLn(*=t@dTdM$f&lay!sW$8k)9Tdu4p|<9w?4K= z;6wBBa_WB*WzSaRXAk7RIK>#Jo}6Rjv+ZON(kZ?%uC|8(n_kE-S;xJPPO-v2UTF|Z z=O3o)vjSzWP&!Pm|+gxM=5Gcjm@?(yWA6C03wg*htKvGpNr ze1FVOk+gnWoO4{g@nA?clli=ujTghLrJ?=$1#6-)y^K*BznUB*ou9rkhYvn^aA4Pl zjQNG`F!AO_;_&Lww6+K3k}dlsMt%YLaL+H%dWK)fRB?E)7}Ia*k4zfejUb=yBm5_% zgOo}Tf?!QL0R}--z92H9IuutY-kLq^UGAhyR`Lf2RCSQdXhK`|m5&U_Q)MmIlhkQ} c6T&EkUtxf4pe62`V>5Bnn&;;dDW~7$e=R5vy8r+H delta 1475 zcmW+#drVVT96tB<_TF3i;8qG=LMtsrWD0uAQwDQwVNevYJcbZqX{{ogi1?U*+3cm1 zmLNjOZ5R$`5EC2$@c+|<;zJ>$^mF1 z;6T>|O57uHQ?Pg7guGbzq zxCY$?m`{<=bi@g`N?=0dxMe9dyVvzhdd!4;ym$P?h6&2q$yFm+l5s$!vnI0E$UM1{ zuH6+Tp(mGo#AP~=c-H*e2nkWlLnKCI;DurbdtCyK3i}N`$pmquAjlQZ#US%gz*IyR zN3faCZp5h;>#1yDk++zaxffXOC-2VJnUJ%ON8(6A#ZmhN;A$d!cTiZ0pe}({j+#O} zxpC9kaJNa`q-sHx)&xLbZJCYkK7mjpwP>Y7n2lGlGR2-;DuQQd*9a%o5pBdnUu z>jijSir)%qYvl8#S+y%hBfKdzBn2*^k-*%6iCyXd!%;L-u#HQTr%u z=-&WTfq|fK995zvfPQV=G-`_|HHsz-U7px-Bek;y(16-v5EM%<>#xBD-#9$AnQ_Gi z>Rv6;Py5uMl65boIL~{?{10lv-ThNH#z^=|+}Ab9HW0UEETTOjt#K~y{iVgqL&a7) zY4k9R7A|Eak_9SNaDGpLN6&A69H{R^6tZ!==YgE+NM8MiL~(*5Ec0@;1R@j4p9PTr zyls>VjR(e`WR+;L+*zgf-1_4uB`nwV&*F87#b))>)S=|E%?fa@uV;%&wQXOdT9Z^{ zEn{)FeeoA9Mvg5?k1)$3c0JE7%JUYzI>!oU<^}@s`5vka>nHBaCN)I@i&lUd^Ei|E z`vCFuKqnEhI8~y}^O_#>Sd}%gLqi!ip>USFu4XM;|8kKCF)uC*o8)79=ss7f^KHZK zcjv2A9b0zb{9EyKV#E8HWV7Y4C}vEhJ06nbaO)mKTZF9f?!3&1pH54jA 0) { - mScript.invoke_addParticles(rate, x, y, !holdingColor ? 1 : 0); + mScript.invoke_addParticles(rate, x, y, !holdingColor); holdingColor = true; } else { holdingColor = false; diff --git a/libs/rs/java/Fountain/src/com/android/fountain/ScriptC_Fountain.java b/libs/rs/java/Fountain/src/com/android/fountain/ScriptC_Fountain.java index 2653f6b298b7f..a4c598be46e1e 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/ScriptC_Fountain.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/ScriptC_Fountain.java @@ -50,12 +50,13 @@ public class ScriptC_Fountain extends ScriptC { } private final static int mExportFuncIdx_addParticles = 0; - public void invoke_addParticles(int rate, float x, float y, int newColor) { + public void invoke_addParticles(int rate, float x, float y, boolean newColor) { FieldPacker addParticles_fp = new FieldPacker(16); addParticles_fp.addI32(rate); addParticles_fp.addF32(x); addParticles_fp.addF32(y); - addParticles_fp.addI32(newColor); + addParticles_fp.addBoolean(newColor); + addParticles_fp.skip(3); invoke(mExportFuncIdx_addParticles, addParticles_fp); } diff --git a/libs/rs/java/Fountain/src/com/android/fountain/ScriptField_Point.java b/libs/rs/java/Fountain/src/com/android/fountain/ScriptField_Point.java index dee4e96f44fc2..d88f47b6b3a70 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/ScriptField_Point.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/ScriptField_Point.java @@ -38,17 +38,18 @@ public class ScriptField_Point extends android.renderscript.Script.FieldBase { private Item mItemArray[]; private FieldPacker mIOBuffer; + public static Element createElement(RenderScript rs) { + Element.Builder eb = new Element.Builder(rs); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "delta"); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "position"); + eb.add(Element.createVector(rs, Element.DataType.UNSIGNED_8, 4), "color"); + return eb.create(); + } + public ScriptField_Point(RenderScript rs, int count) { mItemArray = null; mIOBuffer = null; - { - Element.Builder eb = new Element.Builder(rs); - eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "delta"); - eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "position"); - eb.add(Element.createVector(rs, Element.DataType.UNSIGNED_8, 4), "color"); - mElement = eb.create(); - } - + mElement = createElement(rs); init(rs, count); } @@ -65,7 +66,7 @@ public class ScriptField_Point extends android.renderscript.Script.FieldBase { mItemArray[index] = i; if (copyNow) { copyToArray(i, index); - mAllocation.subData1D(index * Item.sizeof, Item.sizeof, mIOBuffer.getData()); + mAllocation.subData1D(index, 1, mIOBuffer.getData()); } }