From 1aa4ff083ce792d886faeae3cb4abfc9f36e97ce Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Tue, 15 Jun 2010 14:59:57 -0700 Subject: [PATCH] Update AppApps to use reflected files. Previous files were hand written placeholders. This also fixed the physics bug where movement was right. Change-Id: I98838084d60f0eaf22f7fbd148a80b2f73f9a14c --- res/raw/allapps.rs | 6 +- res/raw/allapps_bc.bc | Bin 10208 -> 11644 bytes src/com/android/launcher2/AllApps3D.java | 12 +- .../android/launcher2/ScriptC_Allapps.java | 300 ++++++++++++++++++ .../android/launcher2/ScriptC_allapps.java | 197 ------------ .../launcher2/ScriptField_VpConsts.java | 74 +++-- 6 files changed, 351 insertions(+), 238 deletions(-) create mode 100644 src/com/android/launcher2/ScriptC_Allapps.java delete mode 100644 src/com/android/launcher2/ScriptC_allapps.java diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index e1a762dbd0..d947613ba9 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -18,7 +18,7 @@ float gNewPositionX; int gNewTouchDown; float gFlingVelocity; int gIconCount; -int gSelectedIconIndex; +int gSelectedIconIndex = -1; rs_allocation gSelectedIconTexture; float gZoomTarget; rs_allocation gHomeButton; @@ -34,7 +34,7 @@ rs_mesh gSMCell; rs_allocation *gIconIDs; rs_allocation *gLabelIDs; -typedef struct VpConsts_s { +typedef struct VpConsts { float4 Position; float4 ScaleOffset; float2 BendPos; @@ -310,7 +310,7 @@ static void drawFrontGrid(float rowOffset, float p) float x = colWidth * col + (colWidth / 2); vpConstants->Position.x = x + 0.2f; - if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture) { + if (gSelectedIconIndex == iconNum && !p && gSelectedIconTexture.p) { rsgBindProgramFragment(gPFTexNearest); rsgBindTexture(gPFTexNearest, 0, gSelectedIconTexture); vpConstants->ImgSize.x = rsAllocationGetDimX(gSelectedIconTexture); diff --git a/res/raw/allapps_bc.bc b/res/raw/allapps_bc.bc index 36e234cf425b9ea6ac101f7253a96bcfc5dc9fc9..3835d7d748fc1c6b22a670f570cedae8ae77f950 100644 GIT binary patch literal 11644 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 OZ^rMinh!S}{QW;z(eI4_ literal 10208 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 DF-5J? diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java index 1279ff8c1c..8896ec0ef5 100644 --- a/src/com/android/launcher2/AllApps3D.java +++ b/src/com/android/launcher2/AllApps3D.java @@ -965,7 +965,7 @@ public class AllApps3D extends RSSurfaceView private int mHeight; private Resources mRes; - ScriptC_allapps mScript; + ScriptC_Allapps mScript; //private ProgramStore mPSIcons; private ProgramFragment mPFTexMip; @@ -1033,7 +1033,7 @@ public class AllApps3D extends RSSurfaceView mRes = res; mWidth = width; mHeight = height; - mScript = new ScriptC_allapps(sRS, mRes, R.raw.allapps_bc, true); + mScript = new ScriptC_Allapps(sRS, mRes, R.raw.allapps_bc, true); initProgramVertex(); initProgramFragment(); @@ -1264,7 +1264,7 @@ public class AllApps3D extends RSSurfaceView sRollo.mScript.set_gZoomTarget(0); } if (!animate) { - sRollo.mScript.invokable_SetZoom(); + sRollo.mScript.invoke_setZoom(); } } @@ -1368,16 +1368,16 @@ public class AllApps3D extends RSSurfaceView } void fling() { - mScript.invokable_Fling(); + mScript.invoke_fling(); } void move() { - mScript.invokable_Move(); + mScript.invoke_move(); } void moveTo(float row) { mScript.set_gTargetPos(row); - mScript.invokable_MoveTo(); + mScript.invoke_moveTo(); } /** diff --git a/src/com/android/launcher2/ScriptC_Allapps.java b/src/com/android/launcher2/ScriptC_Allapps.java new file mode 100644 index 0000000000..55e3df06ed --- /dev/null +++ b/src/com/android/launcher2/ScriptC_Allapps.java @@ -0,0 +1,300 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher2; + +import android.renderscript.*; +import android.content.res.Resources; +import android.util.Log; + +public class ScriptC_Allapps extends ScriptC { + // Constructor + public ScriptC_Allapps(RenderScript rs, Resources resources, int id, boolean isRoot) { + super(rs, resources, id, isRoot); + } + + private final static int mExportVarIdx_COLUMNS_PER_PAGE_PORTRAIT = 0; + private int mExportVar_COLUMNS_PER_PAGE_PORTRAIT; + public void set_COLUMNS_PER_PAGE_PORTRAIT(int v) { + mExportVar_COLUMNS_PER_PAGE_PORTRAIT = v; + setVar(mExportVarIdx_COLUMNS_PER_PAGE_PORTRAIT, v); + } + + public int get_COLUMNS_PER_PAGE_PORTRAIT() { + return mExportVar_COLUMNS_PER_PAGE_PORTRAIT; + } + + private final static int mExportVarIdx_ROWS_PER_PAGE_PORTRAIT = 1; + private int mExportVar_ROWS_PER_PAGE_PORTRAIT; + public void set_ROWS_PER_PAGE_PORTRAIT(int v) { + mExportVar_ROWS_PER_PAGE_PORTRAIT = v; + setVar(mExportVarIdx_ROWS_PER_PAGE_PORTRAIT, v); + } + + public int get_ROWS_PER_PAGE_PORTRAIT() { + return mExportVar_ROWS_PER_PAGE_PORTRAIT; + } + + private final static int mExportVarIdx_COLUMNS_PER_PAGE_LANDSCAPE = 2; + private int mExportVar_COLUMNS_PER_PAGE_LANDSCAPE; + public void set_COLUMNS_PER_PAGE_LANDSCAPE(int v) { + mExportVar_COLUMNS_PER_PAGE_LANDSCAPE = v; + setVar(mExportVarIdx_COLUMNS_PER_PAGE_LANDSCAPE, v); + } + + public int get_COLUMNS_PER_PAGE_LANDSCAPE() { + return mExportVar_COLUMNS_PER_PAGE_LANDSCAPE; + } + + private final static int mExportVarIdx_ROWS_PER_PAGE_LANDSCAPE = 3; + private int mExportVar_ROWS_PER_PAGE_LANDSCAPE; + public void set_ROWS_PER_PAGE_LANDSCAPE(int v) { + mExportVar_ROWS_PER_PAGE_LANDSCAPE = v; + setVar(mExportVarIdx_ROWS_PER_PAGE_LANDSCAPE, v); + } + + public int get_ROWS_PER_PAGE_LANDSCAPE() { + return mExportVar_ROWS_PER_PAGE_LANDSCAPE; + } + + private final static int mExportVarIdx_gNewPositionX = 4; + private float mExportVar_gNewPositionX; + public void set_gNewPositionX(float v) { + mExportVar_gNewPositionX = v; + setVar(mExportVarIdx_gNewPositionX, v); + } + + public float get_gNewPositionX() { + return mExportVar_gNewPositionX; + } + + private final static int mExportVarIdx_gNewTouchDown = 5; + private int mExportVar_gNewTouchDown; + public void set_gNewTouchDown(int v) { + mExportVar_gNewTouchDown = v; + setVar(mExportVarIdx_gNewTouchDown, v); + } + + public int get_gNewTouchDown() { + return mExportVar_gNewTouchDown; + } + + private final static int mExportVarIdx_gFlingVelocity = 6; + private float mExportVar_gFlingVelocity; + public void set_gFlingVelocity(float v) { + mExportVar_gFlingVelocity = v; + setVar(mExportVarIdx_gFlingVelocity, v); + } + + public float get_gFlingVelocity() { + return mExportVar_gFlingVelocity; + } + + private final static int mExportVarIdx_gIconCount = 7; + private int mExportVar_gIconCount; + public void set_gIconCount(int v) { + mExportVar_gIconCount = v; + setVar(mExportVarIdx_gIconCount, v); + } + + public int get_gIconCount() { + return mExportVar_gIconCount; + } + + private final static int mExportVarIdx_gSelectedIconIndex = 8; + private int mExportVar_gSelectedIconIndex; + public void set_gSelectedIconIndex(int v) { + mExportVar_gSelectedIconIndex = v; + setVar(mExportVarIdx_gSelectedIconIndex, v); + } + + public int get_gSelectedIconIndex() { + return mExportVar_gSelectedIconIndex; + } + + private final static int mExportVarIdx_gSelectedIconTexture = 9; + private Allocation mExportVar_gSelectedIconTexture; + public void set_gSelectedIconTexture(Allocation v) { + mExportVar_gSelectedIconTexture = v; + setVar(mExportVarIdx_gSelectedIconTexture, (v == null) ? 0 : v.getID()); + } + + public Allocation get_gSelectedIconTexture() { + return mExportVar_gSelectedIconTexture; + } + + private final static int mExportVarIdx_gZoomTarget = 10; + private float mExportVar_gZoomTarget; + public void set_gZoomTarget(float v) { + mExportVar_gZoomTarget = v; + setVar(mExportVarIdx_gZoomTarget, v); + } + + public float get_gZoomTarget() { + return mExportVar_gZoomTarget; + } + + private final static int mExportVarIdx_gHomeButton = 11; + private Allocation mExportVar_gHomeButton; + public void set_gHomeButton(Allocation v) { + mExportVar_gHomeButton = v; + setVar(mExportVarIdx_gHomeButton, (v == null) ? 0 : v.getID()); + } + + public Allocation get_gHomeButton() { + return mExportVar_gHomeButton; + } + + private final static int mExportVarIdx_gTargetPos = 12; + private float mExportVar_gTargetPos; + public void set_gTargetPos(float v) { + mExportVar_gTargetPos = v; + setVar(mExportVarIdx_gTargetPos, v); + } + + public float get_gTargetPos() { + return mExportVar_gTargetPos; + } + + private final static int mExportVarIdx_gPFTexNearest = 13; + private ProgramFragment mExportVar_gPFTexNearest; + public void set_gPFTexNearest(ProgramFragment v) { + mExportVar_gPFTexNearest = v; + setVar(mExportVarIdx_gPFTexNearest, (v == null) ? 0 : v.getID()); + } + + public ProgramFragment get_gPFTexNearest() { + return mExportVar_gPFTexNearest; + } + + private final static int mExportVarIdx_gPFTexMip = 14; + private ProgramFragment mExportVar_gPFTexMip; + public void set_gPFTexMip(ProgramFragment v) { + mExportVar_gPFTexMip = v; + setVar(mExportVarIdx_gPFTexMip, (v == null) ? 0 : v.getID()); + } + + public ProgramFragment get_gPFTexMip() { + return mExportVar_gPFTexMip; + } + + private final static int mExportVarIdx_gPFTexMipAlpha = 15; + private ProgramFragment mExportVar_gPFTexMipAlpha; + public void set_gPFTexMipAlpha(ProgramFragment v) { + mExportVar_gPFTexMipAlpha = v; + setVar(mExportVarIdx_gPFTexMipAlpha, (v == null) ? 0 : v.getID()); + } + + public ProgramFragment get_gPFTexMipAlpha() { + return mExportVar_gPFTexMipAlpha; + } + + private final static int mExportVarIdx_gPVCurve = 16; + private ProgramVertex mExportVar_gPVCurve; + public void set_gPVCurve(ProgramVertex v) { + mExportVar_gPVCurve = v; + setVar(mExportVarIdx_gPVCurve, (v == null) ? 0 : v.getID()); + } + + public ProgramVertex get_gPVCurve() { + return mExportVar_gPVCurve; + } + + private final static int mExportVarIdx_gPS = 17; + private ProgramStore mExportVar_gPS; + public void set_gPS(ProgramStore v) { + mExportVar_gPS = v; + setVar(mExportVarIdx_gPS, (v == null) ? 0 : v.getID()); + } + + public ProgramStore get_gPS() { + return mExportVar_gPS; + } + + private final static int mExportVarIdx_gSMCell = 18; + private SimpleMesh mExportVar_gSMCell; + public void set_gSMCell(SimpleMesh v) { + mExportVar_gSMCell = v; + setVar(mExportVarIdx_gSMCell, (v == null) ? 0 : v.getID()); + } + + public SimpleMesh get_gSMCell() { + return mExportVar_gSMCell; + } + + private final static int mExportVarIdx_gIconIDs = 19; + private Allocation mExportVar_gIconIDs; + public void bind_gIconIDs(Allocation v) { + mExportVar_gIconIDs = v; + if(v == null) bindAllocation(null, mExportVarIdx_gIconIDs); + else bindAllocation(v, mExportVarIdx_gIconIDs); + } + + public Allocation get_gIconIDs() { + return mExportVar_gIconIDs; + } + + private final static int mExportVarIdx_gLabelIDs = 20; + private Allocation mExportVar_gLabelIDs; + public void bind_gLabelIDs(Allocation v) { + mExportVar_gLabelIDs = v; + if(v == null) bindAllocation(null, mExportVarIdx_gLabelIDs); + else bindAllocation(v, mExportVarIdx_gLabelIDs); + } + + public Allocation get_gLabelIDs() { + return mExportVar_gLabelIDs; + } + + private final static int mExportVarIdx_vpConstants = 21; + private ScriptField_VpConsts mExportVar_vpConstants; + public void bind_vpConstants(ScriptField_VpConsts v) { + mExportVar_vpConstants = v; + if(v == null) bindAllocation(null, mExportVarIdx_vpConstants); + else bindAllocation(v.getAllocation(), mExportVarIdx_vpConstants); + } + + public ScriptField_VpConsts get_vpConstants() { + return mExportVar_vpConstants; + } + + private final static int mExportFuncIdx_resetHWWar = 0; + public void invoke_resetHWWar() { + invoke(mExportFuncIdx_resetHWWar); + } + + private final static int mExportFuncIdx_move = 1; + public void invoke_move() { + invoke(mExportFuncIdx_move); + } + + private final static int mExportFuncIdx_moveTo = 2; + public void invoke_moveTo() { + invoke(mExportFuncIdx_moveTo); + } + + private final static int mExportFuncIdx_setZoom = 3; + public void invoke_setZoom() { + invoke(mExportFuncIdx_setZoom); + } + + private final static int mExportFuncIdx_fling = 4; + public void invoke_fling() { + invoke(mExportFuncIdx_fling); + } + +} + diff --git a/src/com/android/launcher2/ScriptC_allapps.java b/src/com/android/launcher2/ScriptC_allapps.java deleted file mode 100644 index 4bd1c3926c..0000000000 --- a/src/com/android/launcher2/ScriptC_allapps.java +++ /dev/null @@ -1,197 +0,0 @@ - -package com.android.launcher2; - -import android.content.res.Resources; -import android.renderscript.*; -import android.util.Log; - -public class ScriptC_allapps - extends android.renderscript.ScriptC -{ - public ScriptC_allapps(RenderScript rs, Resources resources, int id, boolean isRoot) { - super(rs, resources, id, isRoot); - } - - private int mField_COLUMNS_PER_PAGE_PORTRAIT; - public void set_COLUMNS_PER_PAGE_PORTRAIT(int v) { - mField_COLUMNS_PER_PAGE_PORTRAIT = v; - setVar(0, v); - } - - private int mField_ROWS_PER_PAGE_PORTRAIT; - public void set_ROWS_PER_PAGE_PORTRAIT(int v) { - mField_ROWS_PER_PAGE_PORTRAIT = v; - setVar(1, v); - } - - private int mField_COLUMNS_PER_PAGE_LANDSCAPE; - public void set_COLUMNS_PER_PAGE_LANDSCAPE(int v) { - mField_COLUMNS_PER_PAGE_LANDSCAPE = v; - setVar(2, v); - } - - private int mField_ROWS_PER_PAGE_LANDSCAPE; - public void set_ROWS_PER_PAGE_LANDSCAPE(int v) { - mField_ROWS_PER_PAGE_LANDSCAPE = v; - setVar(3, v); - } - - - private float mField_gNewPositionX; - public void set_gNewPositionX(float v) { - mField_gNewPositionX = v; - setVar(4, v); - } - - private int mField_gNewTouchDown; - public void set_gNewTouchDown(int v) { - mField_gNewTouchDown = v; - setVar(5, v); - } - - private float mField_gFlingVelocity; - public void set_gFlingVelocity(float v) { - mField_gFlingVelocity = v; - setVar(6, v); - } - - private int mField_gIconCount; - public void set_gIconCount(int v) { - mField_gIconCount = v; - setVar(7, v); - } - public int get_gIconCount() { - return mField_gIconCount; - } - - private int mField_gSelectedIconIndex; - public void set_gSelectedIconIndex(int v) { - mField_gSelectedIconIndex = v; - setVar(8, v); - } - public int get_gSelectedIconIndex() { - return mField_gSelectedIconIndex; - } - - private Allocation mField_gSelectedIconTexture; - public void set_gSelectedIconTexture(Allocation v) { - mField_gSelectedIconTexture = v; - setVar(9, v.getID()); - } - - private float mField_gZoomTarget; - public void set_gZoomTarget(float v) { - mField_gZoomTarget = v; - setVar(10, v); - } - - private Allocation mField_gHomeButton; - public void set_gHomeButton(Allocation v) { - mField_gHomeButton = v; - setVar(11, v.getID()); - } - - private float mField_gTargetPos; - public void set_gTargetPos(float v) { - mField_gTargetPos = v; - setVar(12, v); - } - - - private ProgramFragment mField_gPFTexNearest; - public void set_gPFTexNearest(ProgramFragment v) { - mField_gPFTexNearest = v; - setVar(13, v.getID()); - } - - private ProgramFragment mField_gPFTexMip; - public void set_gPFTexMip(ProgramFragment v) { - mField_gPFTexMip = v; - setVar(14, v.getID()); - } - - private ProgramFragment mField_gPFTexMipAlpha; - public void set_gPFTexMipAlpha(ProgramFragment v) { - mField_gPFTexMipAlpha = v; - setVar(15, v.getID()); - } - - private ProgramVertex mField_gPVCurve; - public void set_gPVCurve(ProgramVertex v) { - mField_gPVCurve = v; - setVar(16, v.getID()); - } - - private ProgramStore mField_gPS; - public void set_gPS(ProgramStore v) { - mField_gPS = v; - setVar(17, v.getID()); - } - - private SimpleMesh mField_gSMCell; - public void set_gSMCell(SimpleMesh v) { - mField_gSMCell = v; - setVar(18, v.getID()); - } - - - // binds - private Allocation mField_gIconIDs; - public void bind_gIconIDs(Allocation f) { - mField_gIconIDs = f; - bindAllocation(f, 19); - } - public Allocation get_gIconIDs() { - return mField_gIconIDs; - } - - private Allocation mField_gLabelIDs; - public void bind_gLabelIDs(Allocation f) { - mField_gLabelIDs = f; - bindAllocation(f, 20); - } - public Allocation get_gLabelIDs() { - return mField_gLabelIDs; - } - - private ScriptField_VpConsts mField_vpConstants; - public void bind_vpConstants(ScriptField_VpConsts f) { - android.util.Log.e("rs", "bind_vpConstants " + f); - mField_vpConstants = f; - if (f == null) { - bindAllocation(null, 21); - } else { - bindAllocation(f.getAllocation(), 21); - } - } - public ScriptField_VpConsts get_vpConstants() { - return mField_vpConstants; - } - - - -//#pragma rs export_func(resetHWWar, move, moveTo, setZoom, fling) - - public void invokable_Move() { - //android.util.Log.e("rs", "invokable_Move"); - invoke(7); // verified - } - public void invokable_MoveTo() { - //android.util.Log.e("rs", "invokable_MoveTo"); - invoke(8); // verified - } - public void invokable_Fling() { - //android.util.Log.e("rs", "invokable_Fling"); - invoke(2); - } - //public void invokable_ResetWAR() { - //android.util.Log.e("rs", "invokable_WAR"); - //invoke(9); // verified - //} - public void invokable_SetZoom() { - //android.util.Log.e("rs", "invokable_SetZoom"); - invoke(12); - } -} - - diff --git a/src/com/android/launcher2/ScriptField_VpConsts.java b/src/com/android/launcher2/ScriptField_VpConsts.java index c6411fe84a..f3ef68413a 100644 --- a/src/com/android/launcher2/ScriptField_VpConsts.java +++ b/src/com/android/launcher2/ScriptField_VpConsts.java @@ -1,15 +1,34 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.android.launcher2; -import android.content.res.Resources; import android.renderscript.*; +import android.content.res.Resources; import android.util.Log; -public class ScriptField_VpConsts - extends android.renderscript.Script.FieldBase -{ - +public class ScriptField_VpConsts extends android.renderscript.Script.FieldBase { static public class Item { + public static final int sizeof = 48; + + Float4 Position; + Float4 ScaleOffset; + Float2 BendPos; + Float2 ImgSize; + Item() { Position = new Float4(); ScaleOffset = new Float4(); @@ -17,32 +36,27 @@ public class ScriptField_VpConsts ImgSize = new Float2(); } - public static final int sizeof = (12*4); - - Float4 Position; - Float4 ScaleOffset; - Float2 BendPos; - Float2 ImgSize; } + private Item mItemArray[]; - - - public ScriptField_VpConsts(RenderScript rs, int count) { - // Allocate a pack/unpack buffer - mIOBuffer = new FieldPacker(Item.sizeof * count); - mItemArray = new Item[count]; - - Element.Builder eb = new Element.Builder(rs); - eb.add(Element.F32_4(rs), "Position"); - eb.add(Element.F32_4(rs), "ScaleOffset"); - eb.add(Element.F32_2(rs), "BendPos"); - eb.add(Element.F32_2(rs), "ImgSize"); - mElement = eb.create(); + private FieldPacker mIOBuffer; + public ScriptField_VpConsts(RenderScript rs, int count) { + mItemArray = null; + mIOBuffer = null; + { + Element.Builder eb = new Element.Builder(rs); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 4), "Position"); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 4), "ScaleOffset"); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "BendPos"); + eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "ImgSize"); + mElement = eb.create(); + } init(rs, count); } private void copyToArray(Item i, int index) { + if (mIOBuffer == null) mIOBuffer = new FieldPacker(Item.sizeof * mType.getX() /* count */); mIOBuffer.reset(index * Item.sizeof); mIOBuffer.addF32(i.Position); mIOBuffer.addF32(i.ScaleOffset); @@ -51,23 +65,19 @@ public class ScriptField_VpConsts } public void set(Item i, int index, boolean copyNow) { + if (mItemArray == null) mItemArray = new Item[mType.getX() /* count */]; mItemArray[index] = i; - if (copyNow) { + if (copyNow) { copyToArray(i, index); mAllocation.subData1D(index * Item.sizeof, Item.sizeof, mIOBuffer.getData()); } + } public void copyAll() { - for (int ct=0; ct < mItemArray.length; ct++) { - copyToArray(mItemArray[ct], ct); - } + for (int ct=0; ct < mItemArray.length; ct++) copyToArray(mItemArray[ct], ct); mAllocation.data(mIOBuffer.getData()); } - - private FieldPacker mIOBuffer; - - }