summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/classes/share/javax/media/j3d/RenderBin.java10
-rw-r--r--src/classes/share/javax/media/j3d/SoundScheduler.java8
-rw-r--r--src/classes/share/javax/media/j3d/SoundStructure.java16
3 files changed, 16 insertions, 18 deletions
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index b09ec69..31f357f 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -6675,7 +6675,7 @@ void addGeometryDlist(RenderAtomListInfo ra) {
void insertNodes(J3dMessage m) {
ArrayList viewScopedNodes = (ArrayList) m.args[3];
- ArrayList scopedNodesViewList = (ArrayList) m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
int i;
Object[] nodes = (Object[])m.args[0];
for (Object n : nodes) {
@@ -6715,10 +6715,9 @@ void insertNodes(J3dMessage m) {
// Handle ViewScoped Nodes
if (viewScopedNodes != null) {
int size = viewScopedNodes.size();
- int vlsize;
for (i = 0; i < size; i++) {
NodeRetained n = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList)scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
// If the node object is scoped to this view, then ..
if (vl.contains(view)) {
if (n instanceof LightRetained) {
@@ -6757,7 +6756,7 @@ void insertNodes(J3dMessage m) {
void removeNodes(J3dMessage m) {
ArrayList viewScopedNodes = (ArrayList) m.args[3];
- ArrayList scopedNodesViewList = (ArrayList) m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
int i;
Object[] nodes = (Object[])m.args[0];
for (int n = 0; n < nodes.length; n++) {
@@ -6805,10 +6804,9 @@ void removeNodes(J3dMessage m) {
// Handle ViewScoped Nodes
if (viewScopedNodes != null) {
int size = viewScopedNodes.size();
- int vlsize;
for (i = 0; i < size; i++) {
NodeRetained node = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList)scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
// If the node object is scoped to this view, then ..
if (vl.contains(view)) {
if (node instanceof LightRetained) {
diff --git a/src/classes/share/javax/media/j3d/SoundScheduler.java b/src/classes/share/javax/media/j3d/SoundScheduler.java
index 86d2416..892ad3b 100644
--- a/src/classes/share/javax/media/j3d/SoundScheduler.java
+++ b/src/classes/share/javax/media/j3d/SoundScheduler.java
@@ -327,7 +327,7 @@ class SoundScheduler extends J3dStructure {
void insertNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList viewScopedNodes = (ArrayList)m.args[3];
- ArrayList scopedNodesViewList = (ArrayList)m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
Object node;
for (int i=0; i<nodes.length; i++) {
@@ -361,7 +361,7 @@ class SoundScheduler extends J3dStructure {
int vlsize;
for (int i = 0; i < size; i++) {
node = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList) scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
// If the node object is scoped to this view, then ..
if (vl.contains(view)) {
if (node instanceof SoundRetained) {
@@ -397,7 +397,7 @@ class SoundScheduler extends J3dStructure {
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList viewScopedNodes = (ArrayList)m.args[3];
- ArrayList scopedNodesViewList = (ArrayList)m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
Object node;
for (int i=0; i<nodes.length; i++) {
@@ -438,7 +438,7 @@ class SoundScheduler extends J3dStructure {
int vlsize;
for (int i = 0; i < size; i++) {
node = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList) scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
// If the node object is scoped to this view, then ..
if (vl.contains(view)) {
if (node instanceof SoundRetained) {
diff --git a/src/classes/share/javax/media/j3d/SoundStructure.java b/src/classes/share/javax/media/j3d/SoundStructure.java
index 2dac8b0..8c65c43 100644
--- a/src/classes/share/javax/media/j3d/SoundStructure.java
+++ b/src/classes/share/javax/media/j3d/SoundStructure.java
@@ -167,7 +167,7 @@ class SoundStructure extends J3dStructure {
void insertNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList viewScopedNodes = (ArrayList)m.args[3];
- ArrayList scopedNodesViewList = (ArrayList)m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
Object node;
for (int i=0; i<nodes.length; i++) {
@@ -185,19 +185,19 @@ class SoundStructure extends J3dStructure {
int vlsize;
for (int i = 0; i < size; i++) {
node = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList) scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
int vsize = vl.size();
if (node instanceof SoundRetained) {
((SoundRetained)node).isViewScoped = true;
for (int k = 0; k < vsize; k++) {
- View view = (View) vl.get(k);
+ View view = vl.get(k);
addScopedSound((SoundRetained) node, view);
}
}
else if (node instanceof SoundscapeRetained) {
((SoundscapeRetained)node).isViewScoped = true;
for (int k = 0; k < vsize; k++) {
- View view = (View) vl.get(k);
+ View view = vl.get(k);
addScopedSoundscape((SoundscapeRetained) node, view);
}
}
@@ -256,7 +256,7 @@ class SoundStructure extends J3dStructure {
void removeNodes(J3dMessage m) {
Object[] nodes = (Object[])m.args[0];
ArrayList viewScopedNodes = (ArrayList)m.args[3];
- ArrayList scopedNodesViewList = (ArrayList)m.args[4];
+ ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
Object node;
for (int i=0; i<nodes.length; i++) {
@@ -274,21 +274,21 @@ class SoundStructure extends J3dStructure {
int vlsize;
for (int i = 0; i < size; i++) {
node = (NodeRetained)viewScopedNodes.get(i);
- ArrayList vl = (ArrayList) scopedNodesViewList.get(i);
+ ArrayList<View> vl = scopedNodesViewList.get(i);
// If the node object is scoped to this view, then ..
int vsize = vl.size();
if (node instanceof SoundRetained) {
((SoundRetained)node).isViewScoped = false;
for (int k = 0; k < vsize; k++) {
- View view = (View) vl.get(k);
+ View view = vl.get(k);
deleteScopedSound((SoundRetained) node, view);
}
}
else if (node instanceof SoundscapeRetained) {
((SoundscapeRetained)node).isViewScoped = false;
for (int k = 0; k < vsize; k++) {
- View view = (View) vl.get(k);
+ View view = vl.get(k);
deleteScopedSoundscape((SoundscapeRetained) node, view);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 14:03:48 +0000