diff options
| author | Kevin Rushforth <[email protected]> | 2008-06-18 20:37:29 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2008-06-18 20:37:29 +0000 |
| commit | 5b3a1a917d0cc749243949cf4d7bb2ca65338e83 (patch) | |
| tree | aeb07d1b32dbb9eaaa4723fbdf65cd3956f9da5e | |
| parent | 2365c835ba280d64a1ec899c008f0b013db40b33 (diff) | |
Update version to 1.6
git-svn-id: https://svn.java.net/svn/j3d-core~svn/branches/dev-1_6@910 ba19aa83-45c5-6ac9-afd3-db810772062c
| -rw-r--r-- | build-tools/VersionInfo.java | 2 | ||||
| -rw-r--r-- | build.xml | 10 | ||||
| -rw-r--r-- | docs/api-changes-1_6.txt | 43 | ||||
| -rw-r--r-- | nbproject/project.xml | 2 | ||||
| -rw-r--r-- | release-info/pre-release/README-download.html | 16 | ||||
| -rw-r--r-- | release-info/pre-release/README-unzip.html | 30 | ||||
| -rw-r--r-- | release-info/pre-release/README.html | 332 | ||||
| -rw-r--r-- | release-info/pre-release/README.txt | 10 | ||||
| -rw-r--r-- | src/classes/J3dVersion | 2 | ||||
| -rw-r--r-- | src/native/d3d/D3dDriverInfo.cpp | 4 |
10 files changed, 84 insertions, 367 deletions
diff --git a/build-tools/VersionInfo.java b/build-tools/VersionInfo.java index 60e32a3..e227ea0 100644 --- a/build-tools/VersionInfo.java +++ b/build-tools/VersionInfo.java @@ -167,7 +167,7 @@ class VersionInfo extends Object { * Specification version (major and minor version only). This * string must not be modified by developers. */ - private static final String SPECIFICATION_VERSION = "1.5"; + private static final String SPECIFICATION_VERSION = "1.6"; /** * Specification vendor. @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<project name="j3d-1.5.2" default="jar-debug" basedir="."> +<project name="j3d-1.6.0" default="jar-debug" basedir="."> <!-- ********************************************************************* @@ -37,13 +37,13 @@ * build number that is greater than the previous build's build * number. --> - <property name="version_buildnum" value="3"/> + <property name="version_buildnum" value="1"/> <!-- * The following property specifies the beta revision of the current * version of 3D being built. It is ignored for non-beta builds. --> - <property name="version_betastr" value="beta2"/> + <property name="version_betastr" value="beta1"/> <!-- * The following property specifies the patch revision of the current @@ -58,8 +58,8 @@ * separated by "periods ("."). The version_base_file property must * be the same version number as version_base with "_" replacing ".". --> - <property name="version_base" value="1.5.2"/> - <property name="version_base_file" value="1_5_2"/> + <property name="version_base" value="1.6.0"/> + <property name="version_base_file" value="1_6_0"/> <!-- ************************************* --> diff --git a/docs/api-changes-1_6.txt b/docs/api-changes-1_6.txt new file mode 100644 index 0000000..8811996 --- /dev/null +++ b/docs/api-changes-1_6.txt @@ -0,0 +1,43 @@ +------------------------------------------------------------------------ +$RCSfile$ +$Revision$ +$Date$ +------------------------------------------------------------------------ +This document conatains proposed API changes to the Java 3D 1.6 API +that deviate from the 1.5 API. + +This file must be updated to record the addition or deprecation of any +public or protected class, interface, field, constructor, or method to +the Java 3D API. + +The one exception to this rule is that you don't need to update this +file when adding a non-final (i.e., virtual) method to a class if that +method--with exactly the same signature--already exists in a +superclass. For example, adding a "toString" method to a j3d object +doesn't require an entry in this file. Likewise, adding duplicateNode +or cloneNode methods to Node subclasses doesn't require an entry in +this file. + +No incompatible changes to the Java 3D 1.5 API are allowed. + + +I. New/deprecated fields, constructors, methods + + <EXISTINGCLASS> + --------------- + New methods: + public <NEWMETHOD> + + +II. Reparented classes + + <EXISTINGCLASS> + --------------- + <EXISTINGCLASS> now extends <NEWSUPERCLASS> (used to extend <OLDSUPERCLASS>) + + +III. New classes and interfaces (in javax.media.j3d) + + +IV. Deprecated classes and interfaces (in javax.media.j3d) + diff --git a/nbproject/project.xml b/nbproject/project.xml index 7716e3f..f4cc186 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -4,7 +4,7 @@ <configuration> <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> <!-- Do not use Project Properties customizer when editing this file manually. --> - <name>j3d-1.5.2</name> + <name>j3d-1.6.0</name> <properties/> <folders> <source-folder> diff --git a/release-info/pre-release/README-download.html b/release-info/pre-release/README-download.html index a12840b..d685a45 100644 --- a/release-info/pre-release/README-download.html +++ b/release-info/pre-release/README-download.html @@ -3,27 +3,27 @@ <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> - <title>3D Graphics API for the Java Platform 1.5.2: Installation Instructions</title> + <title>3D Graphics API for the Java Platform 1.6.0: Installation Instructions</title> </head> <body> -<h2>3D Graphics API for the Java Platform 1.5.2-beta2 Pre-Release</h2> +<h2>3D Graphics API for the Java Platform 1.6.0-beta1 Pre-Release</h2> <p>This software is licensed by Sun, as specified in the <a href="LICENSE-GPLv2.txt">LICENSE-GPLv2.txt</a> file. You must only use this software in accordance with the terms under which the code is licensed. </p> <h2>Instructions for installing the 3D Graphics API for the Java Platform</h2> -<p>The 1.5.2-build1 version of the j3d package runs on JDK version +<p>The 1.6.0-beta1 version of the j3d package runs on JDK version 1.5.0 and higher. It has been released for the Windows, Linux, Solaris, and Mac OS X operating environments. See the -<a href="http://j3d-core.dev.java.net/j3d1_5_2/RELEASE-NOTES-beta2.html">release +<a href="http://j3d-core.dev.java.net/j3d1_6_0/RELEASE-NOTES-beta1.html">release notes</a> for more information. </p> <h3>Preferred method</h3> <p>Developers who wish to develop an application using the j3d package -are encouraged to download the j3d-1_5_2-beta2-XXX-i586.zip file for +are encouraged to download the j3d-1_6_0-beta1-XXX.zip file for their platform, and manually install the necessary files into a directory on their local disk. To do this, unzip the downloaded file, and follow the instructions in the unzipped README.txt file. @@ -39,7 +39,7 @@ native libraries directly into the JRE. <h4>Windows</h4> <p>To install the j3d package on Windows, download the binary installer and then execute it, by double-clicking on the -j3d-1_5_2-beta2-windows-i586.exe (or j3d-1_5_2-beta2-windows-amd64.exe) +j3d-1_6_0-beta1-windows-i586.exe (or j3d-1_6_0-beta1-windows-amd64.exe) icon. </p> @@ -50,7 +50,7 @@ execute it. For example, on a 32-bit Linux system: </p> <ul> cd /myhome/j3d<br> -sh /path-to-download-files/j3d-1_5_2-beta2-linux-i586.bin<br> +sh /path-to-download-files/j3d-1_6_0-beta1-linux-i586.bin<br> </ul> <p>After doing this, you will need to modify your CLASSPATH @@ -72,7 +72,7 @@ export LD_LIBRARY_PATH=/myhome/j3d/lib/i386 <h4>Mac OS X</h4> <p>No installer is available for the Mac OS X operating environment. -You will need to download the j3d-1_5_2-beta2-macosx.zip file, unzip it, +You will need to download the j3d-1_6_0-beta1-macosx.zip file, unzip it, and follow the instructions in the unzipped README.txt file. </p> </body> diff --git a/release-info/pre-release/README-unzip.html b/release-info/pre-release/README-unzip.html index f2ab333..1603bd2 100644 --- a/release-info/pre-release/README-unzip.html +++ b/release-info/pre-release/README-unzip.html @@ -2,11 +2,11 @@ <html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> - <title>3D Graphics API for the Java Platform 1.5.2: Unzip + <title>3D Graphics API for the Java Platform 1.6.0: Unzip Instructions</title> </head> <body> -<h2>3D Graphics API for the Java Platform 1.5.2 Pre-Release</h2> +<h2>3D Graphics API for the Java Platform 1.6.0 Pre-Release</h2> <p>This software is licensed by Sun, as specified in the <a href="LICENSE-GPLv2.txt">LICENSE-GPLv2.txt</a> file. You @@ -14,8 +14,8 @@ must only use this software in accordance with the terms under which the code is licensed. </p> <h2>Instructions for Unzipping 3D Graphics API for the Java -Platform 1.5.2 Pre-Release</h2> -<p>The 1.5.2-XXX pre-release version of 3D graphics API for the +Platform 1.6.0 Pre-Release</h2> +<p>The 1.6.0-XXX pre-release version of 3D graphics API for the Java platform runs on JDK version 1.5.0 and higher. It has been released for the <a href="#Windows">Windows</a>, <a href="#Linux">Linux</a>, @@ -31,17 +31,17 @@ conflicts with third-party applications launched via Java Web Start, and causes confusion later when upgrading the distribution. </p> <h3><a name="Windows"></a>Windows</h3> -<p>The 1.5.2 pre-release version of 3D graphics API for the Java +<p>The 1.6.0 pre-release version of 3D graphics API for the Java platform for Windows/XP and Windows 2000 runs on JDK version 1.5.0 and higher. To manually install this build, do the following: </p> <ol> - <li>Download and unzip <code>j3d-1_5_2-XXX.zip</code> + <li>Download and unzip <code>j3d-1_6_0-XXX.zip</code> (using Windows Explorer or an unzip tool such as WinZip) to a temporary download folder, for example, <code>c:\Downloads</code>. This will -create a <code>j3d-1_5_2-XXX</code> subfolder in +create a <code>j3d-1_6_0-XXX</code> subfolder in your download folder where the downloaded files can be found. The file you need for manual installation is <code>j3d-jre.zip</code>.<br> @@ -81,16 +81,16 @@ libraries to their current project.<br> </p> <h3><a name="Linux"></a><a name="Solaris"></a>Linux, Solaris</h3> -<p>The 1.5.2 pre-release version of 3D graphics API for the Java +<p>The 1.6.0 pre-release version of 3D graphics API for the Java platform for Linux or Solaris runs on JDK version 1.5.0 and higher. To manually install this build, do the following:</p> <ol> - <li>Download and unzip <code>j3d-1_5_2-XXX.zip</code> + <li>Download and unzip <code>j3d-1_6_0-XXX.zip</code> into a temporary download directory, for example, <code>/tmp</code>. This will -create a <code>j3d-1_5_2-XXX</code> subdirectory +create a <code>j3d-1_6_0-XXX</code> subdirectory in <code>/tmp</code> where the downloaded files can be found. The file you need for manual installation is <code>j3d-jre.zip</code>.<br> @@ -103,7 +103,7 @@ as follows:<br> <br> <ul> <code>cd /myhome/j3d</code><br> - <code>unzip /tmp/j3d-1_5_2-*/j3d-jre.zip</code><br> + <code>unzip /tmp/j3d-1_6_0-*/j3d-jre.zip</code><br> </ul> <br> </li> @@ -130,16 +130,16 @@ consult the IDE's documentation to see how to add jar files and native libraries to their current project. </p> <h3><a name="MacOSX"></a>Mac OS X</h3> -<p>The 1.5.2 pre-release version of 3D graphics API for the Java +<p>The 1.6.0 pre-release version of 3D graphics API for the Java platform for Mac OS X runs on JDK version 1.5.0 and higher. To manually install this build, do the following:</p> <ol> - <li>Download and unzip <code>j3d-1_5_2-XXX.zip</code> + <li>Download and unzip <code>j3d-1_6_0-XXX.zip</code> into a temporary download directory, for example, <code>/tmp</code>. This will -create a <code>j3d-1_5_2-XXX</code> subdirectory +create a <code>j3d-1_6_0-XXX</code> subdirectory in <code>/tmp</code> where the downloaded files can be found. The file you need for manual installation is <code>j3d-jre.zip</code>.<br> @@ -152,7 +152,7 @@ as follows:<br> <br> <ul> <code>cd /myhome/j3d</code><br> - <code>unzip /tmp/j3d-1_5_2-*/j3d-jre.zip</code><br> + <code>unzip /tmp/j3d-1_6_0-*/j3d-jre.zip</code><br> </ul> <br> </li> diff --git a/release-info/pre-release/README.html b/release-info/pre-release/README.html index 43e6579..3a7752e 100644 --- a/release-info/pre-release/README.html +++ b/release-info/pre-release/README.html @@ -3,337 +3,11 @@ <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> - <title>Java 3D 1.5.2 Pre-Release Notes</title> + <title>Java 3D 1.6.0 Pre-Release Notes</title> </head> <body> -<h2>Java 3D<sup><font size="-2">TM</font></sup> 1.5.2-beta2 +<h2>Java 3D<sup><font size="-2">TM</font></sup> 1.6.0-beta1 Release Notes</h2> -<p>This file contains important release information for users of -the -Java 3D<sup><font size="-2">TM</font></sup> API, version -1.5.2-beta2. -</p> -<ul> - <a href="#System_Requirements">System Requirements</a> -(<a href="#Solaris_Sparc">Solaris Sparc</a>, <a href="#Solaris_x86">Solaris -x86</a>, <a href="#Linux">Linux</a>, <a href="#Windows">Windows</a>, <a - href="#MacOSX">Mac OS X</a>)<br> - <a href="#Improvements_In_1_5_2">Improvements in 1.5.2-beta2</a><br> - <a href="#JoglPipeline">JOGL Rendering Pipeline</a><br> - <a href="#More_Information">More Information</a><br> -</ul> -<p><span style="font-style: italic;">NOTE: We recommend that you </span><span - style="font-style: italic;">uninstall all </span><span - style="font-style: italic;">previous versions of Java 3D before -installing this version.</span> -</p> -<h3><a name="System_Requirements"></a>System Requirements</h3> -<p>The 1.5.2-beta2 version of the Java 3D API has been released -for -Solaris (both sparc and x86/amd64), Linux (both x86 and amd64), Windows -(both x86 and amd64), and -Mac OS X (both PPC and x86). -</p> -<h4><a name="Solaris_Sparc"></a>Solaris Sparc</h4> -<p> -The 1.5.2-beta2 version of Java 3D for Solaris SPARC requires the -following: -</p> -<ul> - <li>JDK 1.5.0 or later from Sun Microsystems: <a - href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a></li> - <li>Solaris 9 or later</li> - <li>Frame Buffer with OpenGL 1.3 support or better (XVR-600, -XVR-1200, Expert3D, etc.). A frame buffer with OpenGL 1.2 support will -work, but with reduced texture mapping functionality.</li> - <li>OpenGL 1.3 for Solaris or later. To find your current version, -use: "<code>pkginfo -l SUNWglrt</code>". OpenGL for Solaris can be -obtained at: <a href="http://www.sun.com/software/graphics/opengl/">http://www.sun.com/software/graphics/opengl/</a></li> -</ul> -<h4><a name="Solaris_x86"></a>Solaris x86</h4> -<p> -The 1.5.2-beta2 version of Java 3D for Solaris x86/amd64 requires -the -following: -</p> -<ul> - <li>JDK 1.5.0 or later from Sun Microsystems: <a - href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a></li> - <li>Solaris 10 or later</li> - <li>NVIDIA Frame Buffer with OpenGL 1.3 or later</li> -</ul> -<h4><a name="Linux"></a>Linux<br> -</h4> -<p>The 1.5.2-beta2 version of Java 3D for Linux (x86 or amd64) -requires -the -following:<br> -</p> -<ul> - <li>JDK 1.5.0 or later from Sun Microsystems: <a - href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a></li> - <li>Graphics adapter with driver that supports the GLX -extension: GLX -1.3 or later and OpenGL 1.3 or later. A graphics adapter with OpenGL -1.2 support will work, but with reduced texture mapping functionality. </li> -</ul> -<h4><a name="Windows"></a>Windows<br> -</h4> -<p>The 1.5.2-beta2 version of Java 3D for Windows 2000, -Windows XP (x86 or amd64), or Windows Vista -requires the following:<br> -</p> -<ul> - <li>JDK 1.5.0 or later from Sun Microsystems: <a - href="http://java.sun.com/j2se/">http://java.sun.com/j2se/</a></li> - <li>Windows 2000, Windows XP, or Windows Vista</li> - <li>Support for either OpenGL or DirectX as shown below.<br> - </li> -</ul> -<ul> - <span style="font-weight: bold;">OpenGL version</span><br> - <ul> -The (default) OpenGL renderer of Java 3D requires OpenGL 1.3 or -later, -available from your graphics card manufacturer. - </ul> -</ul> -<ul> - <span style="font-weight: bold;">DirectX version</span><br> - <ul> -The (optional) DirectX renderer of Java 3D requires -DirectX 9.0 or -later, which is available from Microsoft at: <a - href="http://www.microsoft.com/windows/directx/">http://www.microsoft.com/windows/directx/</a> -. The DirectX version of -Java 3D is selected by setting the "<code>j3d.rend</code>" system -property -to "<code>d3d</code>", -for example: - <ul> - <code>java -Dj3d.rend=d3d ClassName</code> - </ul> - </ul> - <br> - NOTE: The DirectX version of Java 3D is used if a suitable version - of OpenGL cannot be found. Note also that DirectX is chosen by - default on Windows Vista systems with an ATI graphics card (due to - ATI driver bugs). -</ul> -<h4><a name="MacOSX"></a>Mac OS X</h4> -<p>The 1.5.2-beta2 version of Java 3D for Mac OS X (PPC or x86) -requires the following:<br> -</p> -<ul> - <li>JDK 1.5.0 or later from Apple: <a - href="http://developer.apple.com/java/download/">http://developer.apple.com/java/download/</a></li> - <li>Java Binding for OpenGL (JOGL), available at: <a - href="https://jogl.dev.java.net/">https://jogl.dev.java.net/</a><br> -you can <a - href="https://jogl.dev.java.net/servlets/ProjectDocumentList?folderID=5971&expandFolder=5971">click -here</a> for a direct link to the download folder<br> - </li> - <li>Apple OS X 10.3 or later (10.4 or later is required for -Intel-based Apple systems)<br> - </li> - <li>Support for OpenGL 1.3 or later<br> - </li> -</ul> -<h3><a name="Improvements_In_1_5_2"></a>Improvements in 1.5.2-beta2</h3> -<h4>Issues Fixed in 1.5.2-beta2</h4> -<br> -<table width="100%" style="text-align: left;" border="1" cellpadding="2" - cellspacing="0"> - <tbody> - <tr> - <th style="vertical-align: top; text-align: right;">Issue</th> - <th style="vertical-align: top;"> </th> - <th style="vertical-align: top;">Description</th> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">543</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">J3DClock does not adjust to clock skew</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">583</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">A disposed Graphics2D remains in Canvas3D after removal and addtion</td> - </tr> - </tbody> -</table> -<h3><a name="Improvements_In_1_5_2"></a>Improvements in 1.5.2-beta1</h3> -<h4>Enhancements</h4> -<ul> - <li>Source code license changed to GPL v2 + CLASSPATH</li> -</ul> -<h4>Issues Fixed in 1.5.2-beta1<br> -</h4> -<br> -<table width="100%" style="text-align: left;" border="1" cellpadding="2" - cellspacing="0"> - <tbody> - <tr> - <th style="vertical-align: top; text-align: right;">Issue</th> - <th style="vertical-align: top;"> </th> - <th style="vertical-align: top;">Description</th> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">179</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">OrbitBehavior.setRotationCenter gives spurious view shift</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">483</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">NullPointerException when writing Font3D using scenegraph.io</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">506</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">NullPointerException: Calling getNominalSensorRotation in WandViewBehavior when internal nominalSensorRotation is null causes a NullPointerException.</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">513</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Down-rev D3D driver can cause JVM to crash</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">514</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">NPE in Wonderland : triggered in cached bounds computation</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">519</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">IntersectionInfo.getGeometry return null for IndexedArrayGeometry</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">525</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">JOALMixer only playing one sample</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">532</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Background geometry BG isn't saved with SceneGraphFileWriter</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">534</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">ClassNotFoundException when running applet if Java 3D installed into JRE</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">538</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Machine precision bug in AxisAngle4d and Quat4d</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">540</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">ArrayIndexOutOfBoundsException when calling setPickable</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">541</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Bound.closest_point() method creates unused Matrix3d</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">544</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">GroupRetained.getBounds() should return BoundingBox?</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">545</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Update docs to discourage installing Java 3D into JRE</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">548</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">RFE - Disable getLock() / unLock() on non-alive GeometryArray</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">555</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Muting a PointSound causes a ClassCastException</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">560</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Use D3DCREATE_FPU_PRESERVE flag on D3D pipeline</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">561</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Decrease memory footprint of BoundingBox</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">562</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Error occurs when Canvas3D removed from View</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">563</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Background cloneNode() fails with Background geometry</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">567</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">Update license to GPL v2 + CLASSPATH</td> - </tr> - <tr> - <td style="vertical-align: top; text-align: right;">569</td> - <td style="vertical-align: top;"> </td> - <td style="vertical-align: top;">ImageComponent.ALLOW_IMAGE_READ is false</td> - </tr> - </tbody> -</table> -<br> -<h3><a name="JoglPipeline"></a>JOGL Rendering Pipeline</h3> -<p>A JOGL rendering pipeline, as described -in <a href="https://java3d.dev.java.net/issues/show_bug.cgi?id=229">issue -229</a>, is now -available on all supported platforms, including Apple Mac OS X -(x86 or PPC). The easiest way to run Java 3D applications -using the JOGL -pipeline is via Java Webstart from your browser (with no setup -required). -<a href="https://j3d-webstart.dev.java.net/test">Click here</a> to run -a Java 3D example program from your browser via the -JOGL pipeline. These -examples will use JOGL on Mac OS X and the native OpenGL pipeline on -all -other platforms.<br> -</p> -<p>The JOGL renderer is the default on Mac OS X. -You can select the JOGL renderer on other platforms by setting the "<code>j3d.rend</code>" -system -property -to "<code>jogl</code>", -for example: -</p> -<ul> - <code>java -Dj3d.rend=jogl ClassName</code> -</ul> -<p>You will need to <a href="https://jogl.dev.java.net/">download -JOGL</a> -and include it in your PATH/CLASSPATH along with the Java 3D jar files.<br> -</p> -<p>NOTE: Installing the j3d or jogl jars and native libs into the "ext" -directory of the JRE is strongly discouraged. Doing so can cause -conflicts with third-party applications launched via Java Web Start, -and causes confusion later when upgrading the distribution. -</p> -<h3><a name="More_Information"></a>More Information</h3> -<p>For the latest information on Java 3D, see the <a - href="https://java3d.dev.java.net/">main Java 3D project page</a> -on -java.net.<br> -</p> -<p>Click <a - href="https://java3d.dev.java.net/issues/buglist.cgi?Submit+query=Submit+query&component=java3d&issue_status=NEW&issue_status=STARTED&issue_status=REOPENED">here</a> -for a list of open issues.</p> +<p>THIS FILE IS A PLACEHOLDER FOR THE RELEASE NOTES FOR 1.6.0-beta1</p> </body> </html> diff --git a/release-info/pre-release/README.txt b/release-info/pre-release/README.txt index 8b456ea..cd8ee59 100644 --- a/release-info/pre-release/README.txt +++ b/release-info/pre-release/README.txt @@ -1,4 +1,4 @@ -3D Graphics API for the Java Platform 1.5.2 Pre-Release +3D Graphics API for the Java Platform 1.6.0 Pre-Release ------------------------------------------------------- This software is licensed by Sun under terms of the GNU General @@ -6,7 +6,7 @@ Public License version 2 as specified in the LICENSE-GPLv2.txt file and on the web at http://openjdk.java.net/legal/gplv2+ce.html This binary pre-release of the 3D graphics API for the Java platform -1.5.2 is an intermediate build of the software. The code is untested +1.6.0 is an intermediate build of the software. The code is untested and presumed incompatible with the Java 3D(TM) API specification. You must only use this code in accordance with the terms under which the code is licensed. @@ -19,12 +19,12 @@ or at: http://java.sun.com/products/java-media/3D/ -Instructions for unzipping 3D graphics API for the Java platform 1.5.2 +Instructions for unzipping 3D graphics API for the Java platform 1.6.0 ---------------------------------------------------------------------- -After downloading and unzipping the j3d-1_5_2-XXX.zip file +After downloading and unzipping the j3d-1_6_0-XXX.zip file into a temporary directory, for example, "/tmp", you will see -the following files in the j3d-1_5_2-XXX directory: +the following files in the j3d-1_6_0-XXX directory: COPYRIGHT.txt Copyright notice LICENSE-GPLv2.txt Software License Agreement diff --git a/src/classes/J3dVersion b/src/classes/J3dVersion index 52295ff..4c43271 100644 --- a/src/classes/J3dVersion +++ b/src/classes/J3dVersion @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Specification-Title: @SPEC_TITLE@ -Specification-Version: 1.5 +Specification-Version: 1.6 Specification-Vendor: @SPEC_VENDOR@ Implementation-Title: @IMPL_TITLE@ Implementation-Version: @VERSION_BASE@ diff --git a/src/native/d3d/D3dDriverInfo.cpp b/src/native/d3d/D3dDriverInfo.cpp index 0c84fce..a5260c3 100644 --- a/src/native/d3d/D3dDriverInfo.cpp +++ b/src/native/d3d/D3dDriverInfo.cpp @@ -341,7 +341,7 @@ VOID D3dDriverInfo::release() VOID printInfo() { - printf("javax.media.j3d 1.5.2, Windows version is %d.%d ", + printf("javax.media.j3d 1.6.0, Windows version is %d.%d ", osvi.dwMajorVersion, osvi.dwMinorVersion); printf("Build: %d, ", LOWORD(osvi.dwBuildNumber)); @@ -418,7 +418,7 @@ VOID D3dDriverInfo::initialize(JNIEnv *env) LPDIRECT3D9 pD3D = Direct3DCreate9( D3D_SDK_VERSION ); if (debug && pD3D != NULL){ printf("[j3d] Using DirectX D3D 9.0 or higher.\n"); - printf("[j3d] DirectX D3D renderer build 1.5.2\n"); + printf("[j3d] DirectX D3D renderer build 1.6.0\n"); } if (pD3D == NULL) { D3dCtx::d3dError(D3DNOTFOUND); |