From ed08873f9f8e7f23f7d0c3a202fc493ffb091b38 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Sun, 8 Jan 2012 14:28:25 -0800 Subject: j3dcore: annotate lists of renderMolecules/renderAtoms in Canvas3D and RenderBin - annotate the one method these two lists are passed to Signed-off-by: Harvey Harrison --- src/classes/share/javax/media/j3d/Canvas3D.java | 4 ++-- src/classes/share/javax/media/j3d/RenderBin.java | 10 +++++----- src/classes/share/javax/media/j3d/Renderer.java | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/classes') diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java index 0a525f5..6037d2a 100644 --- a/src/classes/share/javax/media/j3d/Canvas3D.java +++ b/src/classes/share/javax/media/j3d/Canvas3D.java @@ -755,8 +755,8 @@ public class Canvas3D extends Canvas { // dirtyDlistPerRinfoList, dirtyRenderAtomList size > 0 boolean dirtyDisplayList = false; - ArrayList dirtyRenderMoleculeList = new ArrayList(); - ArrayList dirtyRenderAtomList = new ArrayList(); +ArrayList dirtyRenderMoleculeList = new ArrayList(); +ArrayList dirtyRenderAtomList = new ArrayList(); // List of (Rm, rInfo) pair of individual dlists that need to be rebuilt ArrayList dirtyDlistPerRinfoList = new ArrayList(); diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java index 1e2e969..bc8cc3d 100644 --- a/src/classes/share/javax/media/j3d/RenderBin.java +++ b/src/classes/share/javax/media/j3d/RenderBin.java @@ -3179,8 +3179,8 @@ System.err.println("......tb.soleUser= " + } void updateDirtyDisplayLists(Canvas3D cv, - ArrayList rmList, ArrayList dlistPerRinfoList, - ArrayList raList, boolean useSharedCtx ) { + ArrayList rmList, ArrayList dlistPerRinfoList, + ArrayList raList, boolean useSharedCtx ) { int size, i, bitMask; Context ctx; long timeStamp; @@ -3200,7 +3200,7 @@ System.err.println("......tb.soleUser= " + if (size > 0) { for (i = size-1; i >= 0; i--) { - RenderMolecule rm = (RenderMolecule)rmList.get(i); + RenderMolecule rm = rmList.get(i); rm.updateDisplayList(cv); } rmList.clear(); @@ -3222,13 +3222,13 @@ System.err.println("......tb.soleUser= " + GeometryArrayRetained geo; for (i = size-1; i >= 0; i--) { - ra = (RenderAtomListInfo)raList.get(i); + ra = raList.get(i); geo = (GeometryArrayRetained) ra.geometry(); geo.resourceCreationMask &= ~bitMask; } for (i = size-1; i >= 0; i--) { - ra = (RenderAtomListInfo)raList.get(i); + ra = raList.get(i); geo = (GeometryArrayRetained) ra.geometry(); if ((geo.resourceCreationMask & bitMask) == 0) { dlistRenderMethod.buildIndividualDisplayList(ra, cv, ctx); diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java index c57cfa5..ae96806 100644 --- a/src/classes/share/javax/media/j3d/Renderer.java +++ b/src/classes/share/javax/media/j3d/Renderer.java @@ -124,13 +124,13 @@ class Renderer extends J3dThread { // an unique number to identify this renderer : ( rendererBit = 1 << rendererId) int rendererId = 0; - // List of renderMolecules that are dirty due to additions - // or removal of renderAtoms from their display list set - // of renderAtoms - ArrayList dirtyRenderMoleculeList = new ArrayList(); +// List of renderMolecules that are dirty due to additions +// or removal of renderAtoms from their display list set +// of renderAtoms +ArrayList dirtyRenderMoleculeList = new ArrayList(); - // List of individual dlists that need to be rebuilt - ArrayList dirtyRenderAtomList = new ArrayList(); +// List of individual dlists that need to be rebuilt +ArrayList dirtyRenderAtomList = new ArrayList(); // List of (Rm, rInfo) pair of individual dlists that need to be rebuilt ArrayList dirtyDlistPerRinfoList = new ArrayList(); -- cgit v1.2.3