From 434fb13fc6570086f095646f6ea5739d9c362d7c Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Tue, 30 Aug 2005 08:25:24 +0000 Subject: Renamed all files to intended destination packages for JSR-231. The only package specified by the JSR is "javax.media.opengl". The utility package com.sun.opengl.utils is Sun-specific and optional. The Cg binding has been moved into com.sun.opengl.cg. Moved Animator and FPSAnimator to com.sun.opengl.utils. Updated and tested demos with new source code locations. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@118 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4 --- src/demos/util/Bunny.java | 3 ++- src/demos/util/ObjReader.java | 2 +- src/demos/util/SGIImage.java | 3 ++- src/demos/util/TGAImage.java | 3 ++- src/demos/util/Triceratops.java | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/demos/util') diff --git a/src/demos/util/Bunny.java b/src/demos/util/Bunny.java index fece8da..50033b2 100644 --- a/src/demos/util/Bunny.java +++ b/src/demos/util/Bunny.java @@ -41,7 +41,8 @@ package demos.util; import java.io.*; -import net.java.games.jogl.*; +import javax.media.opengl.*; +import com.sun.opengl.utils.*; /** Renders a bunny. diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java index 6638b61..1204ed5 100644 --- a/src/demos/util/ObjReader.java +++ b/src/demos/util/ObjReader.java @@ -43,7 +43,7 @@ import java.io.*; import java.nio.*; import java.util.*; -import net.java.games.jogl.util.*; +import com.sun.opengl.utils.*; /** Simple parser for Wavefront .OBJ files. Does not support all file options -- currently requires vertices and normals (only) to be diff --git a/src/demos/util/SGIImage.java b/src/demos/util/SGIImage.java index bf0dda9..df36e70 100644 --- a/src/demos/util/SGIImage.java +++ b/src/demos/util/SGIImage.java @@ -5,7 +5,8 @@ package demos.util; import java.io.*; -import net.java.games.jogl.*; +import javax.media.opengl.*; +import com.sun.opengl.utils.*; // Test harness import java.awt.image.*; diff --git a/src/demos/util/TGAImage.java b/src/demos/util/TGAImage.java index 24403eb..c999c99 100644 --- a/src/demos/util/TGAImage.java +++ b/src/demos/util/TGAImage.java @@ -40,7 +40,8 @@ package demos.util; import java.io.*; -import net.java.games.jogl.*; +import javax.media.opengl.*; +import com.sun.opengl.utils.*; /** * Targa image reader adapted from sources of the -- cgit v1.2.3