java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3277
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3277&view=rev
Author:   matzon
Date:     2010-02-21 21:27:35 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
fixed non-direct buffer issue

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java	2010-02-21 21:18:17 UTC (rev 3276)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/GearsApplet.java	2010-02-21 21:27:35 UTC (rev 3277)
@@ -225,11 +225,16 @@
 	protected void initGL() {
 		try {
 			// setup ogl
-			FloatBuffer pos = FloatBuffer.wrap(new float[] { 5.0f, 5.0f, 10.0f, 0.0f});
-			FloatBuffer red = FloatBuffer.wrap(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
-			FloatBuffer green = FloatBuffer.wrap(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
-			FloatBuffer blue = FloatBuffer.wrap(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
+			FloatBuffer pos = BufferUtils.createFloatBuffer(4).put(new float[] { 5.0f, 5.0f, 10.0f, 0.0f});
+			FloatBuffer red = BufferUtils.createFloatBuffer(4).put(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
+			FloatBuffer green = BufferUtils.createFloatBuffer(4).put(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
+			FloatBuffer blue = BufferUtils.createFloatBuffer(4).put(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
 			
+			pos.flip();
+			red.flip();
+			green.flip();
+			blue.flip();
+			
 			GL11.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, pos);
 			GL11.glEnable(GL11.GL_CULL_FACE);
 			GL11.glEnable(GL11.GL_LIGHTING);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3276
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3276&view=rev
Author:   matzon
Date:     2010-02-21 21:18:17 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
fixed non-direct buffer issue

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java	2010-02-20 10:43:45 UTC (rev 3275)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/Gears.java	2010-02-21 21:18:17 UTC (rev 3276)
@@ -160,10 +160,15 @@
 		Display.create();
 
 		// setup ogl
-		FloatBuffer pos = FloatBuffer.wrap(new float[] { 5.0f, 5.0f, 10.0f, 0.0f});
-		FloatBuffer red = FloatBuffer.wrap(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
-		FloatBuffer green = FloatBuffer.wrap(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
-		FloatBuffer blue = FloatBuffer.wrap(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
+		FloatBuffer pos = BufferUtils.createFloatBuffer(4).put(new float[] { 5.0f, 5.0f, 10.0f, 0.0f});
+		FloatBuffer red = BufferUtils.createFloatBuffer(4).put(new float[] { 0.8f, 0.1f, 0.0f, 1.0f});
+		FloatBuffer green = BufferUtils.createFloatBuffer(4).put(new float[] { 0.0f, 0.8f, 0.2f, 1.0f});
+		FloatBuffer blue = BufferUtils.createFloatBuffer(4).put(new float[] { 0.2f, 0.2f, 1.0f, 1.0f});
+		
+		pos.flip();
+		red.flip();
+		green.flip();
+		blue.flip();
 
 		GL11.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, pos);
 		GL11.glEnable(GL11.GL_CULL_FACE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3275
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3275&view=rev
Author:   matzon
Date:     2010-02-20 10:43:45 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
added test for WaveData

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/WaveDataTest.java

Added: trunk/LWJGL/src/java/org/lwjgl/test/WaveDataTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/WaveDataTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/WaveDataTest.java	2010-02-20 10:43:45 UTC (rev 3275)
@@ -0,0 +1,135 @@
+/* 
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.test;
+
+import java.io.File;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.util.WaveData;
+
+/**
+ * <br>
+ * Test class WaveDataTest
+ *
+ * @author Brian Matzon <br...@ma...>
+ */
+public class WaveDataTest {
+	
+	String filePath = "Footsteps.wav";
+
+	/**
+	 * Creates a new DisplayTest
+	 */
+	public WaveDataTest() {
+	}
+
+	/**
+	 * Runs the tests
+	 */
+	public void executeTest() throws LWJGLException {
+		executeCreationTest();
+		executeBrokenCreationTest();
+		executeMidStreamCreationTest();
+	}
+
+
+	private void executeCreationTest() {
+		WaveData wd = WaveData.create(filePath);
+		if(wd != null) {
+			System.out.println("executeCreationTest::success");
+		}
+	}
+
+	private void executeBrokenCreationTest() {
+		WaveData wd = WaveData.create("");
+		if(wd == null) {
+			System.out.println("executeBrokenCreationTest::success");
+		}
+	}
+	
+	private void executeStreamCreationTest() {
+		try {
+			AudioInputStream ais = AudioSystem.getAudioInputStream(new File(filePath));
+			WaveData wd = WaveData.create(ais);
+			if(wd == null) {
+				System.out.println("executeMidStreamCreationTest::success");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}	
+
+	private void executeMidStreamCreationTest() {
+		try {
+			
+			AudioInputStream ais = AudioSystem.getAudioInputStream(WaveDataTest.class.getClassLoader().getResource(filePath));			
+			int totalSize = ais.getFormat().getChannels() * (int) ais.getFrameLength() * ais.getFormat().getSampleSizeInBits() / 8;
+			
+			// skip 1/4 of the stream
+			int skip = totalSize / 4;
+			long skipped = ais.skip(skip);
+			
+			WaveData wd = WaveData.create(ais);
+			if(wd == null) {
+				System.out.println("executeMidStreamCreationTest::success");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	   * Pause current thread for a specified time
+	   * 
+	   * @param time milliseconds to sleep
+	   */
+	private void pause(long time) {
+		try {
+			Thread.sleep(time);
+		} catch (InterruptedException inte) {
+			/* ignored */
+		}
+	}
+
+	/**
+	 * Tests the Sys class, and serves as basic usage test
+	 * 
+	 * @param args ignored
+	 */
+	public static void main(String[] args) throws LWJGLException {
+		new WaveDataTest().executeTest();
+		System.exit(0);
+	}
+}


Property changes on: trunk/LWJGL/src/java/org/lwjgl/test/WaveDataTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3274
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3274&view=rev
Author:   matzon
Date:     2010-02-20 10:43:22 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
cleanup and better logging - no longer prints stacktrace
changed AudioInputStream method to use available() instead of calculating it.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/WaveData.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/WaveData.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/WaveData.java	2010-02-14 17:06:15 UTC (rev 3273)
+++ trunk/LWJGL/src/java/org/lwjgl/util/WaveData.java	2010-02-20 10:43:22 UTC (rev 3274)
@@ -96,8 +96,7 @@
 				AudioSystem.getAudioInputStream(
 					new BufferedInputStream(path.openStream())));
 		} catch (Exception e) {
-			org.lwjgl.LWJGLUtil.log("Unable to create from: " + path);
-			e.printStackTrace();
+			org.lwjgl.LWJGLUtil.log("Unable to create from: " + path + ", " + e.getMessage());
 			return null;
 		}		
 	}
@@ -123,8 +122,7 @@
 			return create(
 				AudioSystem.getAudioInputStream(is));
 		} catch (Exception e) {
-			org.lwjgl.LWJGLUtil.log("Unable to create from inputstream");
-			e.printStackTrace();
+			org.lwjgl.LWJGLUtil.log("Unable to create from inputstream, " + e.getMessage());
 			return null;
 		}		
 	}	
@@ -141,7 +139,7 @@
 				AudioSystem.getAudioInputStream(
 					new BufferedInputStream(new ByteArrayInputStream(buffer))));
 		} catch (Exception e) {
-			e.printStackTrace();
+			org.lwjgl.LWJGLUtil.log("Unable to create from byte array, " + e.getMessage());
 			return null;
 		}
 	}
@@ -166,7 +164,7 @@
 			}
 			return create(bytes);
 		} catch (Exception e) {
-			e.printStackTrace();
+			org.lwjgl.LWJGLUtil.log("Unable to create from ByteBuffer, " + e.getMessage());
 			return null;
 		}
 	}	
@@ -204,26 +202,23 @@
 		}
 
 		//read data into buffer
-		byte[] buf =
-			new byte[audioformat.getChannels()
-				* (int) ais.getFrameLength()
-				* audioformat.getSampleSizeInBits()
-				/ 8];
-		int read = 0, total = 0;
+		ByteBuffer buffer = null;
 		try {
+			int available = ais.available();
+			if(available <= 0) {
+				available = ais.getFormat().getChannels() * (int) ais.getFrameLength() * ais.getFormat().getSampleSizeInBits() / 8;
+			}
+			byte[] buf = new byte[ais.available()];
+			int read = 0, total = 0;
 			while ((read = ais.read(buf, total, buf.length - total)) != -1
 				&& total < buf.length) {
 				total += read;
 			}
+			buffer = convertAudioBytes(buf, audioformat.getSampleSizeInBits() == 16);
 		} catch (IOException ioe) {
 			return null;
 		}
 
-		//insert data into bytebuffer
-		ByteBuffer buffer = convertAudioBytes(buf, audioformat.getSampleSizeInBits() == 16);
-/*		ByteBuffer buffer = ByteBuffer.allocateDirect(buf.length);
-		buffer.put(buf);
-		buffer.rewind();*/
 
 		//create our result
 		WaveData wavedata =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3273
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3273&view=rev
Author:   kappa1
Date:     2010-02-14 17:06:15 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
Complete overhaul of the linux focus system when using Display.setParent(). This should fix the input problems with applets (on linux) due to Display not being able to gain focus.

Also now works perfectly in all browsers, previously input focus was not restored to other browser components when requested (like firefox's address bar).

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2010-02-10 11:22:16 UTC (rev 3272)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2010-02-14 17:06:15 UTC (rev 3273)
@@ -127,27 +127,11 @@
 	private Canvas parent;
 	private long parent_window;
 	private boolean xembedded;
-	private boolean parent_focused;
-	private boolean parent_focus_changed;
+	private boolean parent_focus;
 
 	private LinuxKeyboard keyboard;
 	private LinuxMouse mouse;
 
-	private final FocusListener focus_listener = new FocusListener() {
-		public void focusGained(FocusEvent e) {
-			synchronized (GlobalLock.lock) {
-				parent_focused = true;
-				parent_focus_changed = true;
-			}
-		}
-		public void focusLost(FocusEvent e) {
-			synchronized (GlobalLock.lock) {
-				parent_focused = false;
-				parent_focus_changed = true;
-			}
-		}
-	};
-
 	private static ByteBuffer getCurrentGammaRamp() throws LWJGLException {
 		lockAWT();
 		try {
@@ -439,11 +423,6 @@
 					grab = false;
 					minimized = false;
 					dirty = true;
-					if (parent != null) {
-						parent.addFocusListener(focus_listener);
-						parent_focused = parent.isFocusOwner();
-						parent_focus_changed = true;
-					}
 				} finally {
 					peer_info.unlock();
 				}
@@ -494,8 +473,6 @@
 	public void destroyWindow() {
 		lockAWT();
 		try {
-			if (parent != null)
-				parent.removeFocusListener(focus_listener);
 			try {
 				setNativeCursor(null);
 			} catch (LWJGLException e) {
@@ -853,17 +830,21 @@
 	}
 
 	private void checkInput() {
-		if (parent == null || !parent_focus_changed)
-			return;
+		if (parent == null) return;
 		
-		if (!focused && parent_focused) {
-			if (xembedded) {
-				// disable parent from taking focus back from Display when it is clicked
-				parent.setFocusable(false);
+		if (parent_focus != parent.hasFocus()) {
+			parent_focus = parent.hasFocus();
+			
+			if (parent_focus) {
+				setInputFocusUnsafe(current_window);
 			}
-			setInputFocusUnsafe(getWindow());
-			parent_focus_changed = false;
+			else {
+				setInputFocusUnsafe(0);
+			}
 		}
+		else if (parent_focus && !focused) {
+			setInputFocusUnsafe(current_window);
+		}
 	}
 
 	private void setFocused(boolean got_focus, int focus_detail) {
@@ -874,19 +855,8 @@
 		if (focused) {
 			acquireInput();
 		}
-		
-		if (parent != null && xembedded && focused != parent.hasFocus()) {
-			return;
-		}
-		
-		if (!focused) {
+		else {
 			releaseInput();
-			
-			if (parent != null && xembedded) {
-				setInputFocusUnsafe(0);
-				// re-enable parent focus to detect click on window
-				parent.setFocusable(true);
-			}
 		}
 	}
 	static native long nGetInputFocus(long display);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3272
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3272&view=rev
Author:   spasi
Date:     2010-02-10 11:22:16 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Changed BaseReferences to use GL20.GL_MAX_TEXTURE_IMAGE_UNITS when available (GL13.GL_MAX_TEXTURE_UNITS is deprecated).
Catch and log OpenGL errors during context creation, instead of throwing an exception.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java	2010-02-09 15:22:58 UTC (rev 3271)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java	2010-02-10 11:22:16 UTC (rev 3272)
@@ -58,7 +58,10 @@
         glVertexAttribPointer_buffer = new Buffer[max_vertex_attribs];
 
 		int max_texture_units;
-		if (caps.OpenGL13 || caps.GL_ARB_multitexture) {
+		if (caps.OpenGL20) {
+			GL11.glGetInteger(GL20.GL_MAX_TEXTURE_IMAGE_UNITS, temp);
+			max_texture_units = temp.get(0);
+		} else if (caps.OpenGL13 || caps.GL_ARB_multitexture) {
         	GL11.glGetInteger(GL13.GL_MAX_TEXTURE_UNITS, temp);
 			max_texture_units = temp.get(0);
 		} else

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-02-09 15:22:58 UTC (rev 3271)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-02-10 11:22:16 UTC (rev 3272)
@@ -881,7 +881,11 @@
 
 	private static void makeCurrentAndSetSwapInterval() throws LWJGLException {
 		makeCurrent();
-		Util.checkGLError();
+		try {
+			Util.checkGLError();
+		} catch (OpenGLException e) {
+			LWJGLUtil.log("OpenGL error during context creation: " + e.getMessage());
+		}
 		setSwapInterval(swap_interval);
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3271
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3271&view=rev
Author:   spasi
Date:     2010-02-09 15:22:58 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Catch and ignore INVALID_OPERATION error when retrieving CONTEXT_PROFILE_MASK (workaround for ATI 9.12).

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2010-02-07 18:50:23 UTC (rev 3270)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2010-02-09 15:22:58 UTC (rev 3271)
@@ -247,8 +247,18 @@
 
 			// Get the context profile mask for versions >= 3.2
 			if ( 3 < majorVersion || 2 <= minorVersion ) {
+				Util.checkGLError(); // Make sure we have no errors up to this point
+
 				GL11.glGetInteger(GL32.GL_CONTEXT_PROFILE_MASK, buffer);
-				profileMask = buffer.get(0);
+
+				try {
+					// Retrieving GL_CONTEXT_PROFILE_MASK may generate an INVALID_OPERATION error on certain implementations, ignore.
+					// Happens on pre10.1 ATI drivers, when ContextAttribs.withProfileCompatibility is not used
+					Util.checkGLError();
+					profileMask = buffer.get(0);
+				} catch (OpenGLException e) {
+					LWJGLUtil.log("Failed to retrieve CONTEXT_PROFILE_MASK");
+				}
 			}
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3270
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3270&view=rev
Author:   spasi
Date:     2010-02-07 18:50:23 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
Made glGetInteger64i_v optional (not exposed on NV drivers)

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2010-02-07 15:15:33 UTC (rev 3269)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2010-02-07 18:50:23 UTC (rev 3270)
@@ -315,6 +315,7 @@
 	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer data);
 
 	@StripPostfix(value = "data", postfix = "64")
+	@Optional(reason = "NV's 3.2 implementation does not expose this (last driver checked: 19?.??)")
 	void glGetInteger64i_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4") @GLint64 LongBuffer data);
 
 	@StripPostfix("values")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3269
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3269&view=rev
Author:   spasi
Date:     2010-02-07 15:15:33 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
Removed glPrimitiveRestart from GL31 (immediate mode call that never made it to the core)
Added Optional annotation for functions that miss from incomplete implementations.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/Optional.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2010-02-03 21:03:32 UTC (rev 3268)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2010-02-07 15:15:33 UTC (rev 3269)
@@ -197,12 +197,13 @@
 
 		writer.print("\tprivate boolean " + getAddressesInitializerName(d.getSimpleName()) + "(");
 
-		DeprecatedGL deprecated = d.getAnnotation(DeprecatedGL.class);
+		boolean optional;
+		boolean deprecated = d.getAnnotation(DeprecatedGL.class) != null;
 		Dependent dependent = d.getAnnotation(Dependent.class);
-		if ( deprecated != null )
+		if ( deprecated )
 			writer.print("boolean forwardCompatible");
 		if ( dependent != null ) {
-			if ( deprecated != null )
+			if ( deprecated )
 				writer.print(",");
 			writer.print("Set supported_extensions");
 		}
@@ -211,11 +212,14 @@
 		writer.println("\t\treturn ");
 		while ( methods.hasNext() ) {
 			MethodDeclaration method = methods.next();
-			deprecated = method.getAnnotation(DeprecatedGL.class);
+			optional = method.getAnnotation(Optional.class) != null;
+			deprecated = method.getAnnotation(DeprecatedGL.class) != null;
 			dependent = method.getAnnotation(Dependent.class);
 
 			writer.print("\t\t\t(");
-			if ( deprecated != null )
+			if ( optional )
+				writer.print('(');
+			if ( deprecated )
 				writer.print("forwardCompatible || ");
 			if ( dependent != null ) {
 				if ( dependent.value().indexOf(',') == -1 )
@@ -227,7 +231,7 @@
 					writer.print(") || ");
 				}
 			}
-			if ( deprecated != null || dependent != null )
+			if ( deprecated || dependent != null )
 				writer.print('(');
 			writer.print(Utils.getFunctionAddressName(d, method) + " = ");
 			PlatformDependent platform_dependent = method.getAnnotation(PlatformDependent.class);
@@ -253,8 +257,10 @@
 			} else
 				writer.print("GLContext.getFunctionAddress(");
 			writer.print("\"" + method.getSimpleName() + "\")) != 0");
-			if ( deprecated != null || dependent != null )
+			if ( deprecated || dependent != null )
 				writer.print(')');
+			if ( optional )
+				writer.print(" || true)");
 			if ( methods.hasNext() )
 				writer.println(" &&");
 		}

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/Optional.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Optional.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Optional.java	2010-02-07 15:15:33 UTC (rev 3269)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.generator;
+
+/**
+ * A function annotated with @Optional will allow the extension to be available even if the driver does not expose that function.
+ * This is useful when certain buggy drivers miss some functionality.
+ *
+ * @author spasi <sp...@us...>
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+public @interface Optional {
+	String reason(); // No default value to force documentation
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2010-02-03 21:03:32 UTC (rev 3268)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2010-02-07 15:15:33 UTC (rev 3269)
@@ -96,8 +96,6 @@
 	 */
 	int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
 
-	void glPrimitiveRestart();
-
 	void glPrimitiveRestartIndex(@GLuint int index);
 
 	// -------------------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2010-02-03 21:03:32 UTC (rev 3268)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2010-02-07 15:15:33 UTC (rev 3269)
@@ -63,6 +63,7 @@
 	// ----------------------[ ARB_draw_elements_base_vertex ]----------------------
 	// -----------------------------------------------------------------------------
 
+	@Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
 	void glDrawElementsBaseVertex(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
 	                              @BufferObject(BufferKind.ElementVBO)
 	                              @Const
@@ -70,6 +71,7 @@
 	                              @GLushort
 	                              @GLuint Buffer indices, int basevertex);
 
+	@Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
 	void glDrawRangeElementsBaseVertex(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
 	                                   @BufferObject(BufferKind.ElementVBO)
 	                                   @Const
@@ -77,6 +79,7 @@
 	                                   @GLushort
 	                                   @GLuint Buffer indices, int basevertex);
 
+	@Optional(reason = "AMD's 3.2 implementation does not expose this (last driver checked: 10.1)")
 	void glDrawElementsInstancedBaseVertex(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
 	                                       @BufferObject(BufferKind.ElementVBO)
 	                                       @Const


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[このメールは、携帯電話など受信文字数に制限のあるアドレスには対応していません。]

こんにちは、Yahoo!グループです。

■メッセージを投稿できません
[java-genjin]グループに投稿された以下のメッセージは受け付けられませんでした。
投稿元メールアドレス： <jav...@li...>　
投稿先メールアドレス： <jav...@eg...>　
■投稿先のグループが見つかりません
メッセージを投稿したグループが見つかりませんでした。
アドレスが間違っていないかご確認のうえ、再度投稿してください。
■[java-genjin]グループについてのお問い合わせ
グループ管理者：jav...@ya... 　

-- [PR] --------------------------------------------------------------
       -−―★　安くてピッタリの自動車保険をみつけよう　★―−-
  -−―★ 見積もり結果にびっくり！？最大12社からじっくり比較 ★―−-

         -−　Yahoo!保険の自動車保険一括見積もりサービス　−-
             http://rd.yahoo.co.jp/egroups/050701y/1.html

-------------------------------------------------------------- [PR] --

==============================================================
Yahoo!グループ - 多くの仲間とらくらくコミュニケーション！
http://groups.yahoo.co.jp/ 
ヘルプ・お問い合わせ： http://help.yahoo.co.jp/help/jp/groups/

※このメールに質問をご返信いただいても回答いたしかねます。
　お問い合わせはヘルプページからお願いします。

Revision: 3268
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3268&view=rev
Author:   matzon
Date:     2010-02-03 21:03:32 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
prepare for 2.3

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2010-01-31 16:40:51 UTC (rev 3267)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2010-02-03 21:03:32 UTC (rev 3268)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 					location="doc" />
 	<property name="lwjgl.temp" 					location="temp" />
 	<property name="lwjgl.res" 						location="res" />
-	<property name="lwjgl.version" 				value="2.2.2" />
+	<property name="lwjgl.version" 				value="2.3" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
 	<!-- ================================================================== -->

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-01-31 16:40:51 UTC (rev 3267)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-02-03 21:03:32 UTC (rev 3268)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.2.2";
+	private static final String VERSION = "2.3";
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

TO: Librarian/Head, Library Acquisition

FROM: Lena Han

CHINA PUBLICATIONS

 

China Abrasives Directory 2010 (English Ed.) New!
It Lists 1,130 abrasive enterprises in China, including manufacturers of
corundum, silicon carbide, grinding tools and wheels, polishing products,
raw materials and so on. Information given includes enterprise name,
address, contact persons, tel&fax numbers, year of establishment, number of
employees, email & URLs if applicable, product lines, etc.
2010, 322pp, ebook or hardcopy US$199.50; both US$299.50 (including
P&H),ISBN: 978-0-9733166-6-7


China Aviation Directory 2009 (English Ed.) New!
It covers an overview on China's aviation industry and all leading
organization and enterprises, including governmental agencies, societies and
associations, airlines, airports, national corporations, manufacturers,
aeronautical research institutes, universities, trade & professional
corporations, space business, aviation hospitals, industrial parks, air
shows, and foreign companies in China. The information given includes
company name, names and titles of key persons, description on company
history and current situation, technical strength, product lines, intention
of cooperation, and contact details (address, telephone and fax numbers,
e-mail addresses and websites). It also provides a key word index.
2009, 321pp, ebook or hardcopy US$199.50; both US$299.50 (including P&H),
ISBN: 978-0-9733166-1-2


China Maritime Directory 2009/10 (English Ed.) New!
It contains the most up-to-date information on more than 6,000 maritime
companies and institutions in China. The industry fields listed include
shipbuilding & shiprepair, marine equipment and materials, shipping and
logistics, shipowners, survey of ship, tradeing and intermediary service,
research and design institutes, education and training, associations, news
and publishers, maritime law institutions, administrations, etc. Each entry
contains the company's name, address, phone & fax numbers, email & URL, and
description of business scope. It also provides a key word index.
2009, 558pp, hardcopy (softcover) US$199.50, ISBN: 978-0-9733166-4-3
<http://www.collectionscanada.gc.ca/ciss-ssci/app/index.php?fuseaction=logbo
ok.edit&publication=220496&lang=eng> 


China Shipbuilding Industry Directory 2010 (English Ed.) New!
It covers about 4,000 companies within the shipbuilding industry throughout
China. The industry fields listed include shipbuilding & ship repair, yacht
and lifesaving equipment, marine equipment and materials, trading and
intermediary service, research and design institutes, education and
training, associations, news and publications, as well as survey of ship.
Each entry contains the company's name, address, phone & fax numbers, email
& URL, and business scope.
2010, 388pp, US$199.50, ISBN: 978-0-9733166-5-0


China Leather Directory 2010  (English Ed.) New!
It covers about 1,500 companies within the leather industry throughout
China. The industry fields listed include tanning, leather shoes & sport
shoes, leather garment, fur, leather goods, leather chemicals, leather and
shoe machinery, research institutes, trading companies, publishing and
training, and associations. Each entry contains the company's name, contact
person, address, phone & fax numbers, email & URL, and product lines.
2010, 328pp, US$199.50


China Refractory Directory 2009/10 (English-Chinese)
Lists 2,184 leading refractory enterprises in China. Information given
includes the enterprise name, name of director, full address, phone and fax
numbers, email, website, description, qualification of quality system, and
product lines.
2009, 339pp, ebook or hardcopy US$199.95; both US$299.95, ISBN:
978-0-9733166-3-6


China Ceramic Directory 2008 (English Ed.) New!
Completely revised and updated compared to previous edition, this edition
lists about 1,400 leading ceramic and pottery enterprises, research
institutes, associations, importers & exporters. It covers daily used
ceramics, porcelain products, sanitary ceramics, building ceramics, tiles,
electroceramics, refractories, technical and industrial ceramics, ceramic
raw materials, equipment and machines as well as publications. It gives
information on the organization's name, address, tel/fax number, emails &
URLs, name of director, registered capital, number of employees, history,
production capacity, main products. An appendix lists about 30 websites on
ceramic industry in China. A classification index is also included.
2008, 321pp, ebook or hardcopy US$199.95; both US$299.95 (including P&H),
ISBN 978-0-9733166-2-9

The China Customs Tariffs Table 2009 (English-Chinese)
Provides you the comprehensive information about the China tariffs and
non-tariff control on importation and exportation. Just download the table
and its browser into your hard disk, you can find all related rates and
rules. The contents are arranged according to the HS Code, which is widely
used by the customs and you can also search the whole table by keywords.
2009, US$195.00

Directory of China's Foreign Trade Enterprises 2008 (English-Chinese)
Compiled by the China Council for the Promotion of International Trade
(CCPIT) and the China Chamber of International Commerce (CCIC). This edition
provides updated and accurate information on more than 10,000 import and
export companies, manufacturers permitted to engage in international trade.
Information given includes company name, address, contact person, phone/fax
numbers, email and web sites, description. It was arranged in such
industrial categories as textile & garment, medicine & healthcare, mineral &
chemical industry, machinery & electronics, food & animal industries, light
industry, general trading, automobiles & motorcycles and parts, culture
industry, exhibitions, foreign services, etc.
2008, 743pp, US$199.95

China Chemical Directory 2008 (English Ed.)
Lists more than 15,000 chemical producers, 20,000 chemicals divided into 19
types and 80,000 items of production information. Information given includes
company name, address, phone/fax numbers, email, websites, names of
executives, chemical product code, chemical product name, CAS number, number
of employees, annual output value, import/export authorization, as well as
production capacity, etc.
2008, 1,300pp, US$695.00

Chinese Biotechnology Directory 2009 (English Ed.)
As there has been much progress in biotechnology R&D, particularly in
functional genomics, in China in recent years, this fifth edition was
expanded, updated and revised completely, compared to the previous edition.
It contains most up-to-date and accurate information. It was also divided
into three parts. The first part contains an overview on China's
biotechnology, including government policy, science base, bioindustry,
technology transfer, information resources, intellectual property and
regulation environment. The second part lists all government agencies and
societies involved in biotechnology. The third part lists over 1,000
research institutes, university departments, and companies, as well as
foreign companies' representative offices in China. It gives information on
the organization's name, address, tel/telex/fax numbers, some email or
websites of its first kind, activities and services offered with an index.
Appendices contain China's laws and regulations related to biotechnology and
pharmaceutical.
2009, 320pp, US$199.95


TLC Atlas of Chinese Crude Drugs in Chinese Pharmacopoeia (English Ed.)
Compiled by Chinese Pharmacopoeia Commission, TLC Atlas Of Chinese Crude
Drugs In Chinese Pharmacopoeia includes color photographs of superb quality
demonstrating chromatograms of all Chinese crude drugs in Chinese
Pharmacopoeia 2005. The atlas will be a useful reference for analyzing
Chinese crude drugs, identifying unknown drugs or monitoring the purity or
constituents of a given drug. All drugs presented meet the standard of the
official pharmacopoeia and originate from well-defined sources. With this
guide the technique of thin layer chromatography can be easily used without
previous pharmacognostic training. Only commercially available equipment and
reagents are needed, the sources as well as all practical details are given.
2009, 306pp, hardcover US$199.95

Pharmacopoeia of The People's Republic of China 2005 (English Edition)
Compiled by the Pharmacopoeia, Commission of the Ministry of Public Health,
the Chinese Pharmacopoeia, an official English translation of its Chinese
version, is a national code of standards for the quality of drugs. It
consists of technical specifications on drug quality for the implementation
of China's Drug Administration Law. According to regulations by the China's
State Drug Administration, the quality of any imported drugs must conform
with the Chinese Pharmacopoeia. This fifth edition, as compared with its
preceding English edition (2000), was expanded and revised greatly. In this
2005 edition, the total number of monograph is 3,214 in three volumes.
Volume I contains 1146 monographs, with 154 new admissions and 453 revised;
Volume II covers 1967 monographs, with 327 new admissions and 522 revised;
Volume III contains 101 monographs, with 44 new antibiotics, biochemicals,
radiopharmaceuticals, biological products, for the first time, gene
engineered medicine, new drugs are included in this volume. Modern
analytical techniques are adopted extensively for the tests of drugs and new
preparations were added. Information given includes the standards of purity,
description, test, dosage, precaution, storage, and the strength for each
drug.
2006, 3 Vols, hardcover, US$1199.00


Directory of China's Foreign Trade Enterprises 2008 (English- Chinese)
Compiled by the China Council for the Promotion of International Trade
(CCPIT) and the China Chamber of International Commerce (CCIC). This edition
provides updated and accurate contact information on more than 10,000 import
and export companies, manufacturers permitted to engage in international
trade.  Information  given  includes company name, address, phone/fax
numbers,  email  and  web  sites, description. It is arranged in 12
industrial categories, including agriculture, forestry, fishery; mineral
industry, manufacturing,  electric  power,  gas and  water; architectural
industry, mineral exploration, irritation; transport,   storage   up,   post
and communication industry; wholesale and  retail;  finance  and  insurance;
real  estate;  social  service  industry; and  physical  education  and
social welfare industry. Appendix contains official services on foreign
affairs, foreign embassies in China, foreign  chambers  of  commerce  in
China and major websites in China. It was indexed by Standard Industrial
Classification regions.
2008, 650pp, US$199.95


Directory of Medical Device Companies in China 2008 (English Ed.)
Lists about 1,000 leading medical device and equipment companies in China.
It gives latest information on company name, address, tel/fax numbers,
email/website addresses if applicable, business activity, product lines,
number of employees, annual turnover.
2008, 310pp, US$199.00

Almanac of China's Finance and Banking 2007 (English Ed.)
Contains nine chapters, including reform and developments; international
finance and international exchanges in finance; economy and finance in
regions; documents and regulations; statistics and subject surveys; events
and profiles of major financial organizations; etc.
2007, hardcover US$299.50

China Statistical Yearbook of High Technology Industry 2007
(English-Chinese) 
Contains 6 chapters, including production, marketing and technical
activities in major hi-tech companies, employment in hi-tech companies;
capital investment; exports in hi-tech industries, as well as international
comparison, etc.
2007, 42pp, hardcover US$199.50


China Capital Markets Development Report (English-Chinese) 
Compiled by China Securities Regulatory Commission, it contains four
chapters, including brief review of the development of China's capital
markets; important capital markets policies and reforms in recent years; the
challenges facing China's capital markets; and China's capital markets:
strategies and prospects.
2008, 301pp, hardcover US$199.50

China Energy Statistical Yearbook 2007 (English-Chinese) 
Contains 8 parts, including overview; energy construction; production of
energy; balance table of naational energy; energy consumption; balance table
of regional energy; data on energy in Hong Kong, Macau, and Taiwan, etc.
2008, 288pp, US$199.50


China Environment Statistical Yearbook 2008 (English-Chinese) New!
It contains statistical data on environment in all provinces since 2006 and
major data on environment in all country. It contains ten chapters,
including general survey, freshwater environment, marine environment,
atmospheric environment, solid wastes, eco-environment, natural disasters,
investment in the treatment of environmental pollution, urban environment,
rural environment. Appendix contains major environment indicators by
eastern, central and western China, main environmental indicators of the
world's major countries and regions, main environmental indicators, the main
pollutants emission indicators communique of the provinces, autonomous
regions, municipality directly under the central government in the first
half of 2008, explanatory notes on main statistical indicators.
2008, 248pp, US$199.50


China Trade and External Economic Statistical Yearbook 2008
(Chinese-English)
Compiled by the National Bureau of Statistics of China, this yearbook
provides comprehensive statistical data on domestic trade, external economic
cooperation and trade, and international travel in China. It contains eight
chapters, including general survey, domestic trade, foreign trade, foreign
investment, international income and payment, external economic cooperation,
travel, and profiles of enterprises.
2008, US$199.50


China Rubber Market Yearbook 2007 (English Ed.) 
Covers current status and developments in China's rubber markets; major
rubber and related markets; current status and developments in major
provinces; technical achievements; imports & exports; statistical data; list
of members of China Rubber Industry Association, etc.
2007, US$299.95

Annual Report on Electric Power Industry in China 2007 (English Ed.)
Covers tremendous achievements and brilliant prospects, development and
achievements of electric power industry in China, development plan and
outlook of electric power industry in China, power network development,
rural electrification, achievements in science and technology, education and
training, international cooperation, general survey on China's power
industry (total installed generating capacity, national total electricity
consumption, schematic map of large thermal power plants and nuclear power
station, etc.) with figures and tables.
2007, hardcover US$199.50

China Statistical Yearbook 2008 (English-Chinese)
Contains 24 chapters and 2 appendices, giving comprehensive statistical data
on every aspect of China's economic and social development in 2004. Its
contents include administrative divisions and natural resources; general
survey; population; employment and wage; investment in fixed assets; public
finance; prices; people's livelihood; agriculture; industries; energy and
production materials; transportation; postal & telecommunication services;
construction; domestic trade; foreign trade and tourism; banking and
insurance; city development; education; science; patents and culture;
sports; health-care; social welfare, major social and economic indicators in
Hong Kong.
2008, hardcover US$199.50



How to Order

You can order with 3 methods: by fax, email or mail. Orders must be prepaid.
We ship ordered items worldwide, using the delivery method you choose.
Airmail delivery usually takes 10-15 days to most countries, but sometimes
it may takes 3-4 weeks.

 

To place an order, please fill in the required information and fax, email or
mail it to BDI, using the information below: 

 

Business Data International Inc. 

85 Perron Street, La Prairie

Montreal, QC, J5R 5Z5, Canada

Phone: 514-558-3135

Fax: 450-619-2532

Email: in...@bu... 

 

Order Form

 

Please send me the following items: 

----------------------------------------------------------------------------
------------------------------------

 

Please select format: 

[ ] Electronic (no despatch charge)

[ ] Hard Copy (please select method of despatch) 

Postage and Handling 

[ ] Air Parcel / First Class USD 15 North America; USD 30 Rest of the World

[ ] Courier Delivery USD 60

 

Total (please complete) 

 

US$_________________ 

 

Your contact and despatch

 

Name: _________________________________________________________________

Company Name: _________________________________________________________

Address: _______________________________________________________________

City/State: ______________________________________________________________

Postcode:__________________________ Country:_____________________________

Phone number: __________________________________________________________

(essential for courier delivery) 

Email address:___________________________________________________________

(essential for electronic reports)

 

Method of Payment (please check one) 

 

[ ] Bank wire transfer to your account below:

A/C Name: Business Data International Inc.

A/C #: 0095-5201048

TD Canada Trust, IBAN#: 026-009-593

5290 Verdun Ave., Montreal, QC H4H 1K1, Canada

Transit Code: 48161-004 Swift #: TDOMCATTTOR

[ ] Check (made out to Business Data International Inc.)

[ ] Charge my credit card: __Visa              __Mastercard
__American Express 

 

Card Number: ______________________________________ Expiry Date: ____ / ____


Name on Card: ____________________________________ 

Billing Details (if different)

________________________________________________________________________

________________________________________________________________________

________________________________________________________________________

________________________________________________________________________

________________________________________________________________________

 

Signature (if ordering by fax or mail): ____________________________ Date:
________