diff options
author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
---|---|---|
committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
commit | 279c29b62e072da39600011b37e2d331fa21c7c1 (patch) | |
tree | d6c425de568e8b6b952697e4bc2ab4fd749170eb /src/GLSLShaderTest/SphereGLSL.java | |
parent | ed3fe3394103b0eddedde55fcb954079a5b42e8a (diff) |
Merged changes between root-1_5 and exp-1_4_0-beta3 into dev-1_5 branch
Diffstat (limited to 'src/GLSLShaderTest/SphereGLSL.java')
-rw-r--r-- | src/GLSLShaderTest/SphereGLSL.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/GLSLShaderTest/SphereGLSL.java b/src/GLSLShaderTest/SphereGLSL.java index a96dca6..a9f6447 100644 --- a/src/GLSLShaderTest/SphereGLSL.java +++ b/src/GLSLShaderTest/SphereGLSL.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -156,7 +156,6 @@ public class SphereGLSL extends Applet { TransformGroup l2Trans = new TransformGroup(t); l2RotTrans.addChild(l2Trans); - /* // Create Geometry for point lights ColoringAttributes caL1 = new ColoringAttributes(); ColoringAttributes caL2 = new ColoringAttributes(); @@ -168,7 +167,6 @@ public class SphereGLSL extends Applet { appL2.setColoringAttributes(caL2); l1Trans.addChild(new Sphere(0.05f, appL1)); l2Trans.addChild(new Sphere(0.05f, appL2)); - */ // Create lights AmbientLight aLgt = new AmbientLight(alColor); |