diff options
Diffstat (limited to 'src/classes/share/com/sun/j3d/loaders')
34 files changed, 219 insertions, 180 deletions
diff --git a/src/classes/share/com/sun/j3d/loaders/Loader.java b/src/classes/share/com/sun/j3d/loaders/Loader.java index cd719bc..3fd36a4 100644 --- a/src/classes/share/com/sun/j3d/loaders/Loader.java +++ b/src/classes/share/com/sun/j3d/loaders/Loader.java @@ -44,9 +44,9 @@ package com.sun.j3d.loaders; -import java.net.URL; -import java.io.Reader; import java.io.FileNotFoundException; +import java.io.Reader; +import java.net.URL; /** * The Loader interface is used to specify the location diff --git a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java index cc5a541..5148669 100644 --- a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java +++ b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java @@ -45,7 +45,6 @@ package com.sun.j3d.loaders; import java.net.URL; -import java.io.Reader; /** * This class implements the Loader interface. To use diff --git a/src/classes/share/com/sun/j3d/loaders/Scene.java b/src/classes/share/com/sun/j3d/loaders/Scene.java index 36ee9e4..eec8fb9 100644 --- a/src/classes/share/com/sun/j3d/loaders/Scene.java +++ b/src/classes/share/com/sun/j3d/loaders/Scene.java @@ -46,13 +46,13 @@ package com.sun.j3d.loaders; import java.util.Hashtable; +import javax.media.j3d.Background; import javax.media.j3d.Behavior; import javax.media.j3d.BranchGroup; -import javax.media.j3d.TransformGroup; -import javax.media.j3d.Light; -import javax.media.j3d.Background; import javax.media.j3d.Fog; +import javax.media.j3d.Light; import javax.media.j3d.Sound; +import javax.media.j3d.TransformGroup; /** diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/com/sun/j3d/loaders/SceneBase.java index a0b82bb..8cfa9dd 100644 --- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java +++ b/src/classes/share/com/sun/j3d/loaders/SceneBase.java @@ -44,19 +44,16 @@ package com.sun.j3d.loaders; -import java.lang.Float; - import java.util.Hashtable; import java.util.Vector; -import java.util.Enumeration; +import javax.media.j3d.Background; import javax.media.j3d.Behavior; import javax.media.j3d.BranchGroup; -import javax.media.j3d.TransformGroup; -import javax.media.j3d.Light; -import javax.media.j3d.Background; import javax.media.j3d.Fog; +import javax.media.j3d.Light; import javax.media.j3d.Sound; +import javax.media.j3d.TransformGroup; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java b/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java index 1bf8dc9..5819851 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java @@ -45,14 +45,11 @@ package com.sun.j3d.loaders.lw3d; import java.io.StreamTokenizer; -import java.io.IOException; import java.lang.reflect.Constructor; -import com.sun.j3d.loaders.ParsingErrorException; -import java.lang.ClassNotFoundException; -import java.lang.InstantiationException; -import java.lang.IllegalAccessException; import java.lang.reflect.InvocationTargetException; +import com.sun.j3d.loaders.ParsingErrorException; + /** * This class is used in implementing Envelope objects (of which there diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java index 6c23687..d6bdc62 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java @@ -44,15 +44,9 @@ package com.sun.j3d.loaders.lw3d; -import javax.vecmath.*; -import java.util.BitSet; -import java.util.Enumeration; - import javax.media.j3d.Alpha; -import javax.media.j3d.Node; -import javax.media.j3d.NodeReferenceTable; -import javax.media.j3d.SceneGraphObject; import javax.media.j3d.Interpolator; + import com.sun.j3d.internal.J3dUtilsI18N; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java index 7764f20..bb23ac0 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java @@ -44,21 +44,27 @@ package com.sun.j3d.loaders.lw3d; -import java.awt.Component; -import java.awt.Image; +import java.io.FileNotFoundException; +import java.net.URL; import java.util.Enumeration; import java.util.Vector; + +import javax.media.j3d.Appearance; +import javax.media.j3d.ColoringAttributes; +import javax.media.j3d.GeometryArray; +import javax.media.j3d.Material; +import javax.media.j3d.PointAttributes; +import javax.media.j3d.Shape3D; +import javax.media.j3d.Texture; +import javax.media.j3d.TextureAttributes; +import javax.media.j3d.TransparencyAttributes; +import javax.vecmath.Color3f; +import javax.vecmath.Vector3f; + +import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.utils.geometry.GeometryInfo; import com.sun.j3d.utils.geometry.NormalGenerator; import com.sun.j3d.utils.geometry.Stripifier; -import com.sun.j3d.utils.image.TextureLoader; -import com.sun.j3d.loaders.IncorrectFormatException; -import java.io.FileNotFoundException; - -import javax.media.j3d.*; -import javax.vecmath.*; - -import java.net.*; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java index 6c3d4e7..ccdc7c7 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java @@ -46,11 +46,11 @@ package com.sun.j3d.loaders.lw3d; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileInputStream; import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; + import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java index 2fda42e..4bf3bb3 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java @@ -44,10 +44,9 @@ package com.sun.j3d.loaders.lw3d; -import java.util.*; +import java.util.Enumeration; import javax.media.j3d.Alpha; -import javax.media.j3d.Light; /** * This Interpolator object modifies the intensity of a Light object diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java index 211544d..b542fc3 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java @@ -45,18 +45,34 @@ package com.sun.j3d.loaders.lw3d; -import com.sun.j3d.loaders.*; -import java.awt.Component; -import java.io.*; -import java.util.Vector; -import java.util.Enumeration; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StreamTokenizer; import java.net.URL; -import java.net.MalformedURLException; +import java.util.Enumeration; +import java.util.Vector; -import javax.media.j3d.*; +import javax.media.j3d.AmbientLight; +import javax.media.j3d.Background; +import javax.media.j3d.Behavior; +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.BranchGroup; +import javax.media.j3d.Fog; +import javax.media.j3d.TransformGroup; import javax.vecmath.Color3f; import javax.vecmath.Point3d; +import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.Loader; +import com.sun.j3d.loaders.ParsingErrorException; +import com.sun.j3d.loaders.Scene; +import com.sun.j3d.loaders.SceneBase; + /** * This class implements the Loader API and allows users to load diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java index 8d503df..59a4a2d 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java @@ -46,8 +46,8 @@ package com.sun.j3d.loaders.lw3d; -import javax.vecmath.Color3f; import javax.media.j3d.Light; +import javax.vecmath.Color3f; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java index 52f6bfe..4e30ece 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java @@ -46,17 +46,14 @@ package com.sun.j3d.loaders.lw3d; -import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Vector; -import java.util.Date; +import java.net.URL; import java.util.Enumeration; -import com.sun.j3d.loaders.lw3d.LWOBFileReader; -import com.sun.j3d.internal.J3dUtilsI18N; -import java.net.*; -import com.sun.j3d.loaders.ParsingErrorException; +import java.util.Vector; + import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.ParsingErrorException; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java index 1b858c7..6d04146 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java @@ -45,14 +45,14 @@ package com.sun.j3d.loaders.lw3d; import java.awt.Image; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.Vector; -import java.util.Enumeration; + import javax.vecmath.Color3f; import javax.vecmath.Vector3f; -import com.sun.j3d.loaders.lw3d.LWOBFileReader; + import com.sun.j3d.internal.J3dUtilsI18N; -import java.io.FileNotFoundException; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java index d27b3aa..5b866fa 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java @@ -44,26 +44,19 @@ package com.sun.j3d.loaders.lw3d; -import java.awt.Component; import java.awt.Image; import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; -import java.io.FileReader; -import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Vector; -import java.util.Enumeration; import java.util.Hashtable; -import javax.vecmath.Color3f; -import javax.vecmath.Vector3f; -import com.sun.j3d.utils.image.TextureLoader; + import javax.media.j3d.Texture; import javax.media.j3d.Texture2D; -import javax.media.j3d.ImageComponent; -import javax.media.j3d.ImageComponent2D; -import com.sun.j3d.loaders.lw3d.LWOBFileReader; -import java.io.FileNotFoundException; +import javax.vecmath.Color3f; +import javax.vecmath.Vector3f; + import com.sun.j3d.loaders.ParsingErrorException; +import com.sun.j3d.utils.image.TextureLoader; /** * This class is responsible for parsing the binary data in an Object file diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java index 48e3abb..71d352f 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java @@ -46,10 +46,14 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; -import javax.media.j3d.*; -import javax.vecmath.*; -import java.util.Enumeration; +import java.io.IOException; +import java.io.StreamTokenizer; + +import javax.media.j3d.Background; +import javax.media.j3d.BoundingSphere; +import javax.vecmath.Color3f; +import javax.vecmath.Point3d; + import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java index 8ff8836..b588d26 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java @@ -46,11 +46,15 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; +import java.io.IOException; +import java.io.StreamTokenizer; import java.util.Vector; -import javax.media.j3d.*; -import javax.vecmath.*; -import java.util.Enumeration; + +import javax.media.j3d.Behavior; +import javax.media.j3d.Transform3D; +import javax.media.j3d.TransformGroup; +import javax.vecmath.Matrix4d; + import com.sun.j3d.loaders.ParsingErrorException; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java index 22839ce..6112606 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java @@ -44,12 +44,15 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; -import javax.media.j3d.*; -import javax.vecmath.*; +import java.io.IOException; +import java.io.StreamTokenizer; + +import javax.media.j3d.Behavior; +import javax.media.j3d.TransformGroup; + import com.sun.j3d.internal.J3dUtilsI18N; -import com.sun.j3d.loaders.ParsingErrorException; import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.ParsingErrorException; /** * This class is a superclass for any implementation of envelopes; the diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java index cfb21bf..1597cd9 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java @@ -46,10 +46,7 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; -import javax.vecmath.Matrix4d; -import javax.vecmath.Vector3d; -import javax.vecmath.Point3f; +import java.io.StreamTokenizer; /** * This class represents one keyframe in an envelope sequence. diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java index f26feb6..8f54473 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java @@ -46,10 +46,13 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; -import javax.media.j3d.*; -import javax.vecmath.*; +import java.io.StreamTokenizer; + +import javax.media.j3d.Alpha; +import javax.media.j3d.Behavior; +import javax.media.j3d.BoundingSphere; import javax.media.j3d.TransformGroup; +import javax.vecmath.Point3d; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java index 22b19bd..4c08a18 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java @@ -46,10 +46,15 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; -import javax.media.j3d.*; -import javax.vecmath.*; -import java.util.Enumeration; +import java.io.IOException; +import java.io.StreamTokenizer; + +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.Fog; +import javax.media.j3d.LinearFog; +import javax.vecmath.Color3f; +import javax.vecmath.Point3d; + import com.sun.j3d.loaders.ParsingErrorException; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java index 4e16097..fab3a40 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java @@ -46,10 +46,11 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; +import java.io.StreamTokenizer; + import javax.vecmath.Matrix4d; -import javax.vecmath.Vector3d; import javax.vecmath.Point3f; +import javax.vecmath.Vector3d; /** * This class is responsible for parsing the data in a Scene file diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java index 6bf9419..4a33dc5 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java @@ -46,11 +46,24 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; +import java.io.IOException; +import java.io.StreamTokenizer; import java.util.Vector; -import javax.media.j3d.*; -import javax.vecmath.*; -import java.util.Enumeration; + +import javax.media.j3d.Behavior; +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.DirectionalLight; +import javax.media.j3d.Light; +import javax.media.j3d.PointLight; +import javax.media.j3d.SpotLight; +import javax.media.j3d.Transform3D; +import javax.media.j3d.TransformGroup; +import javax.vecmath.Color3f; +import javax.vecmath.Matrix4d; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; + import com.sun.j3d.loaders.ParsingErrorException; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java index e152a33..ec3793d 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java @@ -44,15 +44,25 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; +import java.io.StreamTokenizer; import java.util.Enumeration; import java.util.Vector; -import javax.media.j3d.*; -import javax.vecmath.*; -import com.sun.j3d.utils.behaviors.interpolators.*; + +import javax.media.j3d.Alpha; +import javax.media.j3d.Behavior; +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.Transform3D; +import javax.media.j3d.TransformGroup; +import javax.vecmath.Matrix4d; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Quat4f; + import com.sun.j3d.internal.J3dUtilsI18N; -import com.sun.j3d.loaders.ParsingErrorException; import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.ParsingErrorException; +import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame; +import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator; /** * This class is responsible for parsing the data in a Scene file related to diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java index bef1c44..51c541b 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java @@ -45,20 +45,26 @@ package com.sun.j3d.loaders.lw3d; -import java.awt.Component; -import java.io.*; -import java.util.Vector; -import javax.media.j3d.*; -import javax.vecmath.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.StreamTokenizer; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Enumeration; import java.util.StringTokenizer; import java.util.Vector; -import com.sun.j3d.utils.geometry.ColorCube; -import com.sun.j3d.loaders.ParsingErrorException; -import com.sun.j3d.loaders.IncorrectFormatException; -import java.net.MalformedURLException; -import java.net.*; +import javax.media.j3d.Behavior; +import javax.media.j3d.Group; +import javax.media.j3d.Shape3D; +import javax.media.j3d.Transform3D; +import javax.media.j3d.TransformGroup; +import javax.vecmath.Matrix4d; +import javax.vecmath.Vector3f; + +import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.ParsingErrorException; /** * An LwsObject is passed a handle to the text file that contains the scene diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java index bb14ebb..adfd8c4 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java @@ -47,7 +47,7 @@ package com.sun.j3d.loaders.lw3d; import java.util.Vector; -import javax.media.j3d.Group; + import javax.media.j3d.TransformGroup; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java index 54d8144..de9431e 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java @@ -44,21 +44,27 @@ package com.sun.j3d.loaders.lw3d; -import java.awt.Component; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; -import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; -import java.io.StreamTokenizer; +import java.io.FileNotFoundException; import java.io.IOException; -import javax.media.j3d.*; +import java.io.StreamTokenizer; +import java.util.Enumeration; +import java.util.Hashtable; + +import javax.media.j3d.Alpha; +import javax.media.j3d.Behavior; +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.Group; +import javax.media.j3d.Link; +import javax.media.j3d.Shape3D; +import javax.media.j3d.SharedGroup; +import javax.media.j3d.Switch; +import javax.media.j3d.SwitchValueInterpolator; +import javax.media.j3d.TransformGroup; import javax.vecmath.Point3d; import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; -import java.io.FileNotFoundException; /** * This class was created to handle "sequence files", which allow diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java index b2b545e..e274916 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java @@ -44,21 +44,21 @@ package com.sun.j3d.loaders.lw3d; -import java.awt.Component; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; import java.io.BufferedReader; -import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.StreamTokenizer; import java.io.IOException; -import javax.media.j3d.*; +import java.io.StreamTokenizer; +import java.util.Enumeration; +import java.util.Vector; + +import javax.media.j3d.Alpha; +import javax.media.j3d.BoundingSphere; +import javax.media.j3d.Switch; +import javax.media.j3d.TransformGroup; import javax.vecmath.Point3d; -import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; -import java.io.FileNotFoundException; /** * This class was created to read a special file format devised for diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java index 5a7cf57..25ae39f 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java @@ -45,6 +45,7 @@ package com.sun.j3d.loaders.lw3d; import java.util.Vector; + import javax.vecmath.Vector3f; diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java index 3c2ff73..97a55e5 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java @@ -45,15 +45,11 @@ package com.sun.j3d.loaders.lw3d; -import javax.vecmath.*; -import java.util.BitSet; import java.util.Enumeration; import javax.media.j3d.Alpha; -import javax.media.j3d.Node; -import javax.media.j3d.NodeReferenceTable; -import javax.media.j3d.SceneGraphObject; import javax.media.j3d.Switch; + import com.sun.j3d.internal.J3dUtilsI18N; /** diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java index 66daab2..3b0bbac 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java @@ -44,23 +44,17 @@ package com.sun.j3d.loaders.lw3d; +import java.awt.Image; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; -import java.applet.Applet; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.MediaTracker; -import java.awt.Frame; -import java.awt.Image; -import java.awt.image.MemoryImageSource; -import java.awt.Toolkit; -import java.io.FileNotFoundException; +import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.FileInputStream; -import java.io.BufferedInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; + import com.sun.j3d.loaders.IncorrectFormatException; import com.sun.j3d.loaders.ParsingErrorException; -import java.io.IOException; /** * This class parses a standard Targa file and retrieves the image stored diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java index 5d4167d..d881d81 100644 --- a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java +++ b/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java @@ -44,7 +44,9 @@ package com.sun.j3d.loaders.lw3d; -import java.io.*; +import java.io.IOException; +import java.io.StreamTokenizer; + import com.sun.j3d.loaders.ParsingErrorException; /** diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java index bcf4303..4477a14 100644 --- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java +++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java @@ -44,35 +44,32 @@ package com.sun.j3d.loaders.objectfile; -import com.sun.j3d.loaders.Scene; -import com.sun.j3d.loaders.SceneBase; -import com.sun.j3d.loaders.Loader; -import com.sun.j3d.loaders.IncorrectFormatException; -import com.sun.j3d.loaders.ParsingErrorException; -import com.sun.j3d.loaders.objectfile.ObjectFileParser; -import com.sun.j3d.loaders.objectfile.ObjectFileMaterials; -import com.sun.j3d.utils.geometry.GeometryInfo; -import com.sun.j3d.utils.geometry.NormalGenerator; -import com.sun.j3d.utils.geometry.Stripifier; -import java.io.FileNotFoundException; -import java.io.StreamTokenizer; -import java.io.Reader; import java.io.BufferedReader; -import java.io.BufferedInputStream; +import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Iterator; import java.util.HashMap; -import java.util.StringTokenizer; -import javax.media.j3d.*; -import javax.vecmath.Color3f; +import java.util.Iterator; + +import javax.media.j3d.BranchGroup; +import javax.media.j3d.Shape3D; import javax.vecmath.Point3f; -import javax.vecmath.Vector3f; import javax.vecmath.TexCoord2f; -import java.net.MalformedURLException; +import javax.vecmath.Vector3f; + +import com.sun.j3d.loaders.IncorrectFormatException; +import com.sun.j3d.loaders.Loader; +import com.sun.j3d.loaders.ParsingErrorException; +import com.sun.j3d.loaders.Scene; +import com.sun.j3d.loaders.SceneBase; +import com.sun.j3d.utils.geometry.GeometryInfo; +import com.sun.j3d.utils.geometry.NormalGenerator; +import com.sun.j3d.utils.geometry.Stripifier; diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java index f856104..c575272 100644 --- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java +++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java @@ -44,9 +44,10 @@ package com.sun.j3d.loaders.objectfile; -import java.io.StreamTokenizer; import java.io.IOException; import java.io.Reader; +import java.io.StreamTokenizer; + import com.sun.j3d.loaders.ParsingErrorException; class ObjectFileParser extends StreamTokenizer { diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java index c47892a..74c99dc 100644 --- a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java +++ b/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java @@ -44,18 +44,16 @@ package com.sun.j3d.loaders.objectfile; -import java.io.BufferedInputStream; -import java.io.FileNotFoundException; -import java.io.FileInputStream; -import java.io.InputStream; +import java.awt.Transparency; +import java.awt.color.ColorSpace; import java.awt.image.BufferedImage; -import java.io.IOException; +import java.awt.image.ComponentColorModel; import java.awt.image.DataBuffer; import java.awt.image.DataBufferByte; -import java.awt.image.ComponentColorModel; import java.awt.image.WritableRaster; -import java.awt.color.ColorSpace; -import java.awt.Transparency; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; class RgbFile extends BufferedInputStream { |