Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ka...@us...> - 2012-11-05 23:19:53
|
Revision: 3816
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3816&view=rev
Author: kappa1
Date: 2012-11-05 23:19:46 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Remove unneeded old hack for OS X 10.3 in the mac Sys class implementation which loaded the AWT Toolkit
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2012-11-05 23:17:34 UTC (rev 3815)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2012-11-05 23:19:46 UTC (rev 3816)
@@ -44,11 +44,6 @@
final class MacOSXSysImplementation extends J2SESysImplementation {
private static final int JNI_VERSION = 23;
- static {
- // Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
- Toolkit.getDefaultToolkit();
- }
-
public int getRequiredJNIVersion() {
return JNI_VERSION;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-05 23:17:44
|
Revision: 3815
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3815&view=rev
Author: kappa1
Date: 2012-11-05 23:17:34 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Added support to the OS X build.xml for Xcode location discovery, Mac OS SDK discovery, JavaVM.framework discovery and gcc vs gcc-4.2 discovery, special thanks to MC78 for providing this patch
Modified Paths:
--------------
branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-04 20:11:03 UTC (rev 3814)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-05 23:17:34 UTC (rev 3815)
@@ -1,86 +1,126 @@
-
-<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
- <property name="native" location="../../src/native"/>
-
- <target name="init">
- <mkdir dir="i386"/>
- <mkdir dir="x86_64"/>
- </target>
-
- <target name="clean">
- <delete failonerror="false">
- <fileset dir="i386"/>
- <fileset dir="x86_64"/>
- <fileset dir="." includes="liblwjgl.jnilib"/>
- <fileset dir="." includes="lwjgl.symbols"/>
- </delete>
- </target>
-
- <target name="compile">
- <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx"/>
- <!-- Map from *.m and *.c to .o -->
- <mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
- <fileset dir="${native}/macosx" includes="*.m"/>
- <fileset dir="${native}/macosx" includes="*.c"/>
- <fileset dir="${native}/common" includes="*.c"/>
- <fileset dir="${native}/common/opengl" includes="*.c"/>
- <fileset dir="${native}/generated/openal" includes="*.c"/>
- <fileset dir="${native}/generated/opencl" includes="*.c"/>
- <fileset dir="${native}/generated/opengl" includes="*.c"/>
- </apply>
- </target>
-
- <target name="link">
- <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
- <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
- <fileset dir="${objdir}" includes="*.o"/>
- </apply>
- <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
- <arg line="-S -X"/>
- <fileset dir="." file="${libname}"/>
- </apply>
- </target>
-
- <target name="nativelibrary" depends="init">
- <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
- <property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
- <property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
- <antcall target="compile">
- <param name="dstdir" location="i386"/>
- <param name="compiler" value="gcc-4.2"/>
- <param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
- </antcall>
- <antcall target="compile">
- <param name="dstdir" location="x86_64"/>
- <param name="compiler" value="gcc-4.2"/>
- <param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
- </antcall>
- <exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
- <arg path="../../platform_build/macosx_ant/build-symbol-list"/>
- <arg path="i386"/>
- </exec>
- <antcall target="link">
- <param name="objdir" location="i386"/>
- <param name="libname" value="liblwjgl-i386.jnilib"/>
- <param name="linker" value="gcc-4.2"/>
- <param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
- </antcall>
- <antcall target="link">
- <param name="objdir" location="x86_64"/>
- <param name="libname" value="liblwjgl-i86_64.jnilib"/>
- <param name="linker" value="gcc-4.2"/>
- <param name="linkerflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
- </antcall>
- <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
- <arg value="-create"/>
- <srcfile/>
- <arg value="-output"/>
- <arg path="liblwjgl.jnilib"/>
- <fileset file="i386/liblwjgl-i386.jnilib"/>
- <fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
- </apply>
- </target>
-</project>
+
+<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
+ <property name="native" location="../../src/native"/>
+
+ <target name="init">
+ <mkdir dir="i386"/>
+ <mkdir dir="x86_64"/>
+ <property environment="env" />
+ <!-- Check which gcc we have, newer releasse of Mac OS do not have gcc-4.2 installed by defaault -->
+ <available file="gcc" filepath="${env.PATH}" property="gcc" value="gcc"/>
+ <available file="gcc-4.2" filepath="${env.PATH}" property="gcc" value="gcc-4.2"/>
+ <!-- Ask Xcode for correct path to XCode tools -->
+ <!-- Will fail if XCode Command Line Tools are not installed on 10.7+ (Lion) -->
+ <exec executable="xcode-select" outputproperty="developer_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
+ <arg value="-print-path" />
+ </exec>
+ <!-- Default to /Developer if xcode-select fails -->
+ <condition property="developer_path" value="/Developer">
+ <isset property="xcode-select.error" />
+ </condition>
+ <!-- Lion and above do not have /Developer nor the 10.6 SDK, so use 10.7 SDK -->
+ <condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+ <available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" type="dir"/>
+ </condition>
+ <condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+ <available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+ </condition>
+ <!-- Fallback to 10.6 SDK if present on file system under new Xcode location -->
+ <condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+ <available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" type="dir"/>
+ </condition>
+ <condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+ <available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+ </condition>
+ <!-- Fallback to 10.6 SDK if present on old /Developer path -->
+ <condition property="sdkroot" value="${developer_path}/SDKs/MacOSx10.6.sdk">
+ <available file="${developer_path}/SDKs/MacOSx10.6.sdk" type="dir"/>
+ </condition>
+ <!-- Only use /System/Library/Frameworks/JavaVM.framework/ if nothing under other SDK's is found -->
+ <condition property="javavmroot" value="">
+ <and>
+ <available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+ <not>
+ <isset property="javavmroot" />
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="i386"/>
+ <fileset dir="x86_64"/>
+ <fileset dir="." includes="liblwjgl.jnilib"/>
+ <fileset dir="." includes="lwjgl.symbols"/>
+ </delete>
+ </target>
+
+ <target name="compile" depends="init">
+ <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+ <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I${javavmroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx -I${javavmroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
+ <!-- Map from *.m and *.c to .o -->
+ <mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
+ <fileset dir="${native}/macosx" includes="*.m"/>
+ <fileset dir="${native}/macosx" includes="*.c"/>
+ <fileset dir="${native}/common" includes="*.c"/>
+ <fileset dir="${native}/common/opengl" includes="*.c"/>
+ <fileset dir="${native}/generated/openal" includes="*.c"/>
+ <fileset dir="${native}/generated/opencl" includes="*.c"/>
+ <fileset dir="${native}/generated/opengl" includes="*.c"/>
+ </apply>
+ </target>
+
+ <target name="link" depends="init">
+ <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+ <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F${javavmroot}/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+ <fileset dir="${objdir}" includes="*.o"/>
+ </apply>
+ <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+ <arg line="-S -X"/>
+ <fileset dir="." file="${libname}"/>
+ </apply>
+ </target>
+
+ <target name="nativelibrary" depends="init">
+ <property name="universal_sdkroot" location="${sdkroot}"/>
+ <property name="x86_64_sdkroot" location="${sdkroot}"/>
+ <property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
+ <antcall target="compile">
+ <param name="dstdir" location="i386"/>
+ <param name="compiler" value="${gcc}"/>
+ <param name="sdkroot" location="${universal_sdkroot}"/>
+ <param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
+ </antcall>
+ <antcall target="compile">
+ <param name="dstdir" location="x86_64"/>
+ <param name="compiler" value="${gcc}"/>
+ <param name="sdkroot" location="${universal_sdkroot}"/>
+ <param name="cflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+ </antcall>
+ <exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
+ <arg path="../../platform_build/macosx_ant/build-symbol-list"/>
+ <arg path="i386"/>
+ </exec>
+ <antcall target="link">
+ <param name="objdir" location="i386"/>
+ <param name="libname" value="liblwjgl-i386.jnilib"/>
+ <param name="linker" value="${gcc}"/>
+ <param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
+ </antcall>
+ <antcall target="link">
+ <param name="objdir" location="x86_64"/>
+ <param name="libname" value="liblwjgl-i86_64.jnilib"/>
+ <param name="linker" value="${gcc}"/>
+ <param name="linkerflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+ </antcall>
+ <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+ <arg value="-create"/>
+ <srcfile/>
+ <arg value="-output"/>
+ <arg path="liblwjgl.jnilib"/>
+ <fileset file="i386/liblwjgl-i386.jnilib"/>
+ <fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
+ </apply>
+ </target>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-04 20:11:10
|
Revision: 3814
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3814&view=rev
Author: kappa1
Date: 2012-11-04 20:11:03 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Tiny Clean up and remove some more references to JNF
Modified Paths:
--------------
branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-04 20:09:13 UTC (rev 3813)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-04 20:11:03 UTC (rev 3814)
@@ -3,7 +3,6 @@
<property name="native" location="../../src/native"/>
<target name="init">
- <!--mkdir dir="ppc"/-->
<mkdir dir="i386"/>
<mkdir dir="x86_64"/>
</target>
@@ -12,7 +11,6 @@
<delete failonerror="false">
<fileset dir="i386"/>
<fileset dir="x86_64"/>
- <!--fileset dir="ppc"/-->
<fileset dir="." includes="liblwjgl.jnilib"/>
<fileset dir="." includes="lwjgl.symbols"/>
</delete>
@@ -20,7 +18,7 @@
<target name="compile">
<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
+ <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx"/>
<!-- Map from *.m and *.c to .o -->
<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
<fileset dir="${native}/macosx" includes="*.m"/>
@@ -35,7 +33,7 @@
<target name="link">
<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
- <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+ <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
<fileset dir="${objdir}" includes="*.o"/>
</apply>
<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
@@ -46,17 +44,9 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
- <!--property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/-->
<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
- <!--property name="ppc_flags" value="-isysroot ${ppc_sdkroot}"/>
<antcall target="compile">
- <param name="dstdir" location="ppc"/>
- <param name="compiler" value="gcc-4.2"/>
- <param name="sdkroot" location="${ppc_sdkroot}"/>
- <param name="cflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
- </antcall-->
- <antcall target="compile">
<param name="dstdir" location="i386"/>
<param name="compiler" value="gcc-4.2"/>
<param name="sdkroot" location="${universal_sdkroot}"/>
@@ -72,17 +62,11 @@
<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
<arg path="i386"/>
</exec>
- <!--antcall target="link">
- <param name="objdir" location="ppc"/>
- <param name="libname" value="liblwjgl-ppc.jnilib"/>
- <param name="linker" value="gcc-4.2"/>
- <param name="linkerflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
- </antcall-->
<antcall target="link">
<param name="objdir" location="i386"/>
<param name="libname" value="liblwjgl-i386.jnilib"/>
<param name="linker" value="gcc-4.2"/>
- <param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.4"/>
+ <param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
</antcall>
<antcall target="link">
<param name="objdir" location="x86_64"/>
@@ -95,7 +79,6 @@
<srcfile/>
<arg value="-output"/>
<arg path="liblwjgl.jnilib"/>
- <!--fileset file="ppc/liblwjgl-ppc.jnilib"/-->
<fileset file="i386/liblwjgl-i386.jnilib"/>
<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
</apply>
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-04 20:09:13 UTC (rev 3813)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-04 20:11:03 UTC (rev 3814)
@@ -317,20 +317,19 @@
}
- (void)scrollWheel:(NSEvent *)event {
- /*JNIEnv *env = attachCurrentThread();
+ JNIEnv *env = attachCurrentThread();
if (env == nil || event == nil || _parent == nil) {
return;
}
long time = [event timestamp] * 1000000000;
- float dz = [event scrollingDeltaY];
- if (![event hasPreciseScrollingDeltas]) {
- dz *= 12; // or so
- }
- jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
- jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
- NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
- (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
- */
+ //float dz = [event scrollingDeltaY]; // An OS X 10.7+ API
+ //if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API
+ // dz *= 12; // or so
+ //}
+ //jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+ //jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+ //NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+ //(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
}
- (void)viewDidMoveToWindow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-11-04 20:09:21
|
Revision: 3813
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3813&view=rev
Author: matzon
Date: 2012-11-04 20:09:13 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
syncing www with online
Modified Paths:
--------------
trunk/LWJGL/www/changelog.php
trunk/LWJGL/www/changelogs/full-changelog.txt
trunk/LWJGL/www/credits.php
trunk/LWJGL/www/donations.php
trunk/LWJGL/www/download.php
trunk/LWJGL/www/index.php
trunk/LWJGL/www/projects.php
Added Paths:
-----------
trunk/LWJGL/www/changelogs/2.8.5-changelog.txt
Modified: trunk/LWJGL/www/changelog.php
===================================================================
--- trunk/LWJGL/www/changelog.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/changelog.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -17,7 +17,15 @@
</p>
<ul>
<li><a href="http://www.lwjgl.org/changelogs/full-changelog.txt" target="_blank">Full changelog</a></li>
- <li><a href="#2.6">LWJGL 2.6</a></li>
+ <li><a href="#2.8.4">LWJGL 2.8.5</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.8.4-changelog.txt" target="_blank">LWJGL 2.8.4</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.8.3-changelog.txt" target="_blank">LWJGL 2.8.3</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.8.2-changelog.txt" target="_blank">LWJGL 2.8.2</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.8.1-changelog.txt" target="_blank">LWJGL 2.8.1</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.8.0-changelog.txt" target="_blank">LWJGL 2.8.0</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.7.1-changelog.txt" target="_blank">LWJGL 2.7.1</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.7-changelog.txt" target="_blank">LWJGL 2.7</a></li>
+ <li><a href="http://www.lwjgl.org/changelogs/2.6-changelog.txt" target="_blank">LWJGL 2.6</a></li>
<li><a href="http://www.lwjgl.org/changelogs/2.5-changelog.txt" target="_blank">LWJGL 2.5</a></li>
<li><a href="http://www.lwjgl.org/changelogs/2.4.2-changelog.txt" target="_blank">LWJGL 2.4.2</a></li>
<li><a href="http://www.lwjgl.org/changelogs/2.4.1-changelog.txt" target="_blank">LWJGL 2.4.1</a></li>
@@ -63,6 +71,6 @@
</ul>
<?
-displayChangelog('2.6');
+displayChangelog('2.8.5');
require('_include/footer.php');
?>
Added: trunk/LWJGL/www/changelogs/2.8.5-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/2.8.5-changelog.txt (rev 0)
+++ trunk/LWJGL/www/changelogs/2.8.5-changelog.txt 2012-11-04 20:09:13 UTC (rev 3813)
@@ -0,0 +1,313 @@
+2012-10-16 14:53 spasi
+
+ * platform_build/build-definitions.xml,
+ src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java,
+ src/templates/org/lwjgl/opengl/INTEL_map_texture.java,
+ src/templates/org/lwjgl/opengl/NV_draw_texture.java,
+ src/templates/org/lwjgl/opengles/NV_draw_texture.java: Added
+ support for AMD_shader_trinary_minmax, INTEL_map_texture and
+ NV_draw_texture.
+
+2012-09-30 09:48 spasi
+
+ * src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java:
+ Added support for EXT_multiview_draw_buffers. [GLES]
+
+2012-09-29 11:48 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_sparse_texture.java: Added
+ support for AMD_sparse_texture.
+
+2012-09-21 00:27 spasi
+
+ * src/templates/org/lwjgl/opengles/APPLE_sync.java,
+ src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java,
+ src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java,
+ src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java:
+ Added new GLES extensions.
+
+2012-09-12 21:00 kappa1
+
+ * src/java/org/lwjgl/opengl/Sync.java: Set a name for LWJGL's Sync
+ class timer accuracy thread ("LWJGL Timer") for debugging
+ purposes. RFE by NateS.
+
+2012-09-12 11:29 kappa1
+
+ * src/java/org/lwjgl/util/vector/Matrix2f.java,
+ src/java/org/lwjgl/util/vector/Matrix3f.java,
+ src/java/org/lwjgl/util/vector/Matrix4f.java: Fix
+ Matrix*f.negate(Matrix*f dest) methods in Matrix2f, Matrix3f and
+ Matrix4f classes. Thx to Jegorex for finding, reporting and
+ providing fix on forum.
+
+2012-09-10 07:51 spasi
+
+ * src/java/org/lwjgl/input/Keyboard.java: Changed keyName array
+ size to match KEYBOARD_SIZE.
+
+2012-09-06 07:11 spasi
+
+ * src/java/org/lwjgl/opengl/GLContext.java: Made
+ GLContext.getCapabilities throw a RuntimeException instead of
+ returning null when there's no GL context current in the current
+ thread.
+
+2012-09-05 22:37 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+ Fix NumberFormatException when parsing version string on an EA or
+ beta JVM, thx to UltraMoogleMan for spotting and reporting
+
+2012-09-03 20:44 spasi
+
+ * src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java:
+ Fixed test.
+
+2012-09-03 20:27 spasi
+
+ * src/templates/org/lwjgl/opengl/GL32.java: Removed GL_BGRA.
+
+2012-09-03 19:47 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_rg.java,
+ src/templates/org/lwjgl/opengl/ARB_vertex_shader.java,
+ src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+ src/templates/org/lwjgl/opengles/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengles/OES_texture_float.java: Removed
+ some re-defined GL11 enums.
+
+2012-08-28 09:06 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java: Translate
+ extended keys before the state check.
+
+2012-08-23 14:20 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+ src/java/org/lwjgl/test/input/KeyboardTest.java: Let repeat
+ events pass the same-state filter.
+
+2012-08-23 12:38 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java: Filter TAB key up
+ event when we alt-tab focus the Display.
+
+2012-08-23 10:36 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java,
+ src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+ src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c: Attempt to
+ fix lost key up events when Display is out of focus. (Windows)
+
+2012-08-19 06:56 spasi
+
+ * src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java,
+ src/java/org/lwjgl/util/generator/Reuse.java,
+ src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+ src/templates/org/lwjgl/opengl/ARB_program.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengl/GL20.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL31.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL33.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/NV_program.java,
+ src/templates/org/lwjgl/opengles/GLES20.java,
+ src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+ Restored (most of) the removed methods from the previous commit
+ and added deprecation warnings.
+
+2012-08-18 14:00 spasi
+
+ * src/java/org/lwjgl/opengl/GLChecks.java,
+ src/java/org/lwjgl/opengles/GLChecks.java,
+ src/java/org/lwjgl/test/opengl/SyncTest.java,
+ src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java,
+ src/java/org/lwjgl/test/opengles/util/Shader.java,
+ src/java/org/lwjgl/test/opengles/util/ShaderProgram.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java: Fixes related to
+ the new alternate signatures.
+
+2012-08-18 11:46 spasi
+
+ * src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java,
+ src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+ src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+ src/templates/org/lwjgl/opengl/ARB_program.java,
+ src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_timer_query.java,
+ src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java,
+ src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengl/GL20.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL31.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL33.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/GL41.java,
+ src/templates/org/lwjgl/opengl/GL43.java,
+ src/templates/org/lwjgl/opengl/NV_present_video.java,
+ src/templates/org/lwjgl/opengl/NV_program.java,
+ src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java,
+ src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java,
+ src/templates/org/lwjgl/opengl/NV_video_capture.java,
+ src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+ src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengles/GLES20.java,
+ src/templates/org/lwjgl/opengles/GLES30.java,
+ src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+ Keep type postfix on alternative functions that return primitive
+ values.
+
+2012-08-16 18:58 spasi
+
+ * src/java/org/lwjgl/MemoryUtil.java,
+ src/java/org/lwjgl/openal/ALC10.java,
+ src/native/common/org_lwjgl_openal_ALC10.c,
+ src/templates/org/lwjgl/opengl/NV_compute_program5.java,
+ src/templates/org/lwjgl/opengl/NV_deep_texture3D.java,
+ src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java,
+ src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java,
+ src/templates/org/lwjgl/opengles/QCOM_binning_control.java:
+ Changed ALC10's alcGetString and alcOpenDevice to use UTF8
+ decoding/encoding.
+ New GL extensions: NV_compute_program5,
+ NV_shader_storage_buffer_object, NV_shader_atomic_counters,
+ NV_deep_texture3D
+ New GLES extension: QCOM_binning_control
+
+2012-08-14 12:53 spasi
+
+ * src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_output2.java: Removed
+ ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're
+ part of KHR_debug and weren't supposed to be posted in the GL
+ registry.
+
+2012-08-07 15:14 spasi
+
+ * build.xml, platform_build/build-definitions.xml,
+ platform_build/build-generator.xml,
+ src/java/org/lwjgl/opengl/CallbackUtil.java,
+ src/java/org/lwjgl/opengl/ContextAttribs.java,
+ src/java/org/lwjgl/opengl/KHRDebugCallback.java,
+ src/java/org/lwjgl/opengles/APIUtil.java,
+ src/java/org/lwjgl/opengles/CallbackUtil.java,
+ src/java/org/lwjgl/opengles/ContextAttribs.java,
+ src/java/org/lwjgl/opengles/FastIntMap.java,
+ src/java/org/lwjgl/opengles/GLChecks.java,
+ src/java/org/lwjgl/opengles/GLContext.java,
+ src/java/org/lwjgl/opengles/GLSync.java,
+ src/java/org/lwjgl/opengles/KHRDebugCallback.java,
+ src/java/org/lwjgl/opengles/StateTracker.java,
+ src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java,
+ src/java/org/lwjgl/util/generator/GeneratorVisitor.java,
+ src/java/org/lwjgl/util/generator/NativeTypeTranslator.java,
+ src/java/org/lwjgl/util/generator/SignatureTranslator.java,
+ src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java,
+ src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java,
+ src/native/common/opengl/extgl.h,
+ src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c,
+ src/native/common/opengles/extgl.h,
+ src/native/common/opengles/extgl_types.h,
+ src/native/common/opengles/org_lwjgl_opengles_CallbackUtil.c,
+ src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+ src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_ES3_compatibility.java,
+ src/templates/org/lwjgl/opengl/ARB_arrays_of_arrays.java,
+ src/templates/org/lwjgl/opengl/ARB_clear_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_compute_shader.java,
+ src/templates/org/lwjgl/opengl/ARB_copy_image.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_output2.java,
+ src/templates/org/lwjgl/opengl/ARB_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_explicit_uniform_location.java,
+ src/templates/org/lwjgl/opengl/ARB_fragment_layer_viewport.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+ src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+ src/templates/org/lwjgl/opengl/ARB_invalidate_subdata.java,
+ src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+ src/templates/org/lwjgl/opengl/ARB_robust_buffer_access_behavior.java,
+ src/templates/org/lwjgl/opengl/ARB_robustness_isolation.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_image_size.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_storage_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_stencil_texturing.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_buffer_range.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_query_levels.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_storage_multisample.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_view.java,
+ src/templates/org/lwjgl/opengl/ARB_vertex_attrib_binding.java,
+ src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/GL43.java,
+ src/templates/org/lwjgl/opengl/KHR_debug.java,
+ src/templates/org/lwjgl/opengl/KHR_texture_compression_astc_ldr.java,
+ src/templates/org/lwjgl/opengles/GLES30.java,
+ src/templates/org/lwjgl/opengles/KHR_debug.java,
+ src/templates/org/lwjgl/opengles/KHR_texture_compression_astc_ldr.java,
+ src/templates/org/lwjgl/opengles/OES_required_internalformat.java,
+ src/templates/org/lwjgl/opengles/OES_surfaceless_context.java:
+ Added support for OpenGL 4.3 and OpenGL ES 3.0.
+ Modified the generator process to use relative paths. We were
+ hitting the command line length limit on Windows.
+ Some extension improvements, fixes and spec updates.
+
+2012-07-14 23:29 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java,
+ src/native/windows/org_lwjgl_opengl_Display.c: fixed issue with
+ win32 get x/y returning client-area coords
+
+2012-06-29 10:25 spasi
+
+ * src/templates/org/lwjgl/opengl/NV_path_rendering.java: Removed
+ @Constant("0") from pathBase parameters.
+
+2012-06-19 10:44 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java,
+ src/templates/org/lwjgl/opengl/GL30.java: Removed unnecessary
+ GL_RED from GL30.
+ Added AMD_query_buffer_object.
+
+2012-06-17 20:54 matzon
+
+ * libs/linux/libopenal.so, libs/linux/libopenal64.so,
+ libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+ libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: pushing
+ latest openal (785f52aa29d...) with fix for float32
+
+2012-06-03 19:07 matzon
+
+ * platform_build/build-definitions.xml,
+ src/java/org/lwjgl/Sys.java, www/changelogs/2.8.4-changelog.txt,
+ www/changelogs/full-changelog.txt: bumping to 2.8.5, adding
+ changelogs
\ No newline at end of file
Modified: trunk/LWJGL/www/changelogs/full-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/full-changelog.txt 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/changelogs/full-changelog.txt 2012-11-04 20:09:13 UTC (rev 3813)
@@ -1,3 +1,317 @@
+2012-10-16 14:53 spasi
+
+ * platform_build/build-definitions.xml,
+ src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java,
+ src/templates/org/lwjgl/opengl/INTEL_map_texture.java,
+ src/templates/org/lwjgl/opengl/NV_draw_texture.java,
+ src/templates/org/lwjgl/opengles/NV_draw_texture.java: Added
+ support for AMD_shader_trinary_minmax, INTEL_map_texture and
+ NV_draw_texture.
+
+2012-09-30 09:48 spasi
+
+ * src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java:
+ Added support for EXT_multiview_draw_buffers. [GLES]
+
+2012-09-29 11:48 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_sparse_texture.java: Added
+ support for AMD_sparse_texture.
+
+2012-09-21 00:27 spasi
+
+ * src/templates/org/lwjgl/opengles/APPLE_sync.java,
+ src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java,
+ src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java,
+ src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java:
+ Added new GLES extensions.
+
+2012-09-12 21:00 kappa1
+
+ * src/java/org/lwjgl/opengl/Sync.java: Set a name for LWJGL's Sync
+ class timer accuracy thread ("LWJGL Timer") for debugging
+ purposes. RFE by NateS.
+
+2012-09-12 11:29 kappa1
+
+ * src/java/org/lwjgl/util/vector/Matrix2f.java,
+ src/java/org/lwjgl/util/vector/Matrix3f.java,
+ src/java/org/lwjgl/util/vector/Matrix4f.java: Fix
+ Matrix*f.negate(Matrix*f dest) methods in Matrix2f, Matrix3f and
+ Matrix4f classes. Thx to Jegorex for finding, reporting and
+ providing fix on forum.
+
+2012-09-10 07:51 spasi
+
+ * src/java/org/lwjgl/input/Keyboard.java: Changed keyName array
+ size to match KEYBOARD_SIZE.
+
+2012-09-06 07:11 spasi
+
+ * src/java/org/lwjgl/opengl/GLContext.java: Made
+ GLContext.getCapabilities throw a RuntimeException instead of
+ returning null when there's no GL context current in the current
+ thread.
+
+2012-09-05 22:37 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+ Fix NumberFormatException when parsing version string on an EA or
+ beta JVM, thx to UltraMoogleMan for spotting and reporting
+
+2012-09-03 20:44 spasi
+
+ * src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java:
+ Fixed test.
+
+2012-09-03 20:27 spasi
+
+ * src/templates/org/lwjgl/opengl/GL32.java: Removed GL_BGRA.
+
+2012-09-03 19:47 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_rg.java,
+ src/templates/org/lwjgl/opengl/ARB_vertex_shader.java,
+ src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+ src/templates/org/lwjgl/opengles/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengles/OES_texture_float.java: Removed
+ some re-defined GL11 enums.
+
+2012-08-28 09:06 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java: Translate
+ extended keys before the state check.
+
+2012-08-23 14:20 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+ src/java/org/lwjgl/test/input/KeyboardTest.java: Let repeat
+ events pass the same-state filter.
+
+2012-08-23 12:38 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsKeyboard.java: Filter TAB key up
+ event when we alt-tab focus the Display.
+
+2012-08-23 10:36 spasi
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java,
+ src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+ src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c: Attempt to
+ fix lost key up events when Display is out of focus. (Windows)
+
+2012-08-19 06:56 spasi
+
+ * src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java,
+ src/java/org/lwjgl/util/generator/Reuse.java,
+ src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+ src/templates/org/lwjgl/opengl/ARB_program.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengl/GL20.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL31.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL33.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/NV_program.java,
+ src/templates/org/lwjgl/opengles/GLES20.java,
+ src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+ Restored (most of) the removed methods from the previous commit
+ and added deprecation warnings.
+
+2012-08-18 14:00 spasi
+
+ * src/java/org/lwjgl/opengl/GLChecks.java,
+ src/java/org/lwjgl/opengles/GLChecks.java,
+ src/java/org/lwjgl/test/opengl/SyncTest.java,
+ src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java,
+ src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java,
+ src/java/org/lwjgl/test/opengles/util/Shader.java,
+ src/java/org/lwjgl/test/opengles/util/ShaderProgram.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java: Fixes related to
+ the new alternate signatures.
+
+2012-08-18 11:46 spasi
+
+ * src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java,
+ src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+ src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+ src/templates/org/lwjgl/opengl/ARB_program.java,
+ src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_timer_query.java,
+ src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java,
+ src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengl/GL20.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL31.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL33.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/GL41.java,
+ src/templates/org/lwjgl/opengl/GL43.java,
+ src/templates/org/lwjgl/opengl/NV_present_video.java,
+ src/templates/org/lwjgl/opengl/NV_program.java,
+ src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java,
+ src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java,
+ src/templates/org/lwjgl/opengl/NV_video_capture.java,
+ src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+ src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengles/GLES20.java,
+ src/templates/org/lwjgl/opengles/GLES30.java,
+ src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+ Keep type postfix on alternative functions that return primitive
+ values.
+
+2012-08-16 18:58 spasi
+
+ * src/java/org/lwjgl/MemoryUtil.java,
+ src/java/org/lwjgl/openal/ALC10.java,
+ src/native/common/org_lwjgl_openal_ALC10.c,
+ src/templates/org/lwjgl/opengl/NV_compute_program5.java,
+ src/templates/org/lwjgl/opengl/NV_deep_texture3D.java,
+ src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java,
+ src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java,
+ src/templates/org/lwjgl/opengles/QCOM_binning_control.java:
+ Changed ALC10's alcGetString and alcOpenDevice to use UTF8
+ decoding/encoding.
+ New GL extensions: NV_compute_program5,
+ NV_shader_storage_buffer_object, NV_shader_atomic_counters,
+ NV_deep_texture3D
+ New GLES extension: QCOM_binning_control
+
+2012-08-14 12:53 spasi
+
+ * src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_output2.java: Removed
+ ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're
+ part of KHR_debug and weren't supposed to be posted in the GL
+ registry.
+
+2012-08-07 15:14 spasi
+
+ * build.xml, platform_build/build-definitions.xml,
+ platform_build/build-generator.xml,
+ src/java/org/lwjgl/opengl/CallbackUtil.java,
+ src/java/org/lwjgl/opengl/ContextAttribs.java,
+ src/java/org/lwjgl/opengl/KHRDebugCallback.java,
+ src/java/org/lwjgl/opengles/APIUtil.java,
+ src/java/org/lwjgl/opengles/CallbackUtil.java,
+ src/java/org/lwjgl/opengles/ContextAttribs.java,
+ src/java/org/lwjgl/opengles/FastIntMap.java,
+ src/java/org/lwjgl/opengles/GLChecks.java,
+ src/java/org/lwjgl/opengles/GLContext.java,
+ src/java/org/lwjgl/opengles/GLSync.java,
+ src/java/org/lwjgl/opengles/KHRDebugCallback.java,
+ src/java/org/lwjgl/opengles/StateTracker.java,
+ src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java,
+ src/java/org/lwjgl/util/generator/GeneratorVisitor.java,
+ src/java/org/lwjgl/util/generator/NativeTypeTranslator.java,
+ src/java/org/lwjgl/util/generator/SignatureTranslator.java,
+ src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java,
+ src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java,
+ src/native/common/opengl/extgl.h,
+ src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c,
+ src/native/common/opengles/extgl.h,
+ src/native/common/opengles/extgl_types.h,
+ src/native/common/opengles/org_lwjgl_opengles_CallbackUtil.c,
+ src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+ src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_ES3_compatibility.java,
+ src/templates/org/lwjgl/opengl/ARB_arrays_of_arrays.java,
+ src/templates/org/lwjgl/opengl/ARB_clear_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_compute_shader.java,
+ src/templates/org/lwjgl/opengl/ARB_copy_image.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+ src/templates/org/lwjgl/opengl/ARB_debug_output2.java,
+ src/templates/org/lwjgl/opengl/ARB_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_explicit_uniform_location.java,
+ src/templates/org/lwjgl/opengl/ARB_fragment_layer_viewport.java,
+ src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+ src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+ src/templates/org/lwjgl/opengl/ARB_invalidate_subdata.java,
+ src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java,
+ src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+ src/templates/org/lwjgl/opengl/ARB_robust_buffer_access_behavior.java,
+ src/templates/org/lwjgl/opengl/ARB_robustness_isolation.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_image_size.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_storage_buffer_object.java,
+ src/templates/org/lwjgl/opengl/ARB_stencil_texturing.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_buffer_range.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_query_levels.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_storage_multisample.java,
+ src/templates/org/lwjgl/opengl/ARB_texture_view.java,
+ src/templates/org/lwjgl/opengl/ARB_vertex_attrib_binding.java,
+ src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+ src/templates/org/lwjgl/opengl/GL30.java,
+ src/templates/org/lwjgl/opengl/GL32.java,
+ src/templates/org/lwjgl/opengl/GL40.java,
+ src/templates/org/lwjgl/opengl/GL43.java,
+ src/templates/org/lwjgl/opengl/KHR_debug.java,
+ src/templates/org/lwjgl/opengl/KHR_texture_compression_astc_ldr.java,
+ src/templates/org/lwjgl/opengles/GLES30.java,
+ src/templates/org/lwjgl/opengles/KHR_debug.java,
+ src/templates/org/lwjgl/opengles/KHR_texture_compression_astc_ldr.java,
+ src/templates/org/lwjgl/opengles/OES_required_internalformat.java,
+ src/templates/org/lwjgl/opengles/OES_surfaceless_context.java:
+ Added support for OpenGL 4.3 and OpenGL ES 3.0.
+ Modified the generator process to use relative paths. We were
+ hitting the command line length limit on Windows.
+ Some extension improvements, fixes and spec updates.
+
+2012-07-14 23:29 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java,
+ src/native/windows/org_lwjgl_opengl_Display.c: fixed issue with
+ win32 get x/y returning client-area coords
+
+2012-06-29 10:25 spasi
+
+ * src/templates/org/lwjgl/opengl/NV_path_rendering.java: Removed
+ @Constant("0") from pathBase parameters.
+
+2012-06-19 10:44 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java,
+ src/templates/org/lwjgl/opengl/GL30.java: Removed unnecessary
+ GL_RED from GL30.
+ Added AMD_query_buffer_object.
+
+2012-06-17 20:54 matzon
+
+ * libs/linux/libopenal.so, libs/linux/libopenal64.so,
+ libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+ libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: pushing
+ latest openal (785f52aa29d...) with fix for float32
+
+2012-06-03 19:07 matzon
+
+ * platform_build/build-definitions.xml,
+ src/java/org/lwjgl/Sys.java, www/changelogs/2.8.4-changelog.txt,
+ www/changelogs/full-changelog.txt: bumping to 2.8.5, adding
+ changelogs
+
2012-05-21 20:39 kappa1
* libs/macosx/openal.dylib: Add OpenAL-Soft 1.14 for OS X
Modified: trunk/LWJGL/www/credits.php
===================================================================
--- trunk/LWJGL/www/credits.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/credits.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -22,8 +22,8 @@
<li>Simon Felix</li>
<li>Ryan McNally</li>
<li>Ciardhubh</li>
- <li>Pelle Johnsen</li>
- <li>Jae Kwon</li>
+ <li>Jens von Pilgrim</li>
+ <li>Ruben Garat</li>
</ul>
<p>
<b>Additional credits goes to</b>
@@ -32,6 +32,7 @@
<li>Joseph I. Valenzuela [OpenAL stuff]</li>
<li>Lev Povalahev [OpenGL extensions]</li>
<li>Daniel Leinich [Website design & implementation]</li>
+ <li>Endolf [Nightly builds and JInput]</li>
</ul>
<? require('_include/footer.php'); ?>
Modified: trunk/LWJGL/www/donations.php
===================================================================
--- trunk/LWJGL/www/donations.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/donations.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -14,12 +14,15 @@
<ul>
<?
$donations[] = array("Andreas Wallberg");
+ $donations[] = array("Andreas Wiesbauer");
$donations[] = array("Andrew Kelly");
$donations[] = array("Anthony Lovell");
$donations[] = array("Anthony Rogers");
$donations[] = array("Apostolos Tsakpinis");
$donations[] = array("Aviram Preshel");
- $donations[] = array("Benjamin Bingham");
+ $donations[] = array("Bart Blokland");
+ $donations[] = array("Benjamin Behrendt");
+ $donations[] = array("Benjamin Bingham");
$donations[] = array("Benoit Hambucken");
$donations[] = array("Bernardo Ratto");
$donations[] = array("Brian Matzon");
@@ -34,38 +37,49 @@
$donations[] = array("Ewald Kicker");
$donations[] = array("Filippo Cortigiani");
$donations[] = array("Florian Priester");
+ $donations[] = array("Florian Sievert");
$donations[] = array("Franz Bartlechner - multiple donations");
$donations[] = array("Gavia");
$donations[] = array("Gregory Pierce");
$donations[] = array("Ivan Lazarte");
+ $donations[] = array("Jens Hohmuth");
$donations[] = array("Jesse Pavel");
$donations[] = array("John Watson");
$donations[] = array("John Yates");
+ $donations[] = array("Jonathan Lermitage");
$donations[] = array("J\xF6rg Jungh\xE4nel");
+ $donations[] = array("Lars Petter Mathiassen");
$donations[] = array("Marc Sachse");
+ $donations[] = array("Martin Gruscher");
$donations[] = array("Michael Lundstr\xF6m");
$donations[] = array("Mojang Specifications");
$donations[] = array("Nathan Sweet");
$donations[] = array("Oliver Due Billing");
$donations[] = array("Paul Koch");
$donations[] = array("Per Nyblom");
+ $donations[] = array("Peter Faber");
$donations[] = array("Peter Koeleman");
+ $donations[] = array("Peter Leikauf");
+ $donations[] = array("Rob Mayhew");
$donations[] = array("Ruben Steins");
$donations[] = array("SEO Company");
$donations[] = array("Scott Palmer");
$donations[] = array("Shane Essary");
$donations[] = array("Shannon Smith");
$donations[] = array("Sharp Production");
+ $donations[] = array("Simon Felix");
$donations[] = array("So-Woo Lee");
$donations[] = array("Steve Klouvi");
$donations[] = array("Thomas Schuster");
- $donations[] = array("Tiana Bruno Rakotoarimanana");
+ $donations[] = array("Thomas Trocha");
+ $donations[] = array("Tiana Bruno Rakotoarimanana - multiple donations");
$donations[] = array("Tobias Fritz");
$donations[] = array("Tomas Andrle - multiple donations");
$donations[] = array("Tonny Espeset");
$donations[] = array("Yinglai Yang");
- $donations[] = array("Andreas Wiesbauer");
+ $donations[] = array("Jesse Krebs");
+
shuffle($donations);
foreach($donations as $key => $value) {
Modified: trunk/LWJGL/www/download.php
===================================================================
--- trunk/LWJGL/www/download.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/download.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -2,12 +2,13 @@
<h1>Download</h1>
<p>
- Latest stable release is 2.6 Please download it here:<br/>
- <a href="https://sourceforge.net/projects/java-game-lib/files/Official%20Releases/LWJGL%202.6/" target="_blank">LWJGL 2.6</a>
+ Latest stable release is 2.8.5 Please download it here:<br/>
+ <a href="https://sourceforge.net/projects/java-game-lib/files/Official%20Releases/LWJGL%202.8.5/" target="_blank">LWJGL 2.8.5</a>
</p>
<p>
Nightly builds:<br/>
- <a href="https://www.newdawnsoftware.com/hudson/view/LWJGL/" target="_blank">https://www.newdawnsoftware.com/hudson/view/LWJGL/</a>
+ <a href="http://www.newdawnsoftware.com/hudson/view/LWJGL/" target="_blank">http://www.newdawnsoftware.com/hudson/view/LWJGL/</a>
</p>
+<p> Maven:<br/>Since version 2.8.0, LWJGL has been available in the central Maven repository. Seem more here: <a href="http://www.lwjgl.org/wiki/index.php?title=LWJGL_use_in_Maven" target="_blank">http://www.lwjgl.org/wiki/index.php?title=LWJGL_use_in_Maven</a>
<? require('_include/footer.php'); ?>
Modified: trunk/LWJGL/www/index.php
===================================================================
--- trunk/LWJGL/www/index.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/index.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -1,43 +1,55 @@
<? require('_include/header.php'); ?>
<h1>Introduction</h1>
-<p>The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable <a href="projects.php">commercial quality games</a> to be written in Java. LWJGL provides developers access to high performance crossplatform libraries such as OpenGL (<a href="http://www.opengl.org/" target="_blank">Open Graphics Library</a>) and OpenAL (<a href="http://www.openal.org" target="_blank">Open Audio Library</a>) allowing for state of the art 3D games and 3D sound. Additionally LWJGL provides access to controllers such as Gamepads, Steering wheel and Joysticks. All in a simple and straight forward API.</p>
+<p>The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable <a href="projects.php">commercial quality games</a> to be written in Java. LWJGL provides developers access to high performance crossplatform libraries such as OpenGL (<a href="http://www.opengl.org/" target="_blank">Open Graphics Library</a>), OpenCL (<a href="http://www.khronos.org/opencl/" target="_blank">Open Computing Language</a>) and OpenAL (<a href="http://www.openal.org" target="_blank">Open Audio Library</a>) allowing for state of the art 3D games and 3D sound. Additionally LWJGL provides access to controllers such as Gamepads, Steering wheel and Joysticks. All in a simple and straight forward API.</p>
<p>LWJGL is not meant to make writing games particularly easy; it is primarily an enabling technology which allows developers to get at resources that are simply otherwise unavailable or poorly implemented on the existing <a href="http://java.sun.com" target="_blank">Java platform</a>. We anticipate that the LWJGL will, through evolution and extension, become the foundation for more complete game libraries and "game engines" as they have popularly become known, and hide some of the new evils we have had to expose in the APIs.</p>
<p>LWJGL is available under a <a href="license.php">BSD license</a>, which means it's open source and freely available at no charge.</p>
<p>Please visit us on the Freenode IRC Network: <a href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle if there is no one to answer any of your questions, we are on different timezones.</p>
<h1>News</h1>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.6</b> <span class="newsdate">Monday, October 18th, 2010</span><br/>
- On top of the world again! - fresh out with a new 2.6 build which includes lots of fixes and new stuff - including OpenCL support!<br/>
- Please check <a href="/forum/index.php?topic=3512">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.5</b> <span class="newsdate">Sunday, November 4th, 2012</span><br/>
+ It's that time again. You know the drill!
+ Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4608">this thread</a> for more info regarding the release.<br/><br/>
</p>
+
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.5</b> <span class="newsdate">Friday, July 16th, 2010</span><br/>
- To hot outside? - get inside, switch on the AC unit - and start hacking away with the latest LWJGL release.<br/>
- Please check <a href="/forum/index.php?topic=3398">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.4</b> <span class="newsdate">Sunday, June 3rd, 2012</span><br/>
+ Summer! - time for a new release! Now you have an excuse for staying inside from that pesky sun and code all day long ;)
+ Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4798">this thread</a> for more info regarding the release.<br/><br/>
</p>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.4</b> <span class="newsdate">Sunday, April 11th, 2010</span><br/>
- New release with a ton of fixes and support for OpenGL 3.3 and 4.0<br/>
- Please check <a href=/forum/index.php?topic=3302">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.3</b> <span class="newsdate">Monday, January 23rd, 2012</span><br/>
+ First release in the new year. New OpenGL and OpenCL additions as well as some important MacOSX fixes. Please update ASAP.
+ Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4409">this thread</a> for more info regarding the release.<br/><br/>
</p>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.3</b> <span class="newsdate">Sunday, February 21st, 2010</span><br/>
- Important release that fixes issues with ATI 10.x drivers. Consider upgrading ASAP.<br/>
- Please check <a href="/forum/index.php?topic=3212">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.2</b> <span class="newsdate">Sunday, November 13th, 2011</span><br/>
+ Bugfix release + some minor features. Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4288">this thread</a> for more info regarding the release.<br/><br/>
</p>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.2.2</b> <span class="newsdate">Tuesday, January 26th, 2010</span><br/>
- First release in the new year. Mostly bugfixes.<br/>
- Please check <a href="/forum/index.php?topic=3183">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.1</b> <span class="newsdate">Saturday, October 15th, 2011</span><br/>
+ Bugfix release + some minor features. Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4242">this thread</a> for more info regarding the release.<br/><br/>
</p>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.2.1</b> <span class="newsdate">Sunday, November 15th, 2009</span><br/>
- Please check <a href="/forum/index.php?topic=3111">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.8.0</b> <span class="newsdate">Sunday, October 9th, 2011</span><br/>
+ Finally a new release! This is a pretty big update with a slew of new features as well of bug fixes. Get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=4222">this thread</a> for more info regarding the release.<br/><br/>
</p>
<p style="border-bottom: 1px solid #cccccc;">
- <b>LWJGL 2.1.0</b> <span class="newsdate">Monday, March 23rd, 2009</span><br/>
- Please check <a href="/forum/index.php?topic=2856">this thread</a> for more info regarding the release.<br/><br/>
+ <b>LWJGL 2.7.1</b> <span class="newsdate">Thursday, February 10th, 2011</span><br/>
+ Minor update. Updated OpenAL-Soft libraries to fix an msvrt90.dll dependency - get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=3741">this thread</a> for more info regarding the release.<br/><br/>
</p>
+<p style="border-bottom: 1px solid #cccccc;">
+ <b>LWJGL 2.7</b> <span class="newsdate">Monday, February 7th, 2011</span><br/>
+ 2.7 has just been hatched - get it at the <a href="download.php">usual location</a><br/>
+ Please check <a href="/forum/index.php?topic=3741">this thread</a> for more info regarding the release.<br/><br/>
+</p>
+
<? require('_include/footer.php'); ?>
Modified: trunk/LWJGL/www/projects.php
===================================================================
--- trunk/LWJGL/www/projects.php 2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/projects.php 2012-11-04 20:09:13 UTC (rev 3813)
@@ -110,6 +110,18 @@
'big' => 'cultris_2.jpg'),
2 => array('small' => 'cultris_small_3.jpg',
'big' => 'cultris_3.jpg')));
+
+$projects[] = array('name' => 'Cultris II',
+ 'url' => 'http://gewaltig.net',
+ 'type' => 'Free game',
+ 'desc' => 'Cultris II is one of the fastest Tetris®-clones ever! Train your reflexes in the single player challenge modes, enjoy a split-screen match with your friends or play over the Internet with the best of the best. Cultris II not only supports various game modes, but all of them with team-play. The exquisite graphics and stylish jungle music makes other clones strike with awe. This is not your grandmother\x92s Tetris® anymore...',
+ 'screens' => array(0 => array('small' => 'cultris2_small_1.gif',
+ 'big' => 'cultris2_1.png'),
+ 1 => array('small' => 'cultris2_small_2.gif',
+ 'big' => 'cultris2_2.png'),
+ 2 => array('small' => 'cultris2_small_3.gif',
+ 'big' => 'cultris2_3.png')));
+
$projects[] = array('name' => 'Keith Goes Painting',
'url' => 'http://www.wolfysgames.com/',
@@ -262,21 +274,21 @@
'small' => 'hz_small_3.jpg',
'big' => 'hz_3.jpg')));
-$projects[] = array(
- 'name' => 'Diamond Crush',
- 'url' => 'http://www.diamondcrush.net/',
- 'type' => 'Free, open source game',
- 'desc' => 'Diamond Crush is a classic puzzle game, with both single player and multiplayer game modes. Players will control falling pairs of differently colored and shaped gems, and their purpose will be strategically placing them inside their own grid-based play fields, by matching their colors.',
- 'screens' => array(
- 0 => array(
- 'small' => 'diamond_crush_small_1.jpg',
- 'big' => 'diamond_crush_1.jpg'),
- 1 => array(
- 'small' => 'diamond_crush_small_2.jpg',
- 'big' => 'diamond_crush_2.jpg'),
- 2 => array(
- 'small' => 'diamond_crush_small_3.jpg',
- 'big' => 'diamond_crush_3.jpg')));
+//$projects[] = array(
+// 'name' => 'Diamond Crush',
+// 'url' => 'http://www.diamondcrush.net/',
+// 'type' => 'Free, open source game',
+// 'desc' => 'Diamond Crush is a classic puzzle game, with both single player and multiplayer game modes. Players will control falling pairs of differently colored and shaped gems, and their purpose will be strategically placing them inside their own grid-based play fields, by matching their colors.',
+// 'screens' => array(
+// 0 => array(
+// 'small' => 'diamond_crush_small_1.jpg',
+// 'big' => 'diamond_crush_1.jpg'),
+// 1 => array(
+// 'small' => 'diamond_crush_small_2.jpg',
+// 'big' => 'diamond_crush_2.jpg'),
+// 2 => array(
+// 'small' => 'diamond_crush_small_3.jpg',
+// 'big' => 'diamond_crush_3.jpg')));
$projects[] = array(
'name' => 'Slam Soccer 2006',
@@ -629,6 +641,102 @@
2 => array(
'small' => 'grappling_hook_small_3.jpg',
'big' => 'grappling_hook_3.jpg')));
+
+$projects[] = array(
+ 'name' => 'TWL',
+ 'url' => 'http://twl.l33tlabs.org/',
+ 'type' => 'OpenGL UI library',
+ 'desc' => 'TWL is a graphical user interface library targeted at games and game editors. It provides a rich set of standard widgets including labels, edit fields, tables, popups, tooltips, frames and a lot more. Different layout container are available to create even the most advanced user interfaces. As games have a high demand on visual identity, TWL provides a very flexible theme manager. The theme manager decouples the visual representation of widgets from the code. Themes are specified in XML and PNG files with full alpha blending for effects such as glow or shadows.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'twl_small_1.jpg',
+ 'big' => 'twl_1.png'),
+ 1 => array(
+ 'small' => 'twl_small_2.jpg',
+ 'big' => 'twl_2.png'),
+ 2 => array(
+ 'small' => 'twl_small_3.jpg',
+ 'big' => 'twl_3.png')));
+
+$projects[] = array(
+ 'name' => 'Starfarer',
+ 'url' => 'http://fractalsoftworks.com',
+ 'type' => 'Commercial game',
+ 'desc' => 'Two hundred years ago, the galaxy was ravaged by war. The story of Starfarer concerns a sector left largely untouched by the flames. Humanity has been slowly slipping into anarchy, and few outposts of civilization remain - it is a time of frequent conflict, rampant piracy and shifting allegiances. A time of great profit for the few traders able to ply the old trading routes. A time of great danger and greater opportunity.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'starfarer_small_1.jpg',
+ 'big' => 'starfarer_1.jpg'),
+ 1 => array(
+ 'small' => 'starfarer_small_2.jpg',
+ 'big' => 'starfarer_2.jpg'),
+ 2 => array(
+ 'small' => 'starfarer_small_3.jpg',
+ 'big' => 'starfarer_3.jpg')));
+
+$projects[] = array(
+ 'name' => 'Micron',
+ 'url' => 'http://play.minds-eye-games.com/micron/',
+ 'type' => 'Open Source game',
+ 'desc' => 'Micron is a randomly generated, 2D abstract shooter. Enter a world of scintillating shapes and colors as you are attacked on all sides. Fight a variety of enemies in an infinite, deadly universe.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'micron_small_1.png',
+ 'big' => 'micron_1.png'),
+ 1 => array(
+ 'small' => 'micron_small_2.png',
+ 'big' => 'micron_2.png'),
+ 2 => array(
+ 'small' => 'micron_small_3.png',
+ 'big' => 'micron_3.png')));
+
+$projects[] = array(
+ 'name' => 'Newton Adventure',
+ 'url' => 'http://bci.im',
+ 'type' => 'Open Source',
+ 'desc' => 'Newton Adventure is a free and open source 2D platform game. You play Newton, a very special hero who has the power to change gravity direction.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'newton_small_1.jpg',
+ 'big' => 'newton_1.jpg'),
+ 1 => array(
+ 'small' => 'newton_small_2.jpg',
+ 'big' => 'newton_2.jpg'),
+ 2 => array(
+ 'small' => 'newton_small_3.jpg',
+ 'big' => 'newton_3.jpg')));
+
+$projects[] = array(
+ 'name' => 'Tropical Stormfront',
+ 'url' => 'http://www.operationstormfront.com',
+ 'type' => 'Commercial',
+ 'desc' => 'Tropical Stormfront is a real-time strategy (RTS) game played out over lush tropical archipelagos.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'tsf_small_1.png',
+ 'big' => 'tsf_1.png'),
+ 1 => array(
+ 'small' => 'tsf_small_2.png',
+ 'big' => 'tsf_2.png'),
+ 2 => array(
+ 'small' => 'tsf_small_3.png',
+ 'big' => 'tsf_3.png')));
+
+$projects[] = array(
+ 'name' => 'ode4j',
+ 'url' => 'http://www.ode4j.org',
+ 'type' => 'Free open source physics engine',
+ 'desc' => 'ode4j is a Java library for 3D game physics. It is a port of the C/C++ Open Dynamics Engine (ODE: www.ode.org). It provides dozens of example applications that use lwjgl for visualizing different features of the library.',
+ 'screens' => array(
+ 0 => array(
+ 'small' => 'ode4j_small_1.png',
+ 'big' => 'ode4j_1.png'),
+ 1 => array(
+ 'small' => 'ode4j_small_2.png',
+ 'big' => 'ode4j_2.png'),
+ 2 => array(
+ 'small' => 'ode4j_small_3.png',
+ 'big' => 'ode4j_3.png')));
function displayProjects() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-04 20:04:40
|
Revision: 3812
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3812&view=rev
Author: kappa1
Date: 2012-11-04 20:04:30 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Remove unused dependency on JavaNativeFoundation
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m 2012-11-04 19:50:22 UTC (rev 3811)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m 2012-11-04 20:04:30 UTC (rev 3812)
@@ -39,7 +39,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <JavaNativeFoundation.h>
+//#import <JavaNativeFoundation.h>
#include <jni.h>
#include "org_lwjgl_opengl_MacOSXCanvasPeerInfo.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-11-04 19:50:34
|
Revision: 3811
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3811&view=rev
Author: matzon
Date: 2012-11-04 19:50:22 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Bumping version number
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 2012-11-04 18:39:35 UTC (rev 3810)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2012-11-04 19:50:22 UTC (rev 3811)
@@ -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.8.5" />
+ <property name="lwjgl.version" value="2.9.0" />
<property name="lwjgl.web" location="www" />
<property name="lwjgl.src.templates.al" location="${lwjgl.src.templates}/org/lwjgl/openal"/>
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2012-11-04 18:39:35 UTC (rev 3810)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2012-11-04 19:50:22 UTC (rev 3811)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.8.5";
+ private static final String VERSION = "2.9.0";
private static final String POSTFIX64BIT = "64";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-11-04 18:39:41
|
Revision: 3810
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3810&view=rev
Author: matzon
Date: 2012-11-04 18:39:35 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Tagging 2.8.5
Added Paths:
-----------
tags/lwjgl2.8.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-03 18:06:17
|
Revision: 3809
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3809&view=rev
Author: kappa1
Date: 2012-11-03 18:06:08 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
Fix a native crash on startup of some applications
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-03 18:06:08 UTC (rev 3809)
@@ -497,7 +497,7 @@
}
MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
- if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
+ //if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
/*NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
if (hide == JNI_TRUE) {
options = NSApplicationPresentationFullScreen; // this requires OS X 10.7+ to compile
@@ -509,11 +509,11 @@
if (window_info->window != nil) {
[[NSApplication sharedApplication] setPresentationOptions:options];
}*/
- } else {
+ //} else {
if (hide == JNI_TRUE) {
SetSystemUIMode(kUIModeContentSuppressed, 0);
} else {
SetSystemUIMode(kUIModeNormal, 0);
}
- }
+ //}
}
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m 2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m 2012-11-03 18:06:08 UTC (rev 3809)
@@ -58,7 +58,7 @@
MacOSXContext *shared_context_info;
MacOSXContext *context_info;
NSOpenGLContext *context;
- NSOpenGLContext *shared_context;
+ NSOpenGLContext *shared_context = NULL;
printf("nCreate\n");
jobject context_handle = newJavaManagedByteBuffer(env, sizeof(MacOSXContext));
if (context_handle == NULL) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-01 22:39:29
|
Revision: 3808
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3808&view=rev
Author: kappa1
Date: 2012-11-01 22:39:22 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Fix memory leaks by adding an NSAutoreleasePool when creating a windows and draining it on window destroy
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 22:21:23 UTC (rev 3807)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 22:39:22 UTC (rev 3808)
@@ -53,6 +53,8 @@
static NSOpenGLPixelFormat *default_format = nil;
+static NSAutoreleasePool *pool;
+
@implementation MacOSXKeyableWindow
- (BOOL)canBecomeKeyWindow;
{
@@ -390,21 +392,6 @@
[window_info->window setStyleMask:style_mask];
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
- MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
-
- if (window_info->window != nil) {
- [window_info->window close];
- }
- window_info->window = nil;
-
- if (window_info->view != nil) {
- [window_info->view release];
- }
- window_info->view = nil;
- //[window_info->window release];
-}
-
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nSetTitle(JNIEnv *env, jobject this, jobject window_handle, jobject title_buffer) {
MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
const char *title_cstr = (const char *)(*env)->GetDirectBufferAddress(env, title_buffer);
@@ -421,6 +408,8 @@
return NULL;
}
}
+
+ pool = [[NSAutoreleasePool alloc] init];
MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
@@ -467,6 +456,22 @@
return window_handle;
}
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
+ MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+
+ if (window_info->window != nil) {
+ [window_info->window close];
+ }
+ window_info->window = nil;
+
+ if (window_info->view != nil) {
+ [window_info->view release];
+ }
+ window_info->view = nil;
+ //[window_info->window release];
+ [pool drain];
+}
+
JNIEXPORT jint JNICALL Java_org_lwjgl_DefaultSysImplementation_getJNIVersion
(JNIEnv *env, jobject ignored) {
return org_lwjgl_MacOSXSysImplementation_JNI_VERSION;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-11-01 22:21:30
|
Revision: 3807
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3807&view=rev
Author: kappa1
Date: 2012-11-01 22:21:23 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Updated macosx_ant build.xml, removed PPC support, bumped the minimum OS X SDK for 32/64bit native to SDK 10.5. Commented out some code in Display.m that required SDK 10.7+, namely NSApplicationPresentationFullScreen, etc
Modified Paths:
--------------
branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-01 20:54:17 UTC (rev 3806)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-01 22:21:23 UTC (rev 3807)
@@ -3,7 +3,7 @@
<property name="native" location="../../src/native"/>
<target name="init">
- <mkdir dir="ppc"/>
+ <!--mkdir dir="ppc"/-->
<mkdir dir="i386"/>
<mkdir dir="x86_64"/>
</target>
@@ -12,7 +12,7 @@
<delete failonerror="false">
<fileset dir="i386"/>
<fileset dir="x86_64"/>
- <fileset dir="ppc"/>
+ <!--fileset dir="ppc"/-->
<fileset dir="." includes="liblwjgl.jnilib"/>
<fileset dir="." includes="lwjgl.symbols"/>
</delete>
@@ -46,21 +46,21 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
- <property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
+ <!--property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/-->
<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
- <property name="ppc_flags" value="-isysroot ${ppc_sdkroot}"/>
+ <!--property name="ppc_flags" value="-isysroot ${ppc_sdkroot}"/>
<antcall target="compile">
<param name="dstdir" location="ppc"/>
<param name="compiler" value="gcc-4.2"/>
<param name="sdkroot" location="${ppc_sdkroot}"/>
<param name="cflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
- </antcall>
+ </antcall-->
<antcall target="compile">
<param name="dstdir" location="i386"/>
<param name="compiler" value="gcc-4.2"/>
<param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.4"/>
+ <param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
</antcall>
<antcall target="compile">
<param name="dstdir" location="x86_64"/>
@@ -72,12 +72,12 @@
<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
<arg path="i386"/>
</exec>
- <antcall target="link">
+ <!--antcall target="link">
<param name="objdir" location="ppc"/>
<param name="libname" value="liblwjgl-ppc.jnilib"/>
<param name="linker" value="gcc-4.2"/>
<param name="linkerflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
- </antcall>
+ </antcall-->
<antcall target="link">
<param name="objdir" location="i386"/>
<param name="libname" value="liblwjgl-i386.jnilib"/>
@@ -95,7 +95,7 @@
<srcfile/>
<arg value="-output"/>
<arg path="liblwjgl.jnilib"/>
- <fileset file="ppc/liblwjgl-ppc.jnilib"/>
+ <!--fileset file="ppc/liblwjgl-ppc.jnilib"/-->
<fileset file="i386/liblwjgl-i386.jnilib"/>
<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
</apply>
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 20:54:17 UTC (rev 3806)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 22:21:23 UTC (rev 3807)
@@ -315,7 +315,7 @@
}
- (void)scrollWheel:(NSEvent *)event {
- JNIEnv *env = attachCurrentThread();
+ /*JNIEnv *env = attachCurrentThread();
if (env == nil || event == nil || _parent == nil) {
return;
}
@@ -328,6 +328,7 @@
jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
+ */
}
- (void)viewDidMoveToWindow
@@ -492,9 +493,9 @@
MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
- NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
+ /*NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
if (hide == JNI_TRUE) {
- options = NSApplicationPresentationFullScreen;
+ options = NSApplicationPresentationFullScreen; // this requires OS X 10.7+ to compile
options |= NSApplicationPresentationHideDock;
options |= NSApplicationPresentationHideMenuBar;
}
@@ -502,7 +503,7 @@
window_info->window_options = options;
if (window_info->window != nil) {
[[NSApplication sharedApplication] setPresentationOptions:options];
- }
+ }*/
} else {
if (hide == JNI_TRUE) {
SetSystemUIMode(kUIModeContentSuppressed, 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-11-01 20:54:28
|
Revision: 3806
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3806&view=rev
Author: matzon
Date: 2012-11-01 20:54:17 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Comitting EmuMogs 28008537/src.zip drop to branch
Modified Paths:
--------------
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/Display.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
branches/osx-java7/LWJGL/src/native/macosx/context.h
branches/osx-java7/LWJGL/src/native/macosx/context.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXPbufferPeerInfo.m
Added Paths:
-----------
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeKeyboard.java
branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXNativeKeyboard.m
branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXNativeMouse.m
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/Display.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/Display.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -242,7 +242,7 @@
try {
if ( was_fullscreen && !isFullscreen() )
display_impl.resetDisplayMode();
- else if ( isFullscreen() )
+ else if ( isFullscreen() )
switchDisplayMode();
createWindow();
makeCurrentAndSetSwapInterval();
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -44,21 +44,15 @@
* $Id$
*/
abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo {
- private final AWTSurfaceLock awt_surface = new AWTSurfaceLock();
-
protected MacOSXCanvasPeerInfo(PixelFormat pixel_format, ContextAttribs attribs, boolean support_pbuffer) throws LWJGLException {
super(pixel_format, attribs, true, true, support_pbuffer, true);
}
protected void initHandle(Canvas component) throws LWJGLException {
- // Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
- final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component) && LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 6);
-
- nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
+ nInitHandle(getHandle());
}
- private static native void nInitHandle(ByteBuffer surface_buffer, ByteBuffer peer_info_handle, boolean allowCALayer) throws LWJGLException;
+ private static native void nInitHandle(ByteBuffer peer_info_handle) throws LWJGLException;
protected void doUnlock() throws LWJGLException {
- awt_surface.unlock();
}
}
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -90,7 +90,7 @@
try {
synchronized ( context ) {
clearDrawable(context.getHandle());
- setView(peer_handle, context.getHandle());
+ setView(peer_handle);
}
} finally {
peer_info.unlock();
@@ -100,14 +100,14 @@
public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
ByteBuffer peer_handle = peer_info.lockAndGetHandle();
try {
- setView(peer_handle, handle);
+ setView(peer_handle);
nMakeCurrent(handle);
} finally {
peer_info.unlock();
}
}
- private static native void setView(ByteBuffer peer_handle, ByteBuffer context_handle) throws LWJGLException;
+ private static native void setView(ByteBuffer peer_handle) throws LWJGLException;
private static native void nMakeCurrent(ByteBuffer context_handle) throws LWJGLException;
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -40,6 +40,8 @@
import java.awt.Canvas;
import java.awt.Cursor;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
import java.awt.Robot;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
@@ -51,6 +53,7 @@
import java.util.List;
import org.lwjgl.BufferUtils;
+import org.lwjgl.MemoryUtil;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
@@ -65,14 +68,25 @@
private static final int GAMMA_LENGTH = 256;
private MacOSXCanvasListener canvas_listener;
- private MacOSXFrame frame;
private Canvas canvas;
private Robot robot;
private MacOSXMouseEventQueue mouse_queue;
private KeyboardEventQueue keyboard_queue;
private java.awt.DisplayMode requested_mode;
+
+ /* Members for native window use */
+ private MacOSXNativeMouse mouse;
+ private MacOSXNativeKeyboard keyboard;
+ private ByteBuffer window;
+ private ByteBuffer context;
+ private int x;
+ private int y;
+ private int width;
+ private int height;
+
+ /* Whether we're using a native window or an AWT canvas */
+ private boolean native_mode;
- /* States */
private boolean close_requested;
MacOSXDisplay() {
@@ -96,49 +110,65 @@
}
}
- public void createWindow(final DrawableLWJGL drawable, DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException {
+ private native ByteBuffer nCreateWindow(int x, int y, int width, int height, boolean fullscreen, boolean undecorated, ByteBuffer peer_info_handle, ByteBuffer window_handle) throws LWJGLException;
+
+ private native boolean nIsMiniaturized(ByteBuffer window_handle);
+
+ private native boolean nIsFocused(ByteBuffer window_handle);
+
+ private native void nSetResizable(ByteBuffer window_handle, boolean resizable);
+
+ private native void nResizeWindow(ByteBuffer window_handle, int x, int y, int width, int height);
+
+ private native boolean nWasResized(ByteBuffer window_handle);
+
+ private static boolean isUndecorated() {
+ return Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated");
+ }
+
+ public void createWindow(final DrawableLWJGL drawable, DisplayMode mode, Canvas parent, int x, int y) throws LWJGLException {
boolean fullscreen = Display.isFullscreen();
hideUI(fullscreen);
close_requested = false;
+
+ DrawableGL gl_drawable = (DrawableGL)Display.getDrawable();
+ PeerInfo peer_info = gl_drawable.peer_info;
+ ByteBuffer peer_handle = peer_info.lockAndGetHandle();
try {
- if (parent == null) {
- frame = new MacOSXFrame(mode, requested_mode, fullscreen, x, y);
- canvas = frame.getCanvas();
- } else {
- frame = null;
- canvas = parent;
- }
- canvas_listener = new MacOSXCanvasListener(canvas);
- robot = AWTUtil.createRobot(canvas);
+ window = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(),
+ fullscreen, isUndecorated(),
+ peer_handle, window);
+ native_mode = true;
+ this.x = x;
+ this.y = y;
+ this.width = mode.getWidth();
+ this.height = mode.getHeight();
+ this.canvas = parent;
} catch (LWJGLException e) {
destroyWindow();
throw e;
- }
+ } finally {
+ peer_info.unlock();
+ }
}
- private void doHandleQuit() {
+ public void doHandleQuit() {
synchronized (this) {
close_requested = true;
}
}
+ public native void nDestroyWindow(ByteBuffer window_handle);
+
public void destroyWindow() {
- if (canvas_listener != null) {
- canvas_listener.disableListeners();
- canvas_listener = null;
- }
- if (frame != null) {
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- if (MacOSXFrame.getDevice().getFullScreenWindow() == frame)
- MacOSXFrame.getDevice().setFullScreenWindow(null);
- return null;
- }
- });
- if (frame.isDisplayable())
- frame.dispose();
- frame = null;
- }
+ if (native_mode) {
+ nDestroyWindow(window);
+ } else {
+ if (canvas_listener != null) {
+ canvas_listener.disableListeners();
+ canvas_listener = null;
+ }
+ }
hideUI(false);
}
@@ -162,7 +192,7 @@
}
public void switchDisplayMode(DisplayMode mode) throws LWJGLException {
- java.awt.DisplayMode[] awt_modes = MacOSXFrame.getDevice().getDisplayModes();
+ java.awt.DisplayMode[] awt_modes = getDevice().getDisplayModes();
for ( java.awt.DisplayMode awt_mode : awt_modes ) {
if (equals(awt_mode, mode)) {
requested_mode = awt_mode;
@@ -172,9 +202,17 @@
throw new LWJGLException(mode + " is not supported");
}
+ private static GraphicsDevice getDevice() {
+ GraphicsEnvironment g_env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ GraphicsDevice device = g_env.getDefaultScreenDevice();
+ return device;
+ }
+
public void resetDisplayMode() {
- if (MacOSXFrame.getDevice().getFullScreenWindow() != null)
- MacOSXFrame.getDevice().setFullScreenWindow(null);
+ if (!native_mode) {
+ if (getDevice().getFullScreenWindow() != null)
+ getDevice().setFullScreenWindow(null);
+ }
requested_mode = null;
restoreGamma();
}
@@ -198,11 +236,11 @@
}
public DisplayMode init() throws LWJGLException {
- return createLWJGLDisplayMode(MacOSXFrame.getDevice().getDisplayMode());
+ return createLWJGLDisplayMode(getDevice().getDisplayMode());
}
public DisplayMode[] getAvailableDisplayModes() throws LWJGLException {
- java.awt.DisplayMode[] awt_modes = MacOSXFrame.getDevice().getDisplayModes();
+ java.awt.DisplayMode[] awt_modes = getDevice().getDisplayModes();
List<DisplayMode> modes = new ArrayList<DisplayMode>();
for ( java.awt.DisplayMode awt_mode : awt_modes )
if ( awt_mode.getBitDepth() >= 16 )
@@ -210,26 +248,33 @@
return modes.toArray(new DisplayMode[modes.size()]);
}
+ private native void nSetTitle(ByteBuffer window_handle, ByteBuffer title_buffer);
+
public void setTitle(String title) {
- if (frame != null)
- frame.setTitle(title);
+ ByteBuffer buffer = MemoryUtil.encodeUTF8(title);
+ nSetTitle(window, buffer);
}
public boolean isCloseRequested() {
boolean result;
synchronized (this) {
- result = close_requested || (frame != null && frame.syncIsCloseRequested());
+ result = close_requested;
close_requested = false;
}
return result;
}
public boolean isVisible() {
- return frame == null || frame.syncIsVisible();
+ return true;
}
public boolean isActive() {
- return canvas.isFocusOwner();
+ if (native_mode) {
+ boolean ret = nIsFocused(window);
+ return ret;
+ } else {
+ return canvas.isFocusOwner();
+ }
}
public Canvas getCanvas() {
@@ -237,7 +282,7 @@
}
public boolean isDirty() {
- return frame != null && frame.getCanvas().syncIsDirty();
+ return false;
}
public PeerInfo createPeerInfo(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
@@ -250,7 +295,10 @@
private static final IntBuffer current_viewport = BufferUtils.createIntBuffer(16);
public void update() {
- boolean should_update = canvas_listener.syncShouldUpdateContext();
+ boolean should_update = true;
+ if (!native_mode) {
+ should_update = canvas_listener.syncShouldUpdateContext();
+ }
/*
* Workaround for the "white screen in fullscreen mode" problem
*
@@ -273,46 +321,38 @@
* - elias
*/
DrawableGL drawable = (DrawableGL)Display.getDrawable();
- if (Display.isFullscreen() && (frame != null && frame.getCanvas().syncCanvasPainted() || should_update)) {
- try {
- MacOSXContextImplementation.resetView(drawable.peer_info, drawable.context);
- } catch (LWJGLException e) {
- LWJGLUtil.log("Failed to reset context: " + e);
- }
- }
if (should_update) {
drawable.context.update();
/* This is necessary to make sure the context won't "forget" about the view size */
glGetInteger(GL_VIEWPORT, current_viewport);
glViewport(current_viewport.get(0), current_viewport.get(1), current_viewport.get(2), current_viewport.get(3));
}
+ /*
if (frame != null && mouse_queue != null) {
if (frame.syncShouldReleaseCursor())
MacOSXMouseEventQueue.nGrabMouse(false);
if (frame.syncShouldWarpCursor())
mouse_queue.warpCursor();
}
+ */
}
/**
- * This is an interface to the native Carbon call
- * SetSystemUIMode. It is used to hide the dock in a way
- * that will prevent AWT from shifting the fullscreen window
- *
- * The workaround is not necessary on 10.4, and since 10.4 shows
- * instability problems calling SetSystemUIMode, we'll only call it
- * when the OS version is 10.3 or lower.
+ * This is an interface to the native Cocoa function,
+ * NSWindow:setStyleMask. It is used to set the window's border to
+ * undecorated.
*/
private void hideUI(boolean hide) {
- if (!LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 4))
- nHideUI(hide);
+ //if (!LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 4))
+ nHideUI(window, hide);
}
- private native void nHideUI(boolean hide);
+ private native void nHideUI(ByteBuffer window_handle, boolean hide);
public void reshape(int x, int y, int width, int height) {
- if (frame != null)
- frame.resize(x, y, width, height);
+ //if (native_mode) {
+ // nResizeWindow(window, x, y, width, height);
+ //}
}
/* Mouse */
@@ -325,28 +365,52 @@
}
public void createMouse() throws LWJGLException {
- this.mouse_queue = new MacOSXMouseEventQueue(canvas);
- mouse_queue.register();
+ if (native_mode) {
+ mouse = new MacOSXNativeMouse(this, window);
+ mouse.register();
+ } else {
+ mouse_queue = new MacOSXMouseEventQueue(canvas);
+ mouse_queue.register();
+ }
}
public void destroyMouse() {
- if (mouse_queue != null) {
- MacOSXMouseEventQueue.nGrabMouse(false);
- mouse_queue.unregister();
- }
- this.mouse_queue = null;
+ MacOSXMouseEventQueue.nGrabMouse(false);
+ if (native_mode) {
+ if (mouse != null) {
+ mouse.unregister();
+ }
+ mouse = null;
+ } else {
+ if (mouse_queue != null) {
+ mouse_queue.unregister();
+ }
+ mouse_queue = null;
+ }
}
public void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons_buffer) {
- mouse_queue.poll(coord_buffer, buttons_buffer);
+ if (native_mode) {
+ mouse.poll(coord_buffer, buttons_buffer);
+ } else {
+ mouse_queue.poll(coord_buffer, buttons_buffer);
+ }
}
public void readMouse(ByteBuffer buffer) {
- mouse_queue.copyEvents(buffer);
+ if (native_mode) {
+ mouse.copyEvents(buffer);
+ } else {
+ mouse_queue.copyEvents(buffer);
+ }
}
public void grabMouse(boolean grab) {
- mouse_queue.setGrabbed(grab);
+ if (native_mode) {
+ mouse.setGrabbed(grab);
+ } else {
+ mouse_queue.setGrabbed(grab);
+ }
}
public int getNativeCursorCapabilities() {
@@ -354,13 +418,10 @@
}
public void setCursorPosition(int x, int y) {
- AWTUtil.setCursorPosition(canvas, robot, x, y);
+ MacOSXMouseEventQueue.nWarpCursor(x, y);
}
public void setNativeCursor(Object handle) throws LWJGLException {
- Cursor awt_cursor = (Cursor)handle;
- if (frame != null)
- frame.setCursor(awt_cursor);
}
public int getMinCursorSize() {
@@ -373,48 +434,43 @@
/* Keyboard */
public void createKeyboard() throws LWJGLException {
- this.keyboard_queue = new KeyboardEventQueue(canvas);
- keyboard_queue.register();
+ if (native_mode) {
+ this.keyboard = new MacOSXNativeKeyboard(window);
+ keyboard.register();
+ } else {
+ this.keyboard_queue = new KeyboardEventQueue(canvas);
+ keyboard_queue.register();
+ }
}
public void destroyKeyboard() {
- if (keyboard_queue != null)
- keyboard_queue.unregister();
- this.keyboard_queue = null;
+ if (native_mode) {
+ if (keyboard != null)
+ keyboard.unregister();
+ keyboard = null;
+ } else {
+ if (keyboard_queue != null)
+ keyboard_queue.unregister();
+ keyboard_queue = null;
+ }
}
public void pollKeyboard(ByteBuffer keyDownBuffer) {
- keyboard_queue.poll(keyDownBuffer);
+ if (native_mode) {
+ keyboard.poll(keyDownBuffer);
+ } else {
+ keyboard_queue.poll(keyDownBuffer);
+ }
}
public void readKeyboard(ByteBuffer buffer) {
- keyboard_queue.copyEvents(buffer);
+ if (native_mode) {
+ keyboard.copyEvents(buffer);
+ } else {
+ keyboard_queue.copyEvents(buffer);
+ }
}
-/* public int isStateKeySet(int key) {
- int awt_key;
- switch (key) {
- case Keyboard.KEY_CAPITAL:
- awt_key = KeyEvent.VK_CAPS_LOCK;
- break;
- case Keyboard.KEY_NUMLOCK:
- awt_key = KeyEvent.VK_NUM_LOCK;
- break;
- case Keyboard.KEY_SYSRQ:
- awt_key = KeyEvent.VK_SCROLL_LOCK;
- break;
- default:
- return Keyboard.STATE_UNKNOWN;
- }
- try {
- boolean state = Toolkit.getDefaultToolkit().getLockingKeyState(awt_key);
- return state ? Keyboard.STATE_ON : Keyboard.STATE_OFF;
- } catch (Exception e) {
- LWJGLUtil.log("Failed to query key state: " + e);
- return Keyboard.STATE_UNKNOWN;
- }
- }
-*/
/** Native cursor handles */
public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException {
return AWTUtil.createCursor(width, height, xHotspot, yHotspot, numImages, images, delays);
@@ -497,19 +553,19 @@
}
public int getX() {
- return frame.getX();
+ return x;
}
public int getY() {
- return frame.getY();
+ return y;
}
public int getWidth() {
- return frame.getWidth();
+ return width;
}
public int getHeight() {
- return frame.getHeight();
+ return height;
}
public boolean isInsideWindow() {
@@ -517,11 +573,17 @@
}
public void setResizable(boolean resizable) {
- frame.setResizable(resizable);
+ if (native_mode) {
+ nSetResizable(window, resizable);
+ }
}
public boolean wasResized() {
- return canvas_listener.wasResized();
+ if (native_mode) {
+ return nWasResized(window);
+ } else {
+ return canvas_listener.wasResized();
+ }
}
}
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -44,13 +44,13 @@
import org.lwjgl.BufferUtils;
final class MacOSXMouseEventQueue extends MouseEventQueue {
- private final IntBuffer delta_buffer = BufferUtils.createIntBuffer(2);
-
- private boolean skip_event;
- private static boolean is_grabbed;
+ private IntBuffer delta_buffer = BufferUtils.createIntBuffer(2);
+
+ private boolean skip_event;
+ private static boolean is_grabbed;
MacOSXMouseEventQueue(Component component) {
- super(component);
+ super(component);
}
public void setGrabbed(boolean grab) {
@@ -96,18 +96,11 @@
// If we're going to warp the cursor position, we'll skip the next event to avoid bogus delta values
skip_event = isGrabbed();
}
-/* if (isGrabbed()) {
- Rectangle bounds = getComponent().getBounds();
- Point location_on_screen = getComponent().getLocationOnScreen();
- int x = location_on_screen.x + bounds.width/2;
- int y = location_on_screen.y + bounds.height/2;
- nWarpCursor(x, y);
- }*/
}
private static native void getMouseDeltas(IntBuffer delta_buffer);
- private static native void nWarpCursor(int x, int y);
+ public static native void nWarpCursor(int x, int y);
- static native void nGrabMouse(boolean grab);
+ public static native void nGrabMouse(boolean grab);
}
Added: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeKeyboard.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeKeyboard.java (rev 0)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeKeyboard.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -0,0 +1,283 @@
+/*
+ * 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.opengl;
+
+/**
+ * An AWT implementation of a LWJGL compatible Keyboard event queue.
+ * @author elias_naur
+ */
+
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.HashMap;
+import java.awt.Component;
+import java.nio.ByteBuffer;
+
+import org.lwjgl.input.Keyboard;
+
+final class MacOSXNativeKeyboard extends EventQueue {
+ private final byte[] key_states = new byte[Keyboard.KEYBOARD_SIZE];
+
+ /** Event scratch array */
+ private final ByteBuffer event = ByteBuffer.allocate(Keyboard.EVENT_SIZE);
+
+ private ByteBuffer window_handle;
+
+ private boolean has_deferred_event;
+ private long deferred_nanos;
+ private int deferred_key_code;
+ private byte deferred_key_state;
+ private int deferred_character;
+
+ private HashMap<Short, Integer> nativeToLwjglMap;
+
+ MacOSXNativeKeyboard(ByteBuffer window_handle) {
+ super(Keyboard.EVENT_SIZE);
+ nativeToLwjglMap = new HashMap<Short, Integer>();
+ initKeyboardMappings();
+ this.window_handle = window_handle;
+ }
+
+ private native void nRegisterKeyListener(ByteBuffer window_handle);
+
+ private native void nUnregisterKeyListener(ByteBuffer window_handle);
+
+ private void initKeyboardMappings() {
+ nativeToLwjglMap.put((Short)(short)0x1D, Keyboard.KEY_0);
+ nativeToLwjglMap.put((Short)(short)0x12, Keyboard.KEY_1);
+ nativeToLwjglMap.put((Short)(short)0x13, Keyboard.KEY_2);
+ nativeToLwjglMap.put((Short)(short)0x14, Keyboard.KEY_3);
+ nativeToLwjglMap.put((Short)(short)0x15, Keyboard.KEY_4);
+ nativeToLwjglMap.put((Short)(short)0x17, Keyboard.KEY_5);
+ nativeToLwjglMap.put((Short)(short)0x16, Keyboard.KEY_6);
+ nativeToLwjglMap.put((Short)(short)0x1A, Keyboard.KEY_7);
+ nativeToLwjglMap.put((Short)(short)0x1C, Keyboard.KEY_8);
+ nativeToLwjglMap.put((Short)(short)0x19, Keyboard.KEY_9);
+ nativeToLwjglMap.put((Short)(short)0x00, Keyboard.KEY_A);
+ nativeToLwjglMap.put((Short)(short)0x0B, Keyboard.KEY_B);
+ nativeToLwjglMap.put((Short)(short)0x08, Keyboard.KEY_C);
+ nativeToLwjglMap.put((Short)(short)0x02, Keyboard.KEY_D);
+ nativeToLwjglMap.put((Short)(short)0x0E, Keyboard.KEY_E);
+ nativeToLwjglMap.put((Short)(short)0x03, Keyboard.KEY_F);
+ nativeToLwjglMap.put((Short)(short)0x05, Keyboard.KEY_G);
+ nativeToLwjglMap.put((Short)(short)0x04, Keyboard.KEY_H);
+ nativeToLwjglMap.put((Short)(short)0x22, Keyboard.KEY_I);
+ nativeToLwjglMap.put((Short)(short)0x26, Keyboard.KEY_J);
+ nativeToLwjglMap.put((Short)(short)0x28, Keyboard.KEY_K);
+ nativeToLwjglMap.put((Short)(short)0x25, Keyboard.KEY_L);
+ nativeToLwjglMap.put((Short)(short)0x2E, Keyboard.KEY_M);
+ nativeToLwjglMap.put((Short)(short)0x2D, Keyboard.KEY_N);
+ nativeToLwjglMap.put((Short)(short)0x1F, Keyboard.KEY_O);
+ nativeToLwjglMap.put((Short)(short)0x23, Keyboard.KEY_P);
+ nativeToLwjglMap.put((Short)(short)0x0C, Keyboard.KEY_Q);
+ nativeToLwjglMap.put((Short)(short)0x0F, Keyboard.KEY_R);
+ nativeToLwjglMap.put((Short)(short)0x01, Keyboard.KEY_S);
+ nativeToLwjglMap.put((Short)(short)0x11, Keyboard.KEY_T);
+ nativeToLwjglMap.put((Short)(short)0x20, Keyboard.KEY_U);
+ nativeToLwjglMap.put((Short)(short)0x09, Keyboard.KEY_V);
+ nativeToLwjglMap.put((Short)(short)0x0D, Keyboard.KEY_W);
+ nativeToLwjglMap.put((Short)(short)0x07, Keyboard.KEY_X);
+ nativeToLwjglMap.put((Short)(short)0x10, Keyboard.KEY_Y);
+ nativeToLwjglMap.put((Short)(short)0x06, Keyboard.KEY_Z);
+ nativeToLwjglMap.put((Short)(short)0x2B, Keyboard.KEY_COMMA);
+ nativeToLwjglMap.put((Short)(short)0x2C, Keyboard.KEY_SLASH);
+ nativeToLwjglMap.put((Short)(short)0x2F, Keyboard.KEY_PERIOD);
+ nativeToLwjglMap.put((Short)(short)0x32, Keyboard.KEY_CIRCUMFLEX);
+ nativeToLwjglMap.put((Short)(short)0x29, Keyboard.KEY_SEMICOLON);
+ nativeToLwjglMap.put((Short)(short)0x129, Keyboard.KEY_COLON);
+ nativeToLwjglMap.put((Short)(short)0x2A, Keyboard.KEY_BACKSLASH);
+ nativeToLwjglMap.put((Short)(short)0x52, Keyboard.KEY_NUMPAD0);
+ nativeToLwjglMap.put((Short)(short)0x53, Keyboard.KEY_NUMPAD1);
+ nativeToLwjglMap.put((Short)(short)0x54, Keyboard.KEY_NUMPAD2);
+ nativeToLwjglMap.put((Short)(short)0x55, Keyboard.KEY_NUMPAD3);
+ nativeToLwjglMap.put((Short)(short)0x56, Keyboard.KEY_NUMPAD4);
+ nativeToLwjglMap.put((Short)(short)0x57, Keyboard.KEY_NUMPAD5);
+ nativeToLwjglMap.put((Short)(short)0x58, Keyboard.KEY_NUMPAD6);
+ nativeToLwjglMap.put((Short)(short)0x59, Keyboard.KEY_NUMPAD7);
+ nativeToLwjglMap.put((Short)(short)0x5B, Keyboard.KEY_NUMPAD8);
+ nativeToLwjglMap.put((Short)(short)0x5C, Keyboard.KEY_NUMPAD9);
+ nativeToLwjglMap.put((Short)(short)0x7A, Keyboard.KEY_F1);
+ nativeToLwjglMap.put((Short)(short)0x78, Keyboard.KEY_F2);
+ nativeToLwjglMap.put((Short)(short)0x63, Keyboard.KEY_F3);
+ nativeToLwjglMap.put((Short)(short)0x76, Keyboard.KEY_F4);
+ nativeToLwjglMap.put((Short)(short)0x60, Keyboard.KEY_F5);
+ nativeToLwjglMap.put((Short)(short)0x61, Keyboard.KEY_F6);
+ nativeToLwjglMap.put((Short)(short)0x62, Keyboard.KEY_F7);
+ nativeToLwjglMap.put((Short)(short)0x64, Keyboard.KEY_F8);
+ nativeToLwjglMap.put((Short)(short)0x65, Keyboard.KEY_F9);
+ nativeToLwjglMap.put((Short)(short)0x6D, Keyboard.KEY_F10);
+ nativeToLwjglMap.put((Short)(short)0x67, Keyboard.KEY_F11);
+ nativeToLwjglMap.put((Short)(short)0x6F, Keyboard.KEY_F12);
+ nativeToLwjglMap.put((Short)(short)0x69, Keyboard.KEY_F13);
+ nativeToLwjglMap.put((Short)(short)0x6B, Keyboard.KEY_F14);
+ nativeToLwjglMap.put((Short)(short)0x71, Keyboard.KEY_F15);
+ nativeToLwjglMap.put((Short)(short)0x72, Keyboard.KEY_HOME);
+ nativeToLwjglMap.put((Short)(short)0x18, Keyboard.KEY_EQUALS);
+ nativeToLwjglMap.put((Short)(short)0x7B, Keyboard.KEY_LEFT);
+ nativeToLwjglMap.put((Short)(short)0x7C, Keyboard.KEY_RIGHT);
+ nativeToLwjglMap.put((Short)(short)0x7E, Keyboard.KEY_UP);
+ nativeToLwjglMap.put((Short)(short)0x7D, Keyboard.KEY_DOWN);
+ nativeToLwjglMap.put((Short)(short)0x31, Keyboard.KEY_SPACE);
+ nativeToLwjglMap.put((Short)(short)0x30, Keyboard.KEY_TAB);
+ nativeToLwjglMap.put((Short)(short)0x35, Keyboard.KEY_ESCAPE);
+ nativeToLwjglMap.put((Short)(short)0x74, Keyboard.KEY_PRIOR);
+ nativeToLwjglMap.put((Short)(short)0x79, Keyboard.KEY_NEXT);
+ nativeToLwjglMap.put((Short)(short)0x41, Keyboard.KEY_DECIMAL);
+ nativeToLwjglMap.put((Short)(short)0x43, Keyboard.KEY_MULTIPLY);
+ nativeToLwjglMap.put((Short)(short)0x45, Keyboard.KEY_ADD);
+ nativeToLwjglMap.put((Short)(short)0x4B, Keyboard.KEY_DIVIDE);
+ nativeToLwjglMap.put((Short)(short)0x1B, Keyboard.KEY_MINUS);
+ nativeToLwjglMap.put((Short)(short)0x4E, Keyboard.KEY_SUBTRACT);
+ nativeToLwjglMap.put((Short)(short)0x1E, Keyboard.KEY_RBRACKET);
+ nativeToLwjglMap.put((Short)(short)0x21, Keyboard.KEY_LBRACKET);
+ nativeToLwjglMap.put((Short)(short)0x33, Keyboard.KEY_BACK);
+ nativeToLwjglMap.put((Short)(short)0x24, Keyboard.KEY_RETURN);
+ nativeToLwjglMap.put((Short)(short)0xF0, Keyboard.KEY_CAPITAL);
+ nativeToLwjglMap.put((Short)(short)0x39, Keyboard.KEY_CAPITAL);
+ nativeToLwjglMap.put((Short)(short)0xF1, Keyboard.KEY_LSHIFT);
+ nativeToLwjglMap.put((Short)(short)0x38, Keyboard.KEY_LSHIFT);
+ nativeToLwjglMap.put((Short)(short)0x3C, Keyboard.KEY_RSHIFT);
+ nativeToLwjglMap.put((Short)(short)0xF2, Keyboard.KEY_LCONTROL);
+ nativeToLwjglMap.put((Short)(short)0xF3, Keyboard.KEY_LMENU);
+ nativeToLwjglMap.put((Short)(short)0x3A, Keyboard.KEY_LMENU);
+ nativeToLwjglMap.put((Short)(short)0x3D, Keyboard.KEY_RMENU);
+ nativeToLwjglMap.put((Short)(short)0xF4, Keyboard.KEY_RETURN);
+ nativeToLwjglMap.put((Short)(short)0xF5, Keyboard.KEY_NUMLOCK);
+ nativeToLwjglMap.put((Short)(short)0x27, Keyboard.KEY_APOSTROPHE);
+
+ /*KEY_MAP[KeyEvent.VK_ALT_GRAPH] = Keyboard.KEY_RMENU;
+ KEY_MAP[KeyEvent.VK_AT] = Keyboard.KEY_AT;
+ KEY_MAP[KeyEvent.VK_BACK_SPACE] = Keyboard.KEY_BACK;
+ KEY_MAP[KeyEvent.VK_CAPS_LOCK] = Keyboard.KEY_CAPITAL;
+ KEY_MAP[KeyEvent.VK_COLON] = Keyboard.KEY_COLON;
+ KEY_MAP[KeyEvent.VK_CONVERT] = Keyboard.KEY_CONVERT;
+ KEY_MAP[KeyEvent.VK_END] = Keyboard.KEY_END;
+ KEY_MAP[KeyEvent.VK_INSERT] = Keyboard.KEY_INSERT;
+ KEY_MAP[KeyEvent.VK_KANA] = Keyboard.KEY_KANA;
+ KEY_MAP[KeyEvent.VK_KANJI] = Keyboard.KEY_KANJI;
+ KEY_MAP[KeyEvent.VK_NUM_LOCK] = Keyboard.KEY_NUMLOCK;
+ KEY_MAP[KeyEvent.VK_PAUSE] = Keyboard.KEY_PAUSE;
+ KEY_MAP[KeyEvent.VK_SCROLL_LOCK] = Keyboard.KEY_SCROLL;
+ KEY_MAP[KeyEvent.VK_SEPARATOR] = Keyboard.KEY_DECIMAL;
+ KEY_MAP[KeyEvent.VK_STOP] = Keyboard.KEY_STOP;*/
+ }
+
+ public void register() {
+ nRegisterKeyListener(window_handle);
+ }
+
+ public void unregister() {
+ nUnregisterKeyListener(window_handle);
+ }
+
+ public void putKeyboardEvent(int key_code, byte state, int character, long nanos, boolean repeat) {
+ event.clear();
+ event.putInt(key_code).put(state).putInt(character).putLong(nanos).put(repeat ? (byte)1 : (byte)0);
+ event.flip();
+ putEvent(event);
+ }
+
+ public synchronized void poll(ByteBuffer key_down_buffer) {
+ flushDeferredEvent();
+ int old_position = key_down_buffer.position();
+ key_down_buffer.put(key_states);
+ key_down_buffer.position(old_position);
+ }
+
+ public synchronized void copyEvents(ByteBuffer dest) {
+ flushDeferredEvent();
+ super.copyEvents(dest);
+ }
+
+ private synchronized void handleKey(int key_code, byte state, int character, long nanos) {
+ if (character == KeyEvent.CHAR_UNDEFINED)
+ character = Keyboard.CHAR_NONE;
+ if (state == 1) {
+ boolean repeat = false;
+ if (has_deferred_event) {
+ if ((nanos == deferred_nanos && deferred_key_code == key_code)) {
+ has_deferred_event = false;
+ repeat = true; // Repeat event
+ } else
+ flushDeferredEvent();
+ }
+ putKeyEvent(key_code, state, character, nanos, repeat);
+ } else {
+ flushDeferredEvent();
+ has_deferred_event = true;
+ deferred_nanos = nanos;
+ deferred_key_code = key_code;
+ deferred_key_state = state;
+ deferred_character = character;
+ }
+ }
+
+ private void flushDeferredEvent() {
+ if (has_deferred_event) {
+ putKeyEvent(deferred_key_code, deferred_key_state, deferred_character, deferred_nanos, false);
+ has_deferred_event = false;
+ }
+ }
+
+ public void putKeyEvent(int key_code, byte state, int character, long nanos, boolean repeat) {
+ /* Ignore repeating presses */
+ int mapped_code = getMappedKeyCode((short)key_code);
+ if (mapped_code < 0) {
+ System.out.println("Unrecognized keycode: " + key_code);
+ /* Unrecognized / unmapped code, do nothing */
+ return;
+ }
+ if ( key_states[mapped_code] == state )
+ repeat = true;
+ key_states[mapped_code] = state;
+ int key_int_char = character & 0xffff;
+ putKeyboardEvent(mapped_code, state, key_int_char, nanos, repeat);
+ }
+
+ private int getMappedKeyCode(short key_code) {
+ if (nativeToLwjglMap.containsKey(key_code)) {
+ return nativeToLwjglMap.get(key_code);
+ }
+ return -1;
+ }
+
+ public void keyPressed(int key_code, int character, long nanos) {
+ handleKey(key_code, (byte)1, character, nanos);
+ }
+
+ public void keyReleased(int key_code, int character, long nanos) {
+ handleKey(key_code, (byte)0, character, nanos);
+ }
+
+ public void keyTyped(KeyEvent e) {
+ }
+}
Added: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java (rev 0)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -0,0 +1,192 @@
+/*
+ * 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.opengl;
+
+/**
+ * A Cocoa implementation of a LWJGL compatible Mouse.
+ * @author mojang
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+import org.lwjgl.input.Mouse;
+
+import java.lang.reflect.*;
+import java.lang.Integer;
+import java.lang.Long;
+
+import org.lwjgl.BufferUtils;
+
+final class MacOSXNativeMouse extends EventQueue {
+ private static final int WHEEL_SCALE = 120;
+ private static final int NUM_BUTTONS = 3;
+
+ private ByteBuffer window_handle;
+ private MacOSXDisplay display;
+
+ private boolean grabbed;
+
+ /** The accumulated mouse deltas returned by poll() */
+ private float accum_dx;
+ private float accum_dy;
+ private int accum_dz;
+
+ /** The last mouse position */
+ private float last_x;
+ private float last_y;
+
+ /** Saved control key state for ctrl-click right button emulation */
+ private boolean saved_control_state;
+
+ private final ByteBuffer event = ByteBuffer.allocate(Mouse.EVENT_SIZE);
+ private IntBuffer delta_buffer = BufferUtils.createIntBuffer(2);
+ private int skip_event;
+
+ private final byte[] buttons = new byte[NUM_BUTTONS];
+
+ MacOSXNativeMouse(MacOSXDisplay display, ByteBuffer window_handle) {
+ super(Mouse.EVENT_SIZE);
+ this.display = display;
+ this.window_handle = window_handle;
+ }
+
+ private native void nWarpCursor(ByteBuffer window_handle, int x, int y);
+
+ public static native void nGrabMouse(boolean grab);
+
+ private native void nRegisterMouseListener(ByteBuffer window_handle);
+
+ private native void nUnregisterMouseListener(ByteBuffer window_handle);
+
+ public synchronized void register() {
+ nRegisterMouseListener(window_handle);
+ }
+
+ public synchronized void unregister() {
+ nUnregisterMouseListener(window_handle);
+ }
+
+ public synchronized void setGrabbed(boolean grabbed) {
+ this.grabbed = grabbed;
+ nGrabMouse(grabbed);
+ skip_event = 1;
+ accum_dx = accum_dy = 0;
+ }
+
+ public synchronized boolean isGrabbed() {
+ return grabbed;
+ }
+
+ protected void resetCursorToCenter() {
+ clearEvents();
+ accum_dx = accum_dy = 0;
+ if (display != null) {
+ last_x = display.getWidth() / 2;
+ last_y = display.getHeight() / 2;
+ }
+ }
+
+ private void putMouseEvent(byte button, byte state, int dz, long nanos) {
+ if (grabbed)
+ putMouseEventWithCoords(button, state, 0, 0, dz, nanos);
+ else
+ putMouseEventWithCoords(button, state, (int)last_x, (int)last_y, dz, nanos);
+ }
+
+ protected void putMouseEventWithCoords(byte button, byte state, int coord1, int coord2, int dz, long nanos) {
+ event.clear();
+ event.put(button).put(state).putInt(coord1).putInt(coord2).putInt(dz).putLong(nanos);
+ event.flip();
+ putEvent(event);
+ }
+
+ public synchronized void poll(IntBuffer coord_buffer, ByteBuffer buttons_buffer) {
+ if (grabbed) {
+ coord_buffer.put(0, (int)accum_dx);
+ coord_buffer.put(1, (int)accum_dy);
+ } else {
+ coord_buffer.put(0, (int)last_x);
+ coord_buffer.put(1, (int)last_y);
+ }
+ coord_buffer.put(2, accum_dz);
+ accum_dx = accum_dy = accum_dz = 0;
+ int old_position = buttons_buffer.position();
+ buttons_buffer.put(buttons, 0, buttons.length);
+ buttons_buffer.position(old_position);
+ }
+
+ private void setCursorPos(float x, float y, long nanos) {
+ if ( grabbed )
+ return;
+ float dx = x - last_x;
+ float dy = y - last_y;
+ addDelta(dx, dy);
+ last_x = x;
+ last_y = y;
+ putMouseEventWithCoords((byte)-1, (byte)0, (int)x, (int)y, 0, nanos);
+ }
+
+ protected void addDelta(float dx, float dy) {
+ accum_dx += dx;
+ accum_dy += -dy;
+ }
+
+ public synchronized void setButton(int button, int state, long nanos) {
+ buttons[button] = (byte)state;
+ putMouseEvent((byte)button, (byte)state, 0, nanos);
+ }
+
+ public synchronized void mouseMoved(float x, float y, float dx, float dy, float dz, long nanos) {
+ if (skip_event > 0) {
+ skip_event--;
+ if (skip_event == 0) {
+ last_x = x;
+ last_y = y;
+ }
+ return;
+ }
+ if (grabbed) {
+ if ( dx != 0 || dy != 0 ) {
+ putMouseEventWithCoords((byte)-1, (byte)0, (int)dx, (int)-dy, 0, nanos);
+ addDelta(dx, dy);
+ }
+ } else {
+ setCursorPos(x, y, nanos);
+ }
+ if ( dz != 0 ) {
+ int wheel_amount = (int)(-dz * WHEEL_SCALE);
+ accum_dz += wheel_amount;
+ putMouseEvent((byte)-1, (byte)0, wheel_amount, nanos);
+ }
+ }
+}
Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2012-11-01 20:54:17 UTC (rev 3806)
@@ -81,15 +81,19 @@
public synchronized void register() {
resetCursorToCenter();
- component.addMouseListener(this);
- component.addMouseMotionListener(this);
- component.addMouseWheelListener(this);
+ if (component != null) {
+ component.addMouseListener(this);
+ component.addMouseMotionListener(this);
+ component.addMouseWheelListener(this);
+ }
}
public synchronized void unregister() {
- component.removeMouseListener(this);
- component.removeMouseMotionListener(this);
- component.removeMouseWheelListener(this);
+ if (component != null) {
+ component.removeMouseListener(this);
+ component.removeMouseMotionListener(this);
+ component.removeMouseWheelListener(this);
+ }
}
protected Component getComponent() {
@@ -105,18 +109,23 @@
return grabbed;
}
- private int transformY(int y) {
- return component.getHeight() - 1 - y;
+ protected int transformY(int y) {
+ if (component != null) {
+ return component.getHeight() - 1 - y;
+ }
+ return y;
}
protected void resetCursorToCenter() {
clearEvents();
accum_dx = accum_dy = 0;
- Point cursor_location = AWTUtil.getCursorPosition(component);
- if (cursor_location != null) {
- last_x = cursor_location.x;
- last_y = cursor_location.y;
- }
+ if (component != null) {
+ Point cursor_location = AWTUtil.getCursorPosition(component);
+ if (cursor_location != null) {
+ last_x = cursor_location.x;
+ last_y = cursor_location.y;
+ }
+ }
}
private void putMouseEvent(byte button, byte state, int dz, long nanos) {
Modified: branches/osx-java7/LWJGL/src/native/macosx/context.h
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/context.h 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/native/macosx/context.h 2012-11-01 20:54:17 UTC (rev 3806)
@@ -47,15 +47,65 @@
#include <OpenGL/glext.h>
#include "common_tools.h"
+@class NSOpenGLContext, NSOpenGLPixelFormat, MacOSXOpenGLView, MacOSXKeyableWindow;
+
typedef struct {
+ MacOSXKeyableWindow *window;
+
+ NSRect display_rect;
+
+ MacOSXOpenGLView *view;
+ NSOpenGLContext *context;
+
+ // Native objects for Java callbacks
+ jobject jdisplay;
+ jobject jmouse;
+ jobject jkeyboard;
+ jboolean resized;
+
+ // Cached for window creation
+ NSApplicationPresentationOptions window_options;
+} MacOSXWindowInfo;
+
+@interface MacOSXKeyableWindow : NSWindow
+
+- (BOOL)canBecomeKeyWindow;
+@end
+
+@interface MacOSXOpenGLView : NSView
+{
+ @public
+ MacOSXWindowInfo* _parent;
+
+ @private
+ NSOpenGLContext* _openGLContext;
+ NSOpenGLPixelFormat* _pixelFormat;
+ NSUInteger _lastModifierFlags;
+ NSUInteger _modifierFlags;
+}
+
++ (NSOpenGLPixelFormat*)defaultPixelFormat;
+- (id)initWithFrame:(NSRect)frameRect pixelFormat:(NSOpenGLPixelFormat*)format;
+- (void)setOpenGLContext:(NSOpenGLContext*)context;
+- (NSOpenGLContext*)openGLContext;
+- (void)clearGLContext;
+- (void)prepareOpenGL;
+- (void)update;
+- (void)lockFocus;
+- (void)setPixelFormat:(NSOpenGLPixelFormat*)pixelFormat;
+- (NSOpenGLPixelFormat*)pixelFormat;
+- (void)setParent:(MacOSXWindowInfo*)parent;
+- (BOOL)acceptsFirstResponder;
+@end
+
+typedef struct {
+ bool isWindowed;
+ bool canDrawGL;
+ MacOSXWindowInfo *window_info;
NSOpenGLPixelFormat *pixel_format;
- bool window;
- bool canDrawGL;
- union {
- NSView *nsview;
- NSOpenGLPixelBuffer *pbuffer;
- };
+ NSOpenGLPixelBuffer *pbuffer;
} MacOSXPeerInfo;
+
NSOpenGLPixelFormat *choosePixelFormat(JNIEnv *env, jobject pixel_format, bool gl32, bool use_display_bpp, bool support_window, bool support_pbuffer, bool double_buffered);
#endif
Modified: branches/osx-java7/LWJGL/src/native/macosx/context.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/context.m 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/native/macosx/context.m 2012-11-01 20:54:17 UTC (rev 3806)
@@ -91,7 +91,16 @@
int bpp;
jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
if (use_display_bpp)
- bpp = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
+ {
+ CGDisplayModeRef mode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);
+ CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode);
+ if (CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ bpp = 32;
+ else if(CFStringCompare(pixEnc, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ bpp = 16;
+ else if(CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ bpp = 8;
+ }
else
bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "bpp", "I"));
Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 20:36:45 UTC (rev 3805)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m 2012-11-01 20:54:17 UTC (rev 3806)
@@ -39,18 +39,433 @@
* @version $Revision$
*/
+#import <AppKit/NSApplication.h>
#import <Cocoa/Cocoa.h>
#import <Carbon/Carbon.h>
-#import <jawt_md.h>
#import <jni.h>
#import <unistd.h>
-//#import "display.h"
#import "common_tools.h"
#import "org_lwjgl_opengl_MacOSXDisplay.h"
#import "org_lwjgl_MacOSXSysImplementation.h"
+#import "context.h"
#define WAIT_DELAY 100
+static NSOpenGLPixelFormat *default_format = nil;
+
+@implementation MacOSXKeyableWindow
+- (BOOL)canBecomeKeyWindow;
+{
+ return YES;
+}
+@end
+
+@implementation MacOSXOpenGLView
+
++ (NSOpenGLPixelFormat*)defaultPixelFormat
+{
+ NSOpenGLPixelFormatAttribute defaultAttribs[] = {
+ NSOpenGLPFADoubleBuffer,
+ NSOpenGLPFADepthSize, 16,
+ NSOpenGLPFAColorSize, 32,
+ 0
+ };
+ if (default_format == nil) {
+ default_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:defaultAttribs];
+ }
+ return default_format;
+}
+
+- (void) windowWillClose:(NSNotification *)notification
+{
+ MacOSXKeyableWindow *closingWindow = [notification object];
+
+ if (_parent != nil && closingWindow == _parent->window) {
+ JNIEnv *env = attachCurrentThread();
+ jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
+ jmethodID close_callback = (*env)->GetMethodID(env, display_class, "doHandleQuit", "()V");
+ (*env)->CallVoidMethod(env, _parent->jdisplay, close_callback);
+ }
+}
+
+- (id)initWithFrame:(NSRect)frameRect pixelFormat:(NSOpenGLPixelFormat*)format
+{
+ self = [super initWithFrame:frameRect];
+ _lastModifierFlags = 0;
+ _modifierFlags = 0;
+ if (self != nil) {
+ _pixelFormat = [format retain];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(_surfaceNeedsUpdate:)
+ name:NSViewGlobalFrameDidChangeNotification
+ object:self];
+ }
+ return self;
+}
+
+- (void) _surfaceNeedsUpdate:(NSNotification*)notification
+{
+ [self update];
+}
+
+- (void)setOpenGLContext:(NSOpenGLContext*)context
+{
+ _openGLContext = context;
+}
+
+- (NSOpenGLContext*)openGLContext
+{
+ return _openGLContext;
+}
+
+- (void)clearGLContext
+{
+ [_openGLContext release];
+ _openGLContext = nil;
+}
+
+- (void)prepareOpenGL
+{
+
+}
+
+- (void)update
+{
+ [_openGLContext update];
+}
+
+- (void)lockFocus
+{
+ NSOpenGLContext* context = [self openGLContext];
+
+ [super lockFocus];
+ if ([context view] != self) {
+ [context setView:self];
+ }
+
+ [context makeCurrentContext];
+}
+
+- (void)setPixelFormat:(NSOpenGLPixelFormat*)pixelFormat
+{
+ _pixelFormat = [pixelFormat retain];
+}
+
+- (NSOpenGLPixelFormat*)pixelFormat
+{
+ return _pixelFormat;
+}
+
+- (BOOL)acceptsFirstResponder {
+ return YES;
+}
+
+- (void)setParent:(MacOSXWindowInfo*)parent {
+ // Un-register for native window close events if we have a parent window already
+ if (_parent != nil) {
+ [[NSNotificationCenter defaultCenter] removeObserver:self
+ name:NSWindowWillCloseNotification
+ object:_parent->window];
+ }
+ _parent = parent;
+ // Register for native window close events if we now have a parent window
+ if (_parent != nil) {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillClose:) name:NSWindowWillCloseNotification
+ object:_parent->window];
+ }
+}
+
+- (void)keyDown:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil || _parent->jkeyboard == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass keyboard_class = (*env)->GetObjectClass(env, _parent->jkeyboard);
+ jmethodID keydown = (*env)->GetMethodID(env, keyboard_class, "keyPressed", "(IIJ)V");
+ const char* charbuf = [[event characters] cStringUsingEncoding:NSASCIIStringEncoding];
+ int charcode = (charbuf == nil) ? 0 : charbuf[0];
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, [event keyCode], charcode, time);
+}
+
+- (void)keyUp:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil || _parent->jkeyboard == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass keyboard_class = (*env)->GetObjectClass(env, _parent->jkeyboard);
+ jmethodID keyup = (*env)->GetMethodID(env, keyboard_class, "keyReleased", "(IIJ)V");
+ const char* charbuf = [[event characters] cStringUsingEncoding:NSASCIIStringEncoding];
+ int charcode = (charbuf == nil) ? 0 : charbuf[0];
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, [event keyCode], charcode, time);
+}
+
+- (void)flagsChanged:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil || _parent->jkeyboard == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass keyboard_class = (*env)->GetObjectClass(env, _parent->jkeyboard);
+ jmethodID keydown = (*env)->GetMethodID(env, keyboard_class, "keyPressed", "(IIJ)V");
+ jmethodID keyup = (*env)->GetMethodID(env, keyboard_class, "keyReleased", "(IIJ)V");
+ _lastModifierFlags = _modifierFlags;
+ _modifierFlags = [event modifierFlags];
+ NSUInteger flagDown = ~_lastModifierFlags & _modifierFlags;
+ NSUInteger flagUp = _lastModifierFlags & ~_modifierFlags;
+ if (flagDown & NSAlphaShiftKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf0, 0, time);
+ }
+ if (flagUp & NSAlphaShiftKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf0, 0, time);
+ }
+ if (flagDown & NSShiftKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf1, 0, time);
+ }
+ if (flagUp & NSShiftKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf1, 0, time);
+ }
+ if (flagDown & NSControlKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf2, 0, time);
+ }
+ if (flagUp & NSControlKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf2, 0, time);
+ }
+ if (flagDown & NSAlternateKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf3, 0, time);
+ }
+ if (flagUp & NSAlternateKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf3, 0, time);
+ }
+ if (flagDown & NSCommandKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf4, 0, time);
+ }
+ if (flagUp & NSCommandKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf4, 0, time);
+ }
+ if (flagDown & NSNumericPadKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keydown, 0xf5, 0, time);
+ }
+ if (flagUp & NSNumericPadKeyMask) {
+ (*env)->CallVoidMethod(env, _parent->jkeyboard, keyup, 0xf5, 0, time);
+ }
+ //const char* charbuf = [[event characters] cStringUsingEncoding:NSASCIIStringEncoding];
+ //(*env)->CallVoidMethod(env, _parent->jkeyboard, keymod, (jint)[event keyCode], (jint)charbuf[0], time);
+}
+
+- (void)mouseButtonState:(NSEvent *)event :(int)button :(int)state {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil || _parent->jkeyboard == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+ jmethodID mousebutton = (*env)->GetMethodID(env, mouse_class, "setButton", "(IIJ)V");
+ (*env)->CallVoidMethod(env, _parent->jmouse, mousebutton, button, state, time);
+}
+
+- (void)mouseDown:(NSEvent *)event {
+ [self mouseButtonState:event :0 :1];
+}
+
+- (void)rightMouseDown:(NSEvent *)event {
+ [self mouseButtonState:event :1 :1];
+}
+
+- (void)otherMouseDown:(NSEvent *)event {
+ [self mouseButtonState:event :2 :1];
+}
+
+- (void)mouseUp:(NSEvent *)event {
+ [self mouseButtonState:event :0 :0];
+}
+
+- (void)rightMouseUp:(NSEvent *)event {
+ [self mouseButtonState:event :1 :0];
+}
+
+- (void)otherMouseUp:(NSEvent *)event {
+ [self mouseButtonState:event :2 :0];
+}
+
+- (void)mouseDragged:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+ jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+ NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+ (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
+}
+
+- (void)mouseMoved:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil || _parent->jmouse == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+ jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+ NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+ (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
+}
+
+- (void)scrollWheel:(NSEvent *)event {
+ JNIEnv *env = attachCurrentThread();
+ if (env == nil || event == nil || _parent == nil) {
+ return;
+ }
+ long time = [event timestamp] * 1000000000;
+ float dz = [event scrollingDeltaY];
+ if (![event hasPreciseScrollingDeltas]) {
+ dz *= 12; // or so
+ }
+ jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+ jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+ NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+ (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
+}
+
+- (void)viewDidMoveToWindow
+{
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowResized:)
+ name:NSWindowDidResizeNotification
+ object:[self window]];
+}
+
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
+- (void)windowResized:(NSNotification *)notification;
+{
+ if (_parent != nil) {
+ _parent->display_rect = [[self window] frame];
+ _parent->resized = JNI_TRUE;
+ }
+}
+@end
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nIsMiniaturized(JNIEnv *env, jobject this, jobject window_handle) {
+ MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+ return (jboolean)[window_info->window isMiniaturized];
+}
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nIsFocused(JNIEnv *env, jobject this, jobject window_handle) {
+ return JNI_TRUE;
+ //MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+ //return (jboolean)([window_info->window isKeyWindow] || [window_info->window isMainWindow]);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nResizeWindow(JNIEnv *env, jobject this, jobject window_handle, jint x, jint y, jint width, jint height) {
+ MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+ window_info->display_rect = NSMakeRect(x, y, width, height);
+ [window_info->window setFrame:window_info->display_rect display:false];
+ [window_info->view ...
[truncated message content] |
|
From: <ma...@us...> - 2012-11-01 20:36:52
|
Revision: 3805
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3805&view=rev
Author: matzon
Date: 2012-11-01 20:36:45 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Creating branch for EmuMogs osx-java7 work
Added Paths:
-----------
branches/osx-java7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-10-16 14:53:31
|
Revision: 3804
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3804&view=rev
Author: spasi
Date: 2012-10-16 14:53:19 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Added support for AMD_shader_trinary_minmax, INTEL_map_texture and NV_draw_texture.
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/INTEL_map_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_draw_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_texture.java
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2012-09-30 09:48:01 UTC (rev 3803)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2012-10-16 14:53:19 UTC (rev 3804)
@@ -21,7 +21,7 @@
<property name="lwjgl.src.templates.cl" location="${lwjgl.src.templates}/org/lwjgl/opencl"/>
<property name="openal-template-pattern" value="AL*.java,EFX*.java"/>
- <property name="opengl-template-pattern" value="GL*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,APPLE*.java,ATI*.java,NV*.java,NVX*.java,HP*.java,IBM*.java,SUN*.java,SGIS*.java,GREMEDY*.java"/>
+ <property name="opengl-template-pattern" value="GL*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,APPLE*.java,ATI*.java,NV*.java,NVX*.java,HP*.java,IBM*.java,SUN*.java,SGIS*.java,GREMEDY*.java,INTEL*.java"/>
<property name="opengles-template-pattern" value="GLES*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,ANGLE*.java,APPLE*.java,ARM*.java,DMP*.java,IMG*.java,NV*.java,OES*.java,QCOM*.java,VIV*.java"/>
<property name="opencl-template-pattern-extensions" value="KHR*.java,EXT*.java,APPLE*.java,AMD*.java,INTEL*.java,NV*.java"/>
<property name="opencl-template-pattern" value="CL*.java,${opencl-template-pattern-extensions}"/>
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java 2012-10-16 14:53:19 UTC (rev 3804)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2012 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.opengl;
+
+public interface AMD_shader_trinary_minmax {
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/INTEL_map_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/INTEL_map_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/INTEL_map_texture.java 2012-10-16 14:53:19 UTC (rev 3804)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2002-2012 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.opengl;
+
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface INTEL_map_texture {
+
+ /** Accepted by the <pname> parameter of TexParameteri, for target TEXTURE_2D */
+ int GL_TEXTURE_MEMORY_LAYOUT_INTEL = 0x83FF;
+
+ /**
+ * Accepted by the <params> when <pname> is set to
+ * <TEXTURE_MEMORY_LAYOUT_INTEL>:
+ */
+ int GL_LAYOUT_DEFAULT_INTEL = 0,
+ GL_LAYOUT_LINEAR_INTEL = 1,
+ GL_LAYOUT_LINEAR_CPU_CACHED_INTEL = 2;
+
+ /**
+ * The length parameter does not exist in the native API. It used by LWJGL to return a ByteBuffer
+ * with a proper capacity.
+ */
+ @CachedResult(isRange = true)
+ @GLvoid
+ @AutoSize("length")
+ ByteBuffer glMapTexture2DINTEL(@GLuint int texture, int level, @Helper(passToNative = true) @GLsizeiptr long length, @GLbitfield int access,
+ @Check("1") @OutParameter IntBuffer stride, @Check("1") @OutParameter @GLenum IntBuffer layout);
+
+ void glUnmapTexture2DINTEL(@GLuint int texture, int level);
+
+ void glSyncTextureINTEL(@GLuint int texture);
+
+}
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_draw_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_draw_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_draw_texture.java 2012-10-16 14:53:19 UTC (rev 3804)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2002-2012 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.opengl;
+
+import org.lwjgl.util.generator.opengl.GLfloat;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface NV_draw_texture {
+
+ void glDrawTextureNV(@GLuint int texture, @GLuint int sampler,
+ @GLfloat float x0, @GLfloat float y0,
+ @GLfloat float x1, @GLfloat float y1,
+ @GLfloat float z,
+ @GLfloat float s0, @GLfloat float t0,
+ @GLfloat float s1, @GLfloat float t1);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_draw_texture.java 2012-10-16 14:53:19 UTC (rev 3804)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2002-2012 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.opengles;
+
+import org.lwjgl.util.generator.opengl.GLfloat;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface NV_draw_texture {
+
+ void glDrawTextureNV(@GLuint int texture, @GLuint int sampler,
+ @GLfloat float x0, @GLfloat float y0,
+ @GLfloat float x1, @GLfloat float y1,
+ @GLfloat float z,
+ @GLfloat float s0, @GLfloat float t0,
+ @GLfloat float s1, @GLfloat float t1);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-30 09:48:07
|
Revision: 3803
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3803&view=rev
Author: spasi
Date: 2012-09-30 09:48:01 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Added support for EXT_multiview_draw_buffers. [GLES]
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java 2012-09-30 09:48:01 UTC (rev 3803)
@@ -0,0 +1,67 @@
+/*
+ * 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.opengles;
+
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLreturn;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+import java.nio.IntBuffer;
+
+public interface EXT_multiview_draw_buffers {
+
+ /** Accepted by the <location> parameter of DrawBuffersIndexedEXT: */
+ int GL_COLOR_ATTACHMENT_EXT = 0x90F0,
+ GL_MULTIVIEW_EXT = 0x90F1;
+
+ /** Accepted by the <target> parameter of GetIntegeri_EXT: */
+ int GL_DRAW_BUFFER_EXT = 0x0C01,
+ GL_READ_BUFFER_EXT = 0x0C02;
+
+ /** Accepted by the <target> parameter of GetInteger: */
+ int GL_MAX_MULTIVIEW_BUFFERS_EXT = 0x90F2;
+
+ void glReadBufferIndexedEXT(@GLenum int src, int index);
+
+ void glDrawBuffersIndexedEXT(@AutoSize("indices") int n, @Check("indices.remaining()") @Const @GLenum IntBuffer location,
+ @Const IntBuffer indices);
+
+ @StripPostfix("data")
+ void glGetIntegeri_vEXT(@GLenum int target, @GLuint int index, @OutParameter @Check("4") IntBuffer data);
+
+ @Alternate("glGetIntegeri_vEXT")
+ @GLreturn("data")
+ @StripPostfix("data")
+ void glGetIntegeri_vEXT2(@GLenum int value, @GLuint int index, @OutParameter IntBuffer data);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-29 11:48:35
|
Revision: 3802
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3802&view=rev
Author: spasi
Date: 2012-09-29 11:48:28 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Added support for AMD_sparse_texture.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_sparse_texture.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_sparse_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_sparse_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_sparse_texture.java 2012-09-29 11:48:28 UTC (rev 3802)
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2002-2011 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.opengl;
+
+import org.lwjgl.util.generator.opengl.GLbitfield;
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface AMD_sparse_texture {
+
+ /** Accepted by the <flags> parameter to TexStorageSparseAMD and TextureStorageSparseAMD: */
+ int GL_TEXTURE_STORAGE_SPARSE_BIT_AMD = 0x00000001;
+
+ /** Accepted by the <pname> parameter to GetInternalformativ: */
+ int GL_VIRTUAL_PAGE_SIZE_X_AMD = 0x9195,
+ GL_VIRTUAL_PAGE_SIZE_Y_AMD = 0x9196,
+ GL_VIRTUAL_PAGE_SIZE_Z_AMD = 0x9197;
+
+ /**
+ * Accepted by the <pname> parameter to GetIntegerv, GetFloatv, GetDoublev,
+ * GetInteger64v, and GetBooleanv:
+ */
+ int GL_MAX_SPARSE_TEXTURE_SIZE_AMD = 0x9198,
+ GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD = 0x9199,
+ GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
+
+ /** Accepted by the <pname> parameter of GetTexParameter{if}v: */
+ int GL_MIN_SPARSE_LEVEL_AMD = 0x919B;
+
+ /**
+ * Accepted by the <pname> parameter of TexParameter{if}{v} and
+ * GetTexParameter{if}v:
+ */
+ int GL_MIN_LOD_WARNING_AMD = 0x919C;
+
+ void glTexStorageSparseAMD(@GLenum int target,
+ @GLenum int internalFormat,
+ @GLsizei int width,
+ @GLsizei int height,
+ @GLsizei int depth,
+ @GLsizei int layers,
+ @GLbitfield int flags);
+
+ void glTextureStorageSparseAMD(@GLuint int texture,
+ @GLenum int target,
+ @GLenum int internalFormat,
+ @GLsizei int width,
+ @GLsizei int height,
+ @GLsizei int depth,
+ @GLsizei int layers,
+ @GLbitfield int flags);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-21 00:27:20
|
Revision: 3801
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3801&view=rev
Author: spasi
Date: 2012-09-21 00:27:14 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
Added new GLES extensions.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_sync.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/APPLE_sync.java 2012-09-21 00:27:14 UTC (rev 3801)
@@ -0,0 +1,112 @@
+/*
+ * 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.opengles;
+
+import org.lwjgl.opengl.GLSync;
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+
+public interface APPLE_sync {
+
+ /** Accepted as the <pname> parameter of GetInteger64vAPPLE: */
+ int GL_MAX_SERVER_WAIT_TIMEOUT_APPLE = 0x9111;
+
+ /** Accepted as the <pname> parameter of GetSyncivAPPLE: */
+ int GL_OBJECT_TYPE_APPLE = 0x9112,
+ SYNC_CONDITION_APPLE = 0x9113,
+ SYNC_STATUS_APPLE = 0x9114,
+ SYNC_FLAGS_APPLE = 0x9115;
+
+ /** Returned in <values> for GetSynciv <pname> OBJECT_TYPE_APPLE: */
+ int GL_SYNC_FENCE_APPLE = 0x9116;
+
+ /** Returned in <values> for GetSyncivAPPLE <pname> SYNC_CONDITION_APPLE: */
+ int GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE = 0x9117;
+
+ /** Returned in <values> for GetSyncivAPPLE <pname> SYNC_STATUS_APPLE: */
+ int GL_UNSIGNALED_APPLE = 0x9118,
+ SIGNALED_APPLE = 0x9119;
+
+ /** Accepted in the <flags> parameter of ClientWaitSyncAPPLE: */
+ int GL_SYNC_FLUSH_COMMANDS_BIT_APPLE = 0x00000001;
+
+ /** Accepted in the <timeout> parameter of WaitSyncAPPLE: */
+ long GL_TIMEOUT_IGNORED_APPLE = 0xFFFFFFFFFFFFFFFFl;
+
+ /** Returned by ClientWaitSyncAPPLE: */
+ int GL_ALREADY_SIGNALED_APPLE = 0x911A,
+ TIMEOUT_EXPIRED_APPLE = 0x911B,
+ CONDITION_SATISFIED_APPLE = 0x911C,
+ WAIT_FAILED_APPLE = 0x911D;
+
+ /**
+ * Accepted by the <type> parameter of LabelObjectEXT and
+ * GetObjectLabelEXT:
+ */
+ int GL_SYNC_OBJECT_APPLE = 0x8A53;
+
+ @PointerWrapper("GLsync")
+ org.lwjgl.opengl.GLSync glFenceSyncAPPLE(@GLenum int condition, @GLbitfield int flags);
+
+ boolean glIsSyncAPPLE(@PointerWrapper("GLsync") org.lwjgl.opengl.GLSync sync);
+
+ void glDeleteSyncAPPLE(@PointerWrapper("GLsync") org.lwjgl.opengl.GLSync sync);
+
+ @GLenum
+ int glClientWaitSyncAPPLE(@PointerWrapper("GLsync") org.lwjgl.opengl.GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
+
+ void glWaitSyncAPPLE(@PointerWrapper("GLsync") org.lwjgl.opengl.GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
+
+ @StripPostfix("params")
+ void glGetInteger64vAPPLE(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
+
+ @Alternate("glGetInteger64vAPPLE")
+ @GLreturn("params")
+ @StripPostfix(value = "params", postfix = "v")
+ void glGetInteger64vAPPLE2(@GLenum int pname, @OutParameter @GLint64 LongBuffer params);
+
+ @StripPostfix("values")
+ void glGetSyncivAPPLE(@PointerWrapper("GLsync") org.lwjgl.opengl.GLSync sync, @GLenum int pname, @AutoSize("values") @GLsizei int bufSize,
+ @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
+ @OutParameter IntBuffer values);
+
+ @Alternate("glGetSyncivAPPLE")
+ @GLreturn("values")
+ @StripPostfix(value = "values", postfix = "v")
+ void glGetSyncivAPPLE2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
+ @OutParameter @GLsizei @Constant("0L") IntBuffer length,
+ @OutParameter IntBuffer values);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java 2012-09-21 00:27:14 UTC (rev 3801)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface EXT_copy_texture_levels {
+
+ void glCopyTextureLevelsAPPLE(@GLuint int destinationTexture, @GLuint int sourceTexture,
+ int sourceBaseLevel, @GLsizei int sourceLevelCount);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java 2012-09-21 00:27:14 UTC (rev 3801)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2002-2012 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.opengles;
+
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.CachedResult;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.ByteBuffer;
+
+public interface EXT_map_buffer_range {
+
+ /** Accepted by the <access> parameter of MapBufferRangeEXT: */
+ int GL_MAP_READ_BIT_EXT = 0x0001,
+ GL_MAP_WRITE_BIT_EXT = 0x0002,
+ GL_MAP_INVALIDATE_RANGE_BIT_EXT = 0x0004,
+ GL_MAP_INVALIDATE_BUFFER_BIT_EXT = 0x0008,
+ GL_MAP_FLUSH_EXPLICIT_BIT_EXT = 0x0010,
+ GL_MAP_UNSYNCHRONIZED_BIT_EXT = 0x0020;
+
+ /**
+ * glMapBufferRange maps a GL buffer object range to a ByteBuffer. The old_buffer argument can be null,
+ * in which case a new ByteBuffer will be created, pointing to the returned memory. If old_buffer is non-null,
+ * it will be returned if it points to the same mapped memory and has the same capacity as the buffer object,
+ * otherwise a new ByteBuffer is created. That way, an application will normally use glMapBufferRange like this:
+ * <p/>
+ * ByteBuffer mapped_buffer; mapped_buffer = glMapBufferRange(..., ..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferRange(..., ..., ..., ..., mapped_buffer);
+ * <p/>
+ * Only ByteBuffers returned from this method are to be passed as the old_buffer argument. User-created ByteBuffers cannot be reused.
+ *
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
+ *
+ * @return A ByteBuffer representing the mapped buffer memory.
+ */
+ @CachedResult(isRange = true)
+ @GLvoid
+ @AutoSize("length")
+ ByteBuffer glMapBufferRangeEXT(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+
+ void glFlushMappedBufferRangeEXT(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java 2012-09-21 00:27:14 UTC (rev 3801)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2012 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.opengles;
+
+public interface EXT_shader_framebuffer_fetch {
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+ * and GetDoublev:
+ */
+ int GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT = 0x8A52;
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-09-12 21:00:54
|
Revision: 3800
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3800&view=rev
Author: kappa1
Date: 2012-09-12 21:00:48 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Set a name for LWJGL's Sync class timer accuracy thread ("LWJGL Timer") for debugging purposes. RFE by NateS.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/Sync.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Sync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Sync.java 2012-09-12 11:29:40 UTC (rev 3799)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Sync.java 2012-09-12 21:00:48 UTC (rev 3800)
@@ -118,6 +118,7 @@
}
});
+ timerAccuracyThread.setName("LWJGL Timer");
timerAccuracyThread.setDaemon(true);
timerAccuracyThread.start();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-09-12 11:29:51
|
Revision: 3799
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3799&view=rev
Author: kappa1
Date: 2012-09-12 11:29:40 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Fix Matrix*f.negate(Matrix*f dest) methods in Matrix2f, Matrix3f and Matrix4f classes. Thx to Jegorex for finding, reporting and providing fix on forum.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix2f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix3f.java
trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix2f.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix2f.java 2012-09-10 07:51:13 UTC (rev 3798)
+++ trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix2f.java 2012-09-12 11:29:40 UTC (rev 3799)
@@ -333,7 +333,7 @@
* @return the negated matrix
*/
public Matrix2f negate(Matrix2f dest) {
- return negate(this, this);
+ return negate(this, dest);
}
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix3f.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix3f.java 2012-09-10 07:51:13 UTC (rev 3798)
+++ trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix3f.java 2012-09-12 11:29:40 UTC (rev 3799)
@@ -431,7 +431,7 @@
* @return the negated matrix
*/
public Matrix3f negate(Matrix3f dest) {
- return negate(this, this);
+ return negate(this, dest);
}
/**
Modified: trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java 2012-09-10 07:51:13 UTC (rev 3798)
+++ trunk/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java 2012-09-12 11:29:40 UTC (rev 3799)
@@ -814,7 +814,7 @@
* @return the negated matrix
*/
public Matrix4f negate(Matrix4f dest) {
- return negate(this, this);
+ return negate(this, dest);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-10 07:51:24
|
Revision: 3798
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3798&view=rev
Author: spasi
Date: 2012-09-10 07:51:13 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Changed keyName array size to match KEYBOARD_SIZE.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2012-09-06 07:11:54 UTC (rev 3797)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2012-09-10 07:51:13 UTC (rev 3798)
@@ -216,7 +216,7 @@
private static final int BUFFER_SIZE = 50;
/** Key names */
- private static final String[] keyName = new String[255];
+ private static final String[] keyName = new String[KEYBOARD_SIZE];
private static final Map<String, Integer> keyMap = new HashMap<String, Integer>(253);
private static int counter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-06 07:12:06
|
Revision: 3797
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3797&view=rev
Author: spasi
Date: 2012-09-06 07:11:54 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Made GLContext.getCapabilities throw a RuntimeException instead of returning null when there's no GL context current in the current thread.
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 2012-09-05 22:37:11 UTC (rev 3796)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2012-09-06 07:11:54 UTC (rev 3797)
@@ -119,6 +119,14 @@
* @return The current capabilities instance.
*/
public static ContextCapabilities getCapabilities() {
+ ContextCapabilities caps = getCapabilitiesImpl();
+ if ( caps == null )
+ throw new RuntimeException("No OpenGL context found in the current thread.");
+
+ return caps;
+ }
+
+ private static ContextCapabilities getCapabilitiesImpl() {
CapabilitiesCacheEntry recent_cache_entry = fast_path_cache;
// Check owner of cache entry
if ( recent_cache_entry.owner == Thread.currentThread() ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-09-05 22:37:18
|
Revision: 3796
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3796&view=rev
Author: kappa1
Date: 2012-09-05 22:37:11 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
AppletLoader: Fix NumberFormatException when parsing version string on an EA or beta JVM, thx to UltraMoogleMan for spotting and reporting
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2012-09-03 20:44:11 UTC (rev 3795)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2012-09-05 22:37:11 UTC (rev 3796)
@@ -944,6 +944,10 @@
String minimumVersion = getStringParameter("al_min_jre", "1.5");
String javaVersion = System.getProperty("java.version");
+ // remove dash and anything after it (letters) from version string e.g. 1.5.0_01-ea
+ minimumVersion = javaVersion.split("-")[0];
+ javaVersion = minimumVersion.split("-")[0];
+
// split version string into a string arrays
String[] jvmVersionData = javaVersion.split("[_\\.]");
String[] minVersionData = minimumVersion.split("[_\\.]");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-03 20:44:17
|
Revision: 3795
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3795&view=rev
Author: spasi
Date: 2012-09-03 20:44:11 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fixed test.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java 2012-09-03 20:27:09 UTC (rev 3794)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java 2012-09-03 20:44:11 UTC (rev 3795)
@@ -48,10 +48,10 @@
import static org.lwjgl.opengl.EXTTransformFeedback.*;
import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL12.*;
import static org.lwjgl.opengl.GL15.*;
import static org.lwjgl.opengl.GL20.*;
import static org.lwjgl.opengl.GL30.*;
-import static org.lwjgl.opengl.GL32.*;
/**
* Sprite rendering demo. In this version we're doing the animation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-03 20:27:15
|
Revision: 3794
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3794&view=rev
Author: spasi
Date: 2012-09-03 20:27:09 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Removed GL_BGRA.
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 2012-09-03 19:47:05 UTC (rev 3793)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2012-09-03 20:27:09 UTC (rev 3794)
@@ -70,12 +70,6 @@
@StripPostfix(value = "params", postfix = "v")
void glGetBufferParameteri64v3(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
- // ---------------------------------------------------------------------
- // ----------------------[ ARB_vertex_array_bgra ]----------------------
- // ---------------------------------------------------------------------
-
- int GL_BGRA = 0x80E1;
-
// -----------------------------------------------------------------------------
// ----------------------[ ARB_draw_elements_base_vertex ]----------------------
// -----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-09-03 19:47:12
|
Revision: 3793
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3793&view=rev
Author: spasi
Date: 2012-09-03 19:47:05 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Removed some re-defined GL11 enums.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -47,9 +47,7 @@
* Returned as a valid value in <data> parameter of
* GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD
*/
- int GL_UNSIGNED_INT = 0x1405,
- GL_FLOAT = 0x1406,
- GL_UNSIGNED_INT64_AMD = 0x8BC2,
+ int GL_UNSIGNED_INT64_AMD = 0x8BC2,
GL_PERCENTAGE_AMD = 0x8BC3;
/** Accepted by the <pname> parameter of GetPerfMonitorCounterDataAMD */
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -61,11 +61,9 @@
int GL_SHADER_OBJECT_ARB = 0x8B48;
/** Returned by the <type> parameter of GetActiveUniformARB: */
- int GL_FLOAT = 0x1406;
int GL_FLOAT_VEC2_ARB = 0x8B50;
int GL_FLOAT_VEC3_ARB = 0x8B51;
int GL_FLOAT_VEC4_ARB = 0x8B52;
- int GL_INT = 0x1404;
int GL_INT_VEC2_ARB = 0x8B53;
int GL_INT_VEC3_ARB = 0x8B54;
int GL_INT_VEC4_ARB = 0x8B55;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -71,10 +71,4 @@
int GL_RG = 0x8227;
int GL_RG_INTEGER = 0x8228;
- /**
- * Accepted by the <param> parameter of the TexParameter{if}*
- * functions when <pname> is DEPTH_TEXTURE_MODE:
- */
- int GL_RED = 0x1903;
-
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -81,7 +81,6 @@
int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
/** Returned by the <type> parameter of GetActiveAttribARB: */
- int GL_FLOAT = 0x1406;
int GL_FLOAT_VEC2_ARB = 0x8B50;
int GL_FLOAT_VEC3_ARB = 0x8B51;
int GL_FLOAT_VEC4_ARB = 0x8B52;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -57,7 +57,6 @@
int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3;
int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4;
int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5;
- int GL_UNSIGNED_INT = 0x1405;
int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6;
int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7;
int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -47,8 +47,6 @@
* Returned as a valid value in <data> parameter of
* GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD
*/
- int GL_UNSIGNED_INT = 0x1405;
- int GL_FLOAT = 0x1406;
int GL_UNSIGNED_INT64_AMD = 0x8BC2;
int GL_PERCENTAGE_AMD = 0x8BC3;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-08-28 09:06:36 UTC (rev 3792)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-09-03 19:47:05 UTC (rev 3793)
@@ -32,11 +32,4 @@
package org.lwjgl.opengles;
public interface OES_texture_float {
-
- /**
- * Accepted by the <type> parameter of TexImage2D, TexSubImage2D,
- * TexImage3D, and TexSubImage3D:
- */
- int GL_FLOAT = 0x1406;
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-08-28 09:06:46
|
Revision: 3792
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3792&view=rev
Author: spasi
Date: 2012-08-28 09:06:36 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Translate extended keys before the state check.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2012-08-23 14:20:58 UTC (rev 3791)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2012-08-28 09:06:36 UTC (rev 3792)
@@ -155,10 +155,10 @@
}
public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
+ virt_key = translateExtended(virt_key, scan_code, event_state, extended);
if ( !repeat && isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
return;
- virt_key = translateExtended(virt_key, scan_code, event_state, extended);
flushRetained();
has_retained_event = true;
int keycode = WindowsKeycodes.mapVirtualKeyToLWJGLCode(virt_key);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1095 messages has been excluded from this view by a project administrator.
