java-game-lib-cvs — Commits to the repository will be send to this list.

[Java-game-lib-cvs] CVS: LWJGL/src/native/common Makefile.am,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv23246/common

Added Files:
	Makefile.am 
Log Message:

initial autoconf/automake support =)


--- NEW FILE: Makefile.am ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am
noinst_LTLIBRARIES = libcommon.la

libcommon_la_SOURCES = $(COMMON)
liblwjgl_la_CPPFLAGS = -D_DEBUG

COMMON = \
  extal.c \
  extal.h \
  extgl.c \
  extgl.h \
  org_lwjgl_Display.h \
  org_lwjgl_Sys.h \
  org_lwjgl_input_GamePad.h \
  org_lwjgl_input_Joystick.h \
  org_lwjgl_input_Keyboard.h \
  org_lwjgl_input_Mouse.h \
  MatrixOpCommon.cpp \
  MatrixOpCommon.h \
  org_lwjgl_Math.cpp \
  org_lwjgl_Math.h \
  org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h \
  org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.cpp \
  org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h \
  org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.cpp \
  org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h \
  org_lwjgl_openal_ALC.cpp \
  org_lwjgl_openal_ALC.h \
  org_lwjgl_openal_ALUT.cpp \
  org_lwjgl_openal_ALUT.h \
  org_lwjgl_openal_BaseAL.cpp \
  org_lwjgl_openal_BaseAL.h \
  org_lwjgl_openal_CoreAL.cpp \
  org_lwjgl_openal_CoreAL.h \
  org_lwjgl_openal_eax_BaseEAX.cpp \
  org_lwjgl_openal_eax_BaseEAX.h \
  org_lwjgl_openal_eax_CoreEAX.cpp \
  org_lwjgl_openal_eax_CoreEAX.h \
  org_lwjgl_openal_eax_EAXBufferProperties.cpp \
  org_lwjgl_openal_eax_EAXBufferProperties.h \
  org_lwjgl_openal_eax_EAXListenerProperties.cpp \
  org_lwjgl_openal_eax_EAXListenerProperties.h \
  org_lwjgl_opengl_CoreGL.cpp \
  org_lwjgl_opengl_CoreGL.h \
  org_lwjgl_opengl_GL.cpp \
  org_lwjgl_opengl_GL.h \
  org_lwjgl_opengl_GLU.cpp \
  org_lwjgl_opengl_GLU.h
  

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux Makefile.am,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv23246/linux

Added Files:
	Makefile.am 
Log Message:

initial autoconf/automake support =)


--- NEW FILE: Makefile.am ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.am
noinst_LTLIBRARIES = liblinux.la

liblinux_la_SOURCES = $(NATIVE)
INCLUDES = -I../common

NATIVE = \
  org_lwjgl_Display.cpp \
  org_lwjgl_Sys.cpp \
  org_lwjgl_input_GamePad.cpp \
  org_lwjgl_input_Joystick.cpp \
  org_lwjgl_input_Keyboard.cpp \
  org_lwjgl_input_Mouse.cpp \
  org_lwjgl_opengl_BaseGL.cpp

  

[Java-game-lib-cvs] CVS: LWJGL/src/native/admin config.guess,NONE,1.1 config.sub,NONE,1.1 install-sh,NONE,1.1 ltmain.sh,NONE,1.1 missing,NONE,1.1 mkinstalldirs,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv23246/admin

Added Files:
	config.guess config.sub install-sh ltmain.sh missing 
	mkinstalldirs 
Log Message:

initial autoconf/automake support =)


--- NEW FILE: config.guess ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/config.guess
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
#   Free Software Foundation, Inc.

timestamp='2001-08-23'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
[...1278 lines suppressed...]
/bin/universe          = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch              = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM  = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:

--- NEW FILE: config.sub ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/config.sub
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
#   Free Software Foundation, Inc.

timestamp='2001-08-23'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1371 lines suppressed...]
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit 0

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:

--- NEW FILE: install-sh ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/install-sh
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
#
# Copyright 1991 by the Massachusetts Institute of Technology
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission.  M.I.T. makes no representations about the
# suitability of this software for any purpose.  It is provided "as is"
# without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.  It can only install one file at a time, a restriction
# shared with many OS's install programs.


# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"


# put in absolute paths if you don't have them in your path; or use env. vars.

mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"

transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""

while [ x"$1" != x ]; do
    case $1 in
	-c) instcmd="$cpprog"
	    shift
	    continue;;

	-d) dir_arg=true
	    shift
	    continue;;

	-m) chmodcmd="$chmodprog $2"
	    shift
	    shift
	    continue;;

	-o) chowncmd="$chownprog $2"
	    shift
	    shift
	    continue;;

	-g) chgrpcmd="$chgrpprog $2"
	    shift
	    shift
	    continue;;

	-s) stripcmd="$stripprog"
	    shift
	    continue;;

	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
	    shift
	    continue;;

	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
	    shift
	    continue;;

	*)  if [ x"$src" = x ]
	    then
		src=$1
	    else
		# this colon is to work around a 386BSD /bin/sh bug
		:
		dst=$1
	    fi
	    shift
	    continue;;
    esac
done

if [ x"$src" = x ]
then
	echo "install:	no input file specified"
	exit 1
else
	:
fi

if [ x"$dir_arg" != x ]; then
	dst=$src
	src=""
	
	if [ -d $dst ]; then
		instcmd=:
		chmodcmd=""
	else
		instcmd=$mkdirprog
	fi
else

# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad 
# if $src (and thus $dsttmp) contains '*'.

	if [ -f $src -o -d $src ]
	then
		:
	else
		echo "install:  $src does not exist"
		exit 1
	fi
	
	if [ x"$dst" = x ]
	then
		echo "install:	no destination specified"
		exit 1
	else
		:
	fi

# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic

	if [ -d $dst ]
	then
		dst="$dst"/`basename $src`
	else
		:
	fi
fi

## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

# Make sure that the destination directory exists.
#  this part is taken from Noah Friedman's mkinstalldirs script

# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
	'
IFS="${IFS-${defaultIFS}}"

oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"

pathcomp=''

while [ $# -ne 0 ] ; do
	pathcomp="${pathcomp}${1}"
	shift

	if [ ! -d "${pathcomp}" ] ;
        then
		$mkdirprog "${pathcomp}"
	else
		:
	fi

	pathcomp="${pathcomp}/"
done
fi

if [ x"$dir_arg" != x ]
then
	$doit $instcmd $dst &&

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else

# If we're going to rename the final executable, determine the name now.

	if [ x"$transformarg" = x ] 
	then
		dstfile=`basename $dst`
	else
		dstfile=`basename $dst $transformbasename | 
			sed $transformarg`$transformbasename
	fi

# don't allow the sed command to completely eliminate the filename

	if [ x"$dstfile" = x ] 
	then
		dstfile=`basename $dst`
	else
		:
	fi

# Make a temp file name in the proper directory.

	dsttmp=$dstdir/#inst.$$#

# Move or copy the file name to the temp name

	$doit $instcmd $src $dsttmp &&

	trap "rm -f ${dsttmp}" 0 &&

# and set any options; do chmod last to preserve setuid bits

# If any of these fail, we abort the whole thing.  If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&

# Now rename the file to the real destination.

	$doit $rmcmd -f $dstdir/$dstfile &&
	$doit $mvcmd $dsttmp $dstdir/$dstfile 

fi &&


exit 0

--- NEW FILE: ltmain.sh ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/ltmain.sh
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <go...@gn...>, 1996
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
[...5068 lines suppressed...]
If FILE is a libtool library, all the files associated with it are deleted.
Otherwise, only FILE itself is deleted using RM."
  ;;

*)
  $echo "$modename: invalid operation mode \`$mode'" 1>&2
  $echo "$help" 1>&2
  exit 1
  ;;
esac

echo
$echo "Try \`$modename --help' for more information about other modes."

exit 0

# Local Variables:
# mode:shell-script
# sh-indentation:2
# End:

--- NEW FILE: missing ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/missing
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pi...@ir...>, 1996.

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.

# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.

if test $# -eq 0; then
  echo 1>&2 "Try \`$0 --help' for more information"
  exit 1
fi

run=:

# In the cases where this matters, `missing' is being run in the
# srcdir already.
if test -f configure.ac; then
  configure_ac=configure.ac
else
  configure_ac=configure.in
fi

case "$1" in
--run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  ;;
esac

# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case "$1" in

  -h|--h|--he|--hel|--help)
    echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...

Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.

Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit
  --run           try to run the given command, and emulate it if it fails

Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
  help2man     touch the output file
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
    ;;

  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    echo "missing 0.4 - GNU automake"
    ;;

  -*)
    echo 1>&2 "$0: Unknown \`$1' option"
    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
    ;;

  aclocal*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;

  autoconf)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;

  autoheader)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case "$f" in
      *:*) touch_files="$touch_files "`echo "$f" |
				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;

  automake*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
	   sed 's/\.am$/.in/' |
	   while read f; do touch "$f"; done
    ;;

  autom4te)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
         system.  You might have modified some files without having the
         proper tools for further handling them.
         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
         archive site."

    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
    if test -f "$file"; then
	touch $file
    else
	test -z "$file" || exec >$file
	echo "#! /bin/sh"
	echo "# Created by GNU Automake missing as a replacement of"
	echo "#  $ $@"
	echo "exit 0"
	chmod +x $file
	exit 1
    fi
    ;;

  bison|yacc)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
	case "$LASTARG" in
	*.y)
	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" y.tab.c
	    fi
	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" y.tab.h
	    fi
	  ;;
	esac
    fi
    if [ ! -f y.tab.h ]; then
	echo >y.tab.h
    fi
    if [ ! -f y.tab.c ]; then
	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;

  lex|flex)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
	case "$LASTARG" in
	*.l)
	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" lex.yy.c
	    fi
	  ;;
	esac
    fi
    if [ ! -f lex.yy.c ]; then
	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;

  help2man)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
	 you modified a dependency of a manual page.  You may need the
	 \`Help2man' package in order for those modifications to take
	 effect.  You can get \`Help2man' from any GNU archive site."

    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
    fi
    if [ -f "$file" ]; then
	touch $file
    else
	test -z "$file" || exec >$file
	echo ".ab help2man is required to generate this page"
	exit 1
    fi
    ;;

  makeinfo)
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
       # We have makeinfo, but it failed.
       exit 1
    fi

    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
    fi
    touch $file
    ;;

  tar)
    shift
    if test -n "$run"; then
      echo 1>&2 "ERROR: \`tar' requires --run"
      exit 1
    fi

    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
    # messages.
    if (gnutar --version > /dev/null 2>&1); then
       gnutar ${1+"$@"} && exit 0
    fi
    if (gtar --version > /dev/null 2>&1); then
       gtar ${1+"$@"} && exit 0
    fi
    firstarg="$1"
    if shift; then
	case "$firstarg" in
	*o*)
	    firstarg=`echo "$firstarg" | sed s/o//`
	    tar "$firstarg" ${1+"$@"} && exit 0
	    ;;
	esac
	case "$firstarg" in
	*h*)
	    firstarg=`echo "$firstarg" | sed s/h//`
	    tar "$firstarg" ${1+"$@"} && exit 0
	    ;;
	esac
    fi

    echo 1>&2 "\
WARNING: I can't seem to be able to run \`tar' with the given arguments.
         You may want to install GNU tar or Free paxutils, or check the
         command line arguments."
    exit 1
    ;;

  *)
    echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
         system.  You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
         it often tells you about the needed prerequirements for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
    ;;
esac

exit 0

--- NEW FILE: mkinstalldirs ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/admin/mkinstalldirs
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <fri...@pr...>
# Created: 1993-05-16
# Public domain

# $Id: mkinstalldirs,v 1.1 2002/11/28 22:40:06 lholden Exp $

errstatus=0
dirmode=""

usage="\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."

# process command line arguments
while test $# -gt 0 ; do
   case "${1}" in
     -h | --help | --h* )			# -h for help
	echo "${usage}" 1>&2; exit 0 ;;
     -m )					# -m PERM arg
	shift
	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
	dirmode="${1}"
	shift ;;
     -- ) shift; break ;;			# stop option processing
     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
     * )  break ;;				# first non-opt arg
   esac
done

for file
do
  if test -d "$file"; then
    shift
  else
    break
  fi
done

case $# in
0) exit 0 ;;
esac

case $dirmode in
'')
  if mkdir -p -- . 2>/dev/null; then
    echo "mkdir -p -- $*"
    exec mkdir -p -- "$@"
  fi ;;
*)
  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
    echo "mkdir -m $dirmode -p -- $*"
    exec mkdir -m "$dirmode" -p -- "$@"
  fi ;;
esac

for file
do
   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
   shift

   pathcomp=
   for d
   do
     pathcomp="$pathcomp$d"
     case "$pathcomp" in
       -* ) pathcomp=./$pathcomp ;;
     esac

     if test ! -d "$pathcomp"; then
	echo "mkdir $pathcomp"

	mkdir "$pathcomp" || lasterr=$?

	if test ! -d "$pathcomp"; then
	  errstatus=$lasterr
	else
	  if test ! -z "$dirmode"; then
	     echo "chmod $dirmode $pathcomp"

	     lasterr=""
	     chmod "$dirmode" "$pathcomp" || lasterr=$?

	     if test ! -z "$lasterr"; then
	       errstatus=$lasterr
	     fi
	  fi
	fi
     fi

     pathcomp="$pathcomp/"
   done
done

exit $errstatus

# Local Variables:
# mode: shell-script
# sh-indentation: 3
# End:
# mkinstalldirs ends here

[Java-game-lib-cvs] CVS: LWJGL/src/native AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 INSTALL,NONE,1.1 Makefile.am,NONE,1.1 NEWS,NONE,1.1 README,NONE,1.1 acinclude.m4,NONE,1.1 aclocal.m4,NONE,1.1 autogen.sh,NONE,1.1 config.h.in,NONE,1.1 configure.in,NONE,1.1 dummy.c,NONE,1.1 stamp-h.in,NONE,1.1 subdirs,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv23246

Added Files:
	AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README 
	acinclude.m4 aclocal.m4 autogen.sh config.h.in configure.in 
	dummy.c stamp-h.in subdirs 
Log Message:

initial autoconf/automake support =)


--- NEW FILE: AUTHORS ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/AUTHORS

--- NEW FILE: COPYING ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/COPYING

--- NEW FILE: ChangeLog ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/ChangeLog

--- NEW FILE: INSTALL ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/INSTALL

--- NEW FILE: Makefile.am ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/Makefile.am
SUBDIRS = common linux

lib_LTLIBRARIES = liblwjgl.la


#liblwjgl_la_LDFLAGS = \
#        -release $(LT_RELEASE)  \
#        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
liblwjgl_la_SOURCES = \
  dummy.c
liblwjgl_la_CPPFLAGS = -D_DEBUG
liblwjgl_la_LIBADD = \
  common/libcommon.la \
  linux/liblinux.la
liblwjgl_la_DEPENDENCIES = \
  common/libcommon.la \
  linux/liblinux.la

--- NEW FILE: NEWS ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/NEWS

--- NEW FILE: README ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/README

--- NEW FILE: acinclude.m4 ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4
dnl aclocal.m4 generated automatically by aclocal 1.4-p5

dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.

dnl aclocal.m4 generated automatically by aclocal 1.4-p5

dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

[...3985 lines suppressed...]





















--- NEW FILE: aclocal.m4 ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4
dnl aclocal.m4 generated automatically by aclocal 1.4-p5

dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.

dnl aclocal.m4 generated automatically by aclocal 1.4-p5

dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

[...3998 lines suppressed...]





















--- NEW FILE: autogen.sh ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/autogen.sh
WANT_AUTOCONF_2_5=1
WANT_AUTOMAKE_1_5=1

autoheader linux
mv aclocal.m4 acinclude.m4
aclocal
automake --foreign --include-deps --add-missing --copy
autoconf

--- NEW FILE: config.h.in ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/config.h.in
/* config.h.in.  Generated from configure.in by autoheader.  */

/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `GL' library (-lGL). */
#undef HAVE_LIBGL

/* Define to 1 if you have the `GLU' library (-lGLU). */
#undef HAVE_LIBGLU

/* Define to 1 if you have the `openal' library (-lopenal). */
#undef HAVE_LIBOPENAL

/* Define to 1 if you have the `X11' library (-lX11). */
#undef HAVE_LIBX11

/* Define to 1 if you have the `Xext' library (-lXext). */
#undef HAVE_LIBXEXT

/* Define to 1 if you have the `Xxf86vm' library (-lXxf86vm). */
#undef HAVE_LIBXXF86VM

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Name of package */
#undef PACKAGE

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Version number of package */
#undef VERSION

--- NEW FILE: configure.in ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
dnl Process this file with autoconf to produce a configure script.
AC_INIT(acinclude.m4)

dnl These should be changed =)
LWJGL_MAJOR_VERSION=0
LWJGL_MINOR_VERSION=0
LWJGL_MICRO_VERSION=0
LWJGL_INTERFACE_AGE=1
LWJGL_BINARY_AGE=1
LWJGL_VERSION=$LWJGL_MAJOR_VERSION.$LWJGL_MINOR_VERSION.$LWJGL_MICRO_VERSION

AC_SUBST(LWJGL_MAJOR_VERSION)
AC_SUBST(LWJGL_MINOR_VERSION)
AC_SUBST(LWJGL_MICRO_VERSION)
AC_SUBST(LWJGL_INTERFACE_AGE)
AC_SUBST(LWJGL_BINARY_AGE)
AC_SUBST(LWJGL_VERSION)

# libtool versioning
LT_RELEASE=$LWJGL_MAJOR_VERSION.$LWJGL_MINOR_VERSION
LT_CURRENT=`expr $LWJGL_MICRO_VERSION - $LWJGL_INTERFACE_AGE`
LT_REVISION=$LWJGL_INTERFACE_AGE
LT_AGE=`expr $LWJGL_BINARY_AGE - $LWJGL_INTERFACE_AGE`

AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)


LIBS='-L/usr/X11R6/lib'

AC_CONFIG_AUX_DIR(admin)

AC_CONFIG_SRCDIR(common/org_lwjgl_opengl_CoreGL.cpp)

AM_INIT_AUTOMAKE(lwjgl, $LWJGL_VERSION)

AM_CONFIG_HEADER(config.h)

dnl Checks for programs.
AM_PROG_LIBTOOL
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_RANLIB


AC_MSG_CHECKING(for JAVA_HOME)
if test "x$JAVA_HOME" = x; then
  AC_MSG_ERROR([*** Please set the JAVA_HOME environment variable ])
else
  AC_MSG_RESULT($JAVA_HOME)
  JAVA_HOME="$JAVA_HOME"
  CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
  CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
fi

dnl Checks for libraries.
dnl Replace `main' with a function in -lGL:
AC_CHECK_LIB(GL, main,, AC_MSG_ERROR(GL is required))
dnl Replace `main' with a function in -lGLU:
AC_CHECK_LIB(GLU, main,, AC_MSG_ERROR(GLU is required))
dnl Replace `main' with a function in -lX11:
AC_CHECK_LIB(X11, main,, AC_MSG_ERROR(X11 is required))
dnl Replace `main' with a function in -lXext:
AC_CHECK_LIB(Xext, main,, AC_MSG_ERROR(Xext is required))
dnl Replace `main' with a function in -lXxf86vm:
AC_CHECK_LIB(Xxf86vm, main,, AC_MSG_ERROR(Xxf86vm is required))
dnl Replace `main' with a function in -lopenal:
AC_CHECK_LIB(openal, main,, AC_MSG_ERROR(openal is required))

dnl Checks for header files.

dnl Checks for typedefs, structures, and compiler characteristics.

dnl Checks for library functions.

AC_OUTPUT([Makefile common/Makefile linux/Makefile])

--- NEW FILE: dummy.c ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/dummy.c
/* This is needed for automake, so that it can build an empty archive */

int pointless_symbol_so_the_archive_doesnt_look_empty;


--- NEW FILE: stamp-h.in ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/stamp-h.in
timestamp

--- NEW FILE: subdirs ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/subdirs
common
linux

[Java-game-lib-cvs] CVS: LWJGL/src/native/admin - New directory

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv22766/admin

Log Message:
Directory /cvsroot/java-game-lib/LWJGL/src/native/admin added to the repository

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux Makefile.elias_naur,NONE,1.1 Makefile,1.13,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv20331

Added Files:
	Makefile.elias_naur 
Removed Files:
	Makefile 
Log Message:

Renamed... prepping for autoconf =)


--- NEW FILE: Makefile.elias_naur ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.elias_naur

# Copyright (c) 2002 Light Weight Java Game Library 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 'Light Weight Java Game Library' 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.
#

#
# $Id: Makefile.elias_naur,v 1.1 2002/11/28 22:35:29 lholden Exp $
#
# Linux specific Makefile to compile liblwjgl.so.
#
# author elias_naur <eli...@us...>
# version $Revision: 1.1 $
#

GCC = gcc
G++ = g++
LINK = g++
JAVAHOME=/usr/java/j2sdk1.4.1_01
LIBCSRC=$(shell find ../common -name \*.c -print|grep -v CVS)
LIBCPPSRC=$(shell find . -name \*.cpp -print|grep -v CVS) $(shell find ../common -name \*.cpp -print|grep -v CVS)
LIBCPPOBJS=$(LIBCPPSRC:.cpp=.o)
LIBCOBJS=$(LIBCSRC:.c=.o)
LIBOBJS=$(LIBCOBJS) $(LIBCPPOBJS)
DEBUG_FLAGS=-D_DEBUG
LINKOPTS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU -lopenal
BUILDOPTS=-O3 -Wall

all: liblwjgl.so


liblwjgl_d.so: $(LIBOBJS)
	$(LINK) -shared -o $@ $^ $(LINKOPTS)
	cp $@ ../../../bin/

liblwjgl.so: $(LIBOBJS)
	$(LINK) -shared -o $@ $^ $(LINKOPTS)
	strip $@
	cp $@ ../../../bin/

.SUFFIXES:      .cpp .so .o .java .h .class .c

%.o : %.cpp
	$(G++) $(DEBUG_FLAGS) $(BUILDOPTS) -I$(JAVAHOME)/include -I../common -I$(JAVAHOME)/include/linux -c -o $@ $< 

%.o : %.c
	$(GCC) $(DEBUG_FLAGS) -Wall -I$(JAVAHOME)/include -I../common -I$(JAVAHOME)/include/linux -c -o $@ $< 

testprog : main.o
	$(LINK) -o $@ $< -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU

.PHONY clean:
	rm -rf *.so
	rm -rf $(LIBOBJS)

--- Makefile DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile

[Java-game-lib-cvs] CVS: LWJGL/src/native/common checkALerror.h,1.4,1.5

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv30944

Modified Files:
	checkALerror.h 
Log Message:
fix: make OpenAL compile, by not including extal.h in files - somekind of circular dependency ?

Index: checkALerror.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/checkALerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkALerror.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- checkALerror.h	26 Nov 2002 23:26:00 -0000	1.4
+++ checkALerror.h	28 Nov 2002 22:06:37 -0000	1.5
@@ -13,7 +13,7 @@
 #ifdef _DEBUG
 
 #include <jni.h>
-#include "extal.h"
+#include <AL/al.h>
 
 #define CHECK_AL_ERROR \
 	{ \

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_Display.cpp,1.4,1.5 org_lwjgl_input_Mouse.cpp,1.5,1.6

[Elias N. <eli...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv18383

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_input_Mouse.cpp 
Log Message:
Added pointer warping to keep pointer in center of the display

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_Display.cpp	26 Nov 2002 03:30:41 -0000	1.4
+++ org_lwjgl_Display.cpp	28 Nov 2002 21:49:11 -0000	1.5
@@ -57,6 +57,8 @@
 int current_fullscreen;
 int current_focused;
 Window win;
+int win_width;
+int win_height;
 XF86VidModeModeInfo **avail_modes;
 XVisualInfo * vis_info;
 
@@ -122,7 +124,8 @@
                             
 
 
-
+	win_width = width;
+	win_height = height;
 	current_fullscreen = fullscreen;
 	current_focused = 0;
 	disp = XOpenDisplay(NULL);

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_input_Mouse.cpp	28 Nov 2002 09:29:40 -0000	1.5
+++ org_lwjgl_input_Mouse.cpp	28 Nov 2002 21:49:11 -0000	1.6
@@ -49,10 +49,15 @@
 
 #define NUM_BUTTONS 3
 
+#define POINTER_WARP_BORDER 10
+#define WARP_RETRY 5
+
 extern Display *disp;
 extern Window win;
 extern int screen;
 extern int current_fullscreen;
+extern int win_width;
+extern int win_height;
 
 bool pointer_grabbed;
 
@@ -182,10 +187,6 @@
 #endif
 		return JNI_FALSE;
 	}
-	XWarpPointer(disp, None, win, 0, 0, 0, 0, 0, 0);
-	XEvent event;
-	while (XCheckMaskEvent(disp, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, &event))
-		; // delete events that are pending
 	return JNI_TRUE;
 }
 
@@ -266,8 +267,8 @@
 				}
 				break;
 			case MotionNotify:
-				current_x = event.xbutton.x;
-				current_y = event.xbutton.y;
+				current_x = event.xmotion.x;
+				current_y = event.xmotion.y;
 				break;
 			default: assert(0);
 		}
@@ -275,6 +276,34 @@
 	return count;
 }
 
+void warpPointer(void) {
+	int i;
+	// Reset pointer to middle of screen if inside a certain inner border
+	if (current_x < POINTER_WARP_BORDER || current_y < POINTER_WARP_BORDER || 
+			current_x > win_width - POINTER_WARP_BORDER || current_y > win_height - POINTER_WARP_BORDER) {
+		current_x = last_x = win_width/2;
+		current_y = last_y = win_height/2;
+		XWarpPointer(disp, None, win, 0, 0, 0, 0, current_x, current_y);
+		XEvent event;
+		// Try to catch the warp pointer event
+		for (i = 0; i < WARP_RETRY; i++) {
+			XMaskEvent(disp, PointerMotionMask, &event);
+			if (event.xmotion.x > current_x - POINTER_WARP_BORDER &&
+				event.xmotion.x < current_x + POINTER_WARP_BORDER &&
+				event.xmotion.y > current_y - POINTER_WARP_BORDER &&
+				event.xmotion.y < current_y + POINTER_WARP_BORDER)
+				break;
+#ifdef _DEBUG
+			printf("Skipped event searching for warp event %d, %d\n", event.xmotion.x, event.xmotion.y);
+#endif
+		}
+#ifdef _DEBUG
+		if (i == WARP_RETRY)
+			printf("Never got warp event\n");
+#endif
+	}
+}
+
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nPoll
@@ -297,4 +326,6 @@
 	unsigned char * class_buttons = (unsigned char *) env->GetPrimitiveArrayCritical(buttonsArray, NULL);
 	memcpy(class_buttons, buttons, NUM_BUTTONS*sizeof(unsigned char));
 	env->ReleasePrimitiveArrayCritical(buttonsArray, class_buttons, 0);
+	if (current_fullscreen)
+		warpPointer();
 }

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_openal_ALC.cpp,1.2,1.3 org_lwjgl_openal_ALUT.cpp,1.2,1.3 org_lwjgl_openal_CoreAL.cpp,1.2,1.3 org_lwjgl_openal_eax_CoreEAX.cpp,1.2,1.3

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv25366

Modified Files:
	org_lwjgl_openal_ALC.cpp org_lwjgl_openal_ALUT.cpp 
	org_lwjgl_openal_CoreAL.cpp org_lwjgl_openal_eax_CoreEAX.cpp 
Log Message:
fix: make OpenAL compile, by not including extal.h in files, but CoreEAX - somekind of circular dependency ?

Index: org_lwjgl_openal_ALC.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_ALC.cpp	26 Nov 2002 23:28:48 -0000	1.2
+++ org_lwjgl_openal_ALC.cpp	28 Nov 2002 20:25:10 -0000	1.3
@@ -39,8 +39,10 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALC.h"
-#include "extal.h"
+
+/* OpenAL includes */
 #include "checkALerror.h"
+#include <AL/alc.h>
 
 /*
  * Class:     org_lwjgl_openal_ALC

Index: org_lwjgl_openal_ALUT.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_ALUT.cpp	26 Nov 2002 23:29:59 -0000	1.2
+++ org_lwjgl_openal_ALUT.cpp	28 Nov 2002 20:25:10 -0000	1.3
@@ -40,13 +40,12 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALUT.h"
-/* OpenAL includes */
-#include "extal.h"
-
-#include "checkALerror.h"
-
 
 #include <stdlib.h>
+
+/* OpenAL includes */
+#include "checkALerror.h"
+#include <AL/alut.h>
 
 /*
  * Class:     org_lwjgl_openal_ALUT

Index: org_lwjgl_openal_CoreAL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_CoreAL.cpp	26 Nov 2002 23:30:39 -0000	1.2
+++ org_lwjgl_openal_CoreAL.cpp	28 Nov 2002 20:25:10 -0000	1.3
@@ -40,10 +40,10 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_CoreAL.h"
+
 /* OpenAL includes */
-#include "extal.h"
 #include "checkALerror.h"
-
+#include <AL/al.h>
 
 /**
  * This function enables a feature of the OpenAL driver.

Index: org_lwjgl_openal_eax_CoreEAX.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_eax_CoreEAX.cpp	26 Nov 2002 23:31:14 -0000	1.2
+++ org_lwjgl_openal_eax_CoreEAX.cpp	28 Nov 2002 20:25:10 -0000	1.3
@@ -39,8 +39,11 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_eax_CoreEAX.h"
+
+/* OpenAL includes */
 #include "extal.h"
 #include "checkALerror.h"
+#include <AL/alc.h>
 
 /**
  * Throws an OAL exception with the specified message

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.7,1.8

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv23879

Modified Files:
	extal.h 
Log Message:


Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extal.h	28 Nov 2002 19:35:04 -0000	1.7
+++ extal.h	28 Nov 2002 19:36:09 -0000	1.8
@@ -49,3 +49,4 @@
 #include <AL/alc.h>
 #include <AL/alut.h>
 #endif
+#endif

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.6,1.7

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv22918

Modified Files:
	extal.h 
Log Message:

try, try, try again =)



Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- extal.h	28 Nov 2002 19:17:55 -0000	1.6
+++ extal.h	28 Nov 2002 19:35:04 -0000	1.7
@@ -32,9 +32,6 @@
 
 #ifndef _AL_TEST_H
 #define _AL_TEST_H
-#endif
-
-$ifdef _AL_TEST_H
 #ifdef _WIN32
 #define INITGUID
 #define OPENAL
@@ -51,5 +48,4 @@
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <AL/alut.h>
-#endif
 #endif

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.5,1.6

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv9907

Modified Files:
	extal.h 
Log Message:

second try on getting things working proper on win32


Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- extal.h	28 Nov 2002 16:45:27 -0000	1.5
+++ extal.h	28 Nov 2002 19:17:55 -0000	1.6
@@ -29,11 +29,13 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef _WIN32
 
 #ifndef _AL_TEST_H
 #define _AL_TEST_H
+#endif
 
+$ifdef _AL_TEST_H
+#ifdef _WIN32
 #define INITGUID
 #define OPENAL
 
@@ -43,13 +45,11 @@
 #include <AL/alut.h>
 #include <eax.h>
 
-EAXSet	eaxSet;						// EAXSet function, retrieved if EAX Extension is supported
-EAXGet	eaxGet;						// EAXGet function, retrieved if EAX Extension is supported
-
-#endif
+EAXSet  eaxSet;                                         // EAXSet function, ret$
+EAXGet  eaxGet;                                         // EAXGet function, ret$
 #else
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <AL/alut.h>
-
+#endif
 #endif

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.4,1.5

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv2130

Modified Files:
	extal.h 
Log Message:


trying to fix problem with compiling on windows


Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- extal.h	27 Nov 2002 03:01:23 -0000	1.4
+++ extal.h	28 Nov 2002 16:45:27 -0000	1.5
@@ -40,6 +40,7 @@
 #include <windows.h>
 #include <AL/al.h>
 #include <AL/alc.h>
+#include <AL/alut.h>
 #include <eax.h>
 
 EAXSet	eaxSet;						// EAXSet function, retrieved if EAX Extension is supported

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_input_Mouse.cpp,1.4,1.5

[Elias N. <eli...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv7402

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Mouse.cpp fix

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_input_Mouse.cpp	21 Nov 2002 15:05:51 -0000	1.4
+++ org_lwjgl_input_Mouse.cpp	28 Nov 2002 09:29:40 -0000	1.5
@@ -182,6 +182,10 @@
 #endif
 		return JNI_FALSE;
 	}
+	XWarpPointer(disp, None, win, 0, 0, 0, 0, 0, 0);
+	XEvent event;
+	while (XCheckMaskEvent(disp, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, &event))
+		; // delete events that are pending
 	return JNI_TRUE;
 }
 

[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl/opengl CoreGL.java,1.7,1.8 GL.java,1.12,1.13

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv30441

Modified Files:
	CoreGL.java GL.java 
Log Message:
fix: removed not needed imports (makes eclipse bitch less)

Index: CoreGL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CoreGL.java	24 Nov 2002 13:17:53 -0000	1.7
+++ CoreGL.java	27 Nov 2002 22:34:28 -0000	1.8
@@ -32,8 +32,6 @@
 
 package org.lwjgl.opengl;
 
-import org.lwjgl.Sys;
-
 /**
  * $Id$
  *

Index: GL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- GL.java	24 Nov 2002 17:08:34 -0000	1.12
+++ GL.java	27 Nov 2002 22:34:29 -0000	1.13
@@ -33,13 +33,11 @@
 package org.lwjgl.opengl;
 
 import java.lang.reflect.*;
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
 import org.lwjgl.Display;
-import org.lwjgl.Sys;
 
 /**
  * $Id$

[Java-game-lib-cvs] CVS: LWJGL/examples BitmapFonts.java,1.1,1.2 Blending.java,1.1,1.2 DisplayLists.java,1.1,1.2 FiltersLightingAndControl.java,1.1,1.2 FirstPersonWorld.java,1.1,1.2 FlagEffect.java,1.1,1.2 Fog.java,1.1,1.2 MovingStarBitmaps.java,1.1,1.2 Polygon.java,1.1,1.2 PolygonColored.java,1.1,1.2 PolygonColoredRotating.java,1.1,1.2 PolygonColoredRotating3D.java,1.1,1.2 Quadrics.java,1.1,1.2 Texture.java,1.1,1.2 TextureMapping.java,1.1,1.2

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples
In directory sc8-pr-cvs1:/tmp/cvs-serv27384

Modified Files:
	BitmapFonts.java Blending.java DisplayLists.java 
	FiltersLightingAndControl.java FirstPersonWorld.java 
	FlagEffect.java Fog.java MovingStarBitmaps.java Polygon.java 
	PolygonColored.java PolygonColoredRotating.java 
	PolygonColoredRotating3D.java Quadrics.java Texture.java 
	TextureMapping.java 
Log Message:
fix: removed not needed imports (makes eclipse bitch less)

Index: BitmapFonts.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/BitmapFonts.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/BitmapFonts.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BitmapFonts.java	27 Nov 2002 00:16:34 -0000	1.1
+++ BitmapFonts.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,13 +30,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: Blending.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Blending.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Blending.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Blending.java	27 Nov 2002 00:16:34 -0000	1.1
+++ Blending.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,10 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: DisplayLists.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/DisplayLists.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/DisplayLists.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DisplayLists.java	27 Nov 2002 00:16:34 -0000	1.1
+++ DisplayLists.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,9 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: FiltersLightingAndControl.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/FiltersLightingAndControl.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/FiltersLightingAndControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FiltersLightingAndControl.java	27 Nov 2002 00:16:34 -0000	1.1
+++ FiltersLightingAndControl.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,10 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: FirstPersonWorld.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/FirstPersonWorld.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/FirstPersonWorld.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FirstPersonWorld.java	27 Nov 2002 00:16:34 -0000	1.1
+++ FirstPersonWorld.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -31,10 +31,7 @@
  */
 import java.nio.*;
 import java.io.*;
-import java.awt.image.BufferedImage;
 import java.util.regex.*;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: FlagEffect.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/FlagEffect.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/FlagEffect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FlagEffect.java	27 Nov 2002 00:16:34 -0000	1.1
+++ FlagEffect.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,13 +30,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: Fog.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Fog.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Fog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Fog.java	27 Nov 2002 00:16:34 -0000	1.1
+++ Fog.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,10 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: MovingStarBitmaps.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/MovingStarBitmaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/MovingStarBitmaps.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MovingStarBitmaps.java	27 Nov 2002 00:16:34 -0000	1.1
+++ MovingStarBitmaps.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,11 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
 import java.util.Random;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: Polygon.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Polygon.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Polygon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Polygon.java	27 Nov 2002 00:16:34 -0000	1.1
+++ Polygon.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -29,9 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: PolygonColored.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/PolygonColored.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/PolygonColored.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PolygonColored.java	27 Nov 2002 00:16:34 -0000	1.1
+++ PolygonColored.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -29,9 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: PolygonColoredRotating.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/PolygonColoredRotating.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/PolygonColoredRotating.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PolygonColoredRotating.java	27 Nov 2002 00:16:34 -0000	1.1
+++ PolygonColoredRotating.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -29,9 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: PolygonColoredRotating3D.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/PolygonColoredRotating3D.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/PolygonColoredRotating3D.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PolygonColoredRotating3D.java	27 Nov 2002 00:16:34 -0000	1.1
+++ PolygonColoredRotating3D.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -29,9 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: Quadrics.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Quadrics.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Quadrics.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Quadrics.java	27 Nov 2002 05:54:27 -0000	1.1
+++ Quadrics.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -30,10 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 import java.nio.*;
-import java.io.*;
-import java.awt.image.BufferedImage;
-import javax.swing.JOptionPane;
-import javax.imageio.*;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;

Index: Texture.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Texture.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Texture.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Texture.java	27 Nov 2002 00:16:34 -0000	1.1
+++ Texture.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -34,8 +34,6 @@
 import java.awt.geom.*;
 
 import org.lwjgl.*;
-import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

Index: TextureMapping.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/TextureMapping.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/TextureMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TextureMapping.java	27 Nov 2002 00:16:34 -0000	1.1
+++ TextureMapping.java	27 Nov 2002 22:28:11 -0000	1.2
@@ -36,7 +36,6 @@
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;
-import org.lwjgl.input.*;
 
 /**
  * $Id$

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_opengl_GLU.h,1.3,1.4

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv7528

Modified Files:
	org_lwjgl_opengl_GLU.h 
Log Message:

generated from the java source =)


Index: org_lwjgl_opengl_GLU.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_GLU.h	27 Nov 2002 05:54:27 -0000	1.3
+++ org_lwjgl_opengl_GLU.h	27 Nov 2002 06:28:02 -0000	1.4
@@ -95,13 +95,10 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build2DMipmaps
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint, jint);
 
-
-
-
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    newQuadric
- * not sure exactly what to do with this part...
+ * Signature: ()I
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_newQuadric
   (JNIEnv *, jobject);
@@ -109,7 +106,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    cylinder
- * not sure exactly what to do with this part...
+ * Signature: (IDDDII)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_cylinder
   (JNIEnv *, jobject, jint, jdouble, jdouble, jdouble, jint, jint);
@@ -117,7 +114,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    deleteQuadric
- * not sure exactly what to do with this part...
+ * Signature: (I)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric
   (JNIEnv *, jobject, jint);
@@ -125,7 +122,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    disk
- * not sure exactly what to do with this part...
+ * Signature: (IDDII)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_disk
   (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint);
@@ -133,7 +130,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    partialDisk
- * not sure exactly what to do with this part...
+ * Signature: (IDDIIDD)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_partialDisk
   (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint, jdouble, jdouble);
@@ -141,7 +138,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    quadricDrawStyle
- * not sure exactly what to do with this part...
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricDrawStyle
   (JNIEnv *, jobject, jint, jint);
@@ -149,7 +146,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    quadricNormals
- * not sure exactly what to do with this part...
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricNormals
   (JNIEnv *, jobject, jint, jint);
@@ -157,7 +154,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    quadricOrientation
- * not sure exactly what to do with this part...
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricOrientation
   (JNIEnv *, jobject, jint, jint);
@@ -165,7 +162,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    quadricTexture
- * not sure exactly what to do with this part...
+ * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricTexture
   (JNIEnv *, jobject, jint, jboolean);
@@ -173,7 +170,7 @@
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    sphere
- * not sure exactly what to do with this part...
+ * Signature: (IDII)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere
   (JNIEnv *, jobject, jint, jdouble, jint, jint);

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_opengl_GLU.cpp,1.1,1.2 org_lwjgl_opengl_GLU.h,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv29807/src/native/common

Modified Files:
	org_lwjgl_opengl_GLU.cpp org_lwjgl_opengl_GLU.h 
Log Message:

GLU: Added full quadrics support (except gluQuadricCallback)

Quadrics.java: port of NeHe lesson18: Quadrics


Index: org_lwjgl_opengl_GLU.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_GLU.cpp	25 Nov 2002 13:36:35 -0000	1.1
+++ org_lwjgl_opengl_GLU.cpp	27 Nov 2002 05:54:27 -0000	1.2
@@ -165,3 +165,113 @@
 	return ret;
 }
 
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    newQuadric
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_newQuadric(JNIEnv * env, jobject obj)
+{
+    jint ret = (jint) gluNewQuadric();
+    CHECK_GL_ERROR
+    return ret;
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    cylinder
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_cylinder(JNIEnv * env, jobject obj, jint quad, jdouble baseRadius, jdouble topRadius, jdouble height, jint slices, jint stacks)
+{
+    gluCylinder((GLUquadricObj *) quad, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, (GLint) slices, (GLint) stacks);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    deleteQuadric
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric(JNIEnv * env, jobject obj, jint quad) 
+{
+    gluDeleteQuadric((GLUquadricObj *) quad);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    disk
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_disk
+  (JNIEnv * env, jobject obj, jint quad, jdouble innerRadius, jdouble outerRadius, jint slices, jint loops)
+{
+    gluDisk((GLUquadricObj *) quad, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, (GLint) loops);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    partialDisk
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_partialDisk
+  (JNIEnv * env, jobject obj, jint quad, jdouble innerRadius, jdouble outerRadius, 
+  jint slices, jint loops, jdouble startAngle, jdouble sweepAngle)
+{
+    gluPartialDisk((GLUquadricObj *) quad, (GLdouble) innerRadius, (GLdouble) outerRadius,
+                   (GLint) slices, (GLint) loops, (GLdouble) startAngle, (GLdouble) sweepAngle);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricDrawStyle
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricDrawStyle
+  (JNIEnv * env, jobject obj, jint quad, jint drawStyle)
+{
+    gluQuadricDrawStyle((GLUquadricObj *) quad, (GLenum) drawStyle);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricNormals
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricNormals
+  (JNIEnv * env, jobject obj, jint quad, jint normals)
+{
+    gluQuadricNormals((GLUquadricObj *) quad, (GLenum) normals);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricOrientation
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricOrientation
+  (JNIEnv * env, jobject obj, jint quad, jint orientation)
+{
+    gluQuadricOrientation((GLUquadricObj *) quad, (GLenum) orientation);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricTexture
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricTexture
+  (JNIEnv * env, jobject obj, jint quad, jboolean textureCoords)
+{
+    gluQuadricTexture((GLUquadricObj *) quad, (GLboolean) textureCoords);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    sphere
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere
+  (JNIEnv * env, jobject obj, jint quad, jdouble radius, jint slices, jint stacks)
+{
+    gluSphere((GLUquadricObj *) quad, (GLdouble) radius, (GLint) slices, (GLint) stacks);
+    CHECK_GL_ERROR
+}
+

Index: org_lwjgl_opengl_GLU.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GLU.h	17 Aug 2002 14:13:12 -0000	1.2
+++ org_lwjgl_opengl_GLU.h	27 Nov 2002 05:54:27 -0000	1.3
@@ -95,6 +95,89 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build2DMipmaps
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint, jint);
 
+
+
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    newQuadric
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_newQuadric
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    cylinder
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_cylinder
+  (JNIEnv *, jobject, jint, jdouble, jdouble, jdouble, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    deleteQuadric
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    disk
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_disk
+  (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    partialDisk
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_partialDisk
+  (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint, jdouble, jdouble);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricDrawStyle
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricDrawStyle
+  (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricNormals
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricNormals
+  (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricOrientation
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricOrientation
+  (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricTexture
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricTexture
+  (JNIEnv *, jobject, jint, jboolean);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    sphere
+ * not sure exactly what to do with this part...
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere
+  (JNIEnv *, jobject, jint, jdouble, jint, jint);
+
 #ifdef __cplusplus
 }
 #endif

[Java-game-lib-cvs] CVS: LWJGL/examples Quadrics.java,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples
In directory sc8-pr-cvs1:/tmp/cvs-serv29807/examples

Added Files:
	Quadrics.java 
Log Message:

GLU: Added full quadrics support (except gluQuadricCallback)

Quadrics.java: port of NeHe lesson18: Quadrics


--- NEW FILE: Quadrics.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Quadrics.java
/* 
 * Copyright (c) 2002 Light Weight Java Game Library 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 'Light Weight Java Game Library' 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.
 */
import java.nio.*;
import java.io.*;
import java.awt.image.BufferedImage;
import javax.swing.JOptionPane;
import javax.imageio.*;

import org.lwjgl.*;
import org.lwjgl.opengl.*;
import org.lwjgl.input.*;

/**
 * $Id: Quadrics.java,v 1.1 2002/11/27 05:54:27 lholden Exp $
 *
 * Quadrics
 *
 * Credit goes to GB Schmick (TipTup)  and Jeff Molofee (NeHe) whos tutorial this is based on
 *
 * @author Luke Holden
 * @version $Revision: 1.1 $
 */
public class Quadrics extends FiltersLightingAndControl {
    /* Lighting ON / OFF */
    private boolean light;
    
    /* Start of Disc */
    private int part1;
    /* End of Disc */
    private int part2;
    /* Increase */
    private int p1 = 10;
    private int p2 = 10;
    
    private float xrot;
    private float yrot;
    private float xspeed;
    private float yspeed;
    private float z=-5.0f;
    
    /* Storage for our quadric objects */
    private int quadric;
    
    /* Ambient Light Values ( NEW ) */
    private FloatBuffer lightAmbient = createFloatBuffer(4).put(0.5f).put(0.5f).put(0.5f).put(1.0f);
    /* Diffuse Light Values ( NEW ) */
    private FloatBuffer lightDiffuse = createFloatBuffer(4).put(1.0f).put(1.0f).put(1.0f).put(1.0f);
    /* Light Position ( NEW ) */
    private FloatBuffer lightPosition = createFloatBuffer(4).put(0.0f).put(0.0f).put(2.0f).put(1.0f);
    
    /* Which Filter To Use */
    private int filter;
    /* Which object to draw */
    private int object = 0;
    /* Storage for 3 textures */
    private IntBuffer textureBuf = createIntBuffer(3);
    
    /* our key states */
    private class KeyToggle {
        public boolean l = false;
        public boolean f = false;
        public boolean space = false;
    }
    private KeyToggle keys = new KeyToggle();    
    /** Creates a new instance of Quadrics */
    
    public Quadrics() {
    }
    
    /* Load Bitmaps And Convert To Textures */
    protected void loadGLTextures() throws Exception {
        /* Create Storage Space For The Texture */
        Texture[] textureImage = new Texture[1];
        
        /* Load The Bitmap, Check For Errors, If Bitmap's Not Found Quit */
        try {
            textureImage[0] = loadImage("data/wall.png");
            if (textureImage[0] == null) {
                throw new Exception("Error: got null from loadBmp()!");
            }
            
            /* Create Three Textures */
            gl.genTextures(3, Sys.getDirectBufferAddress(textureBuf));
            
            /* Create Nearest Filtered Texture */
            gl.bindTexture(GL.TEXTURE_2D, textureBuf.get(0));
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MAG_FILTER, GL.NEAREST); // ( NEW )
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MIN_FILTER, GL.NEAREST); // ( NEW )
            gl.texImage2D(GL.TEXTURE_2D, 
                          0, 
                          3, 
                          textureImage[0].getWidth(), 
                          textureImage[0].getHeight(), 
                          0, 
                          GL.RGB, 
                          GL.UNSIGNED_BYTE, 
                          textureImage[0].getPtr());
            
            /* Create Linear Filtered Texture */
            gl.bindTexture(GL.TEXTURE_2D, textureBuf.get(1));
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MAG_FILTER, GL.LINEAR);
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MIN_FILTER, GL.LINEAR);
            gl.texImage2D(GL.TEXTURE_2D, 
                          0, 
                          3, 
                          textureImage[0].getWidth(), 
                          textureImage[0].getHeight(), 
                          0, 
                          GL.RGB, 
                          GL.UNSIGNED_BYTE, 
                          textureImage[0].getPtr());
                        
            /* Create Linear Filtered Texture */
            gl.bindTexture(GL.TEXTURE_2D, textureBuf.get(2));
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MAG_FILTER, GL.LINEAR);
            gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MIN_FILTER, GL.LINEAR_MIPMAP_NEAREST); // ( NEW )            
            glu.build2DMipmaps(GL.TEXTURE_2D,  
                               3,
                               textureImage[0].getWidth(),
                               textureImage[0].getHeight(), 
                               GL.RGB, 
                               GL.UNSIGNED_BYTE, 
                               textureImage[0].getPtr()); // ( NEW )

        }
        catch (Exception e) {
            throw new Exception("Problem loading textures", e);
        }
    }
    
    protected void initGL() throws Exception{    
        /* Jump To Texture Loading Routine */
        try {
            super.initGL();
            
            /* Create a pointer to the quadric object */
            quadric = glu.newQuadric();
            glu.quadricNormals(quadric, GLU.SMOOTH);
            glu.quadricTexture(quadric, true);
        }
        catch (Exception e) {
            throw new Exception("Problem initialising GL", e);
        }
    }
    
    public void drawCube() {
        gl.begin(GL.QUADS);
            /* Front Face */
            gl.normal3f( 0.0f, 0.0f, 1.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f(-1.0f, -1.0f,  1.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f( 1.0f, -1.0f,  1.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f( 1.0f,  1.0f,  1.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f(-1.0f,  1.0f,  1.0f);
                
            /* Back Face */
            gl.normal3f( 0.0f, 0.0f,-1.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f(-1.0f, -1.0f, -1.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f(-1.0f,  1.0f, -1.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f( 1.0f,  1.0f, -1.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f( 1.0f, -1.0f, -1.0f);
                
            /* Top Face */
            gl.normal3f( 0.0f, 1.0f, 0.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f(-1.0f,  1.0f, -1.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f(-1.0f,  1.0f,  1.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f( 1.0f,  1.0f,  1.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f( 1.0f,  1.0f, -1.0f);
                
            /* Bottom Face */
            gl.normal3f( 0.0f,-1.0f, 0.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f(-1.0f, -1.0f, -1.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f( 1.0f, -1.0f, -1.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f( 1.0f, -1.0f,  1.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f(-1.0f, -1.0f,  1.0f);
                
            /* Right face */
            gl.normal3f( 1.0f, 0.0f, 0.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f( 1.0f, -1.0f, -1.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f( 1.0f,  1.0f, -1.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f( 1.0f,  1.0f,  1.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f( 1.0f, -1.0f,  1.0f);
                
            /* Left Face */
            gl.normal3f(-1.0f, 0.0f, 0.0f);
            gl.texCoord2f(0.0f, 0.0f); gl.vertex3f(-1.0f, -1.0f, -1.0f);
            gl.texCoord2f(1.0f, 0.0f); gl.vertex3f(-1.0f, -1.0f,  1.0f);
            gl.texCoord2f(1.0f, 1.0f); gl.vertex3f(-1.0f,  1.0f,  1.0f);
            gl.texCoord2f(0.0f, 1.0f); gl.vertex3f(-1.0f,  1.0f, -1.0f);
	gl.end();
    }
    
    protected boolean drawGLScene(float frameTime) {
        gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
        gl.loadIdentity();
        gl.translatef(0.0f, 0.0f, z);
        
        gl.rotatef(xrot,1.0f,0.0f,0.0f);
        gl.rotatef(yrot,0.0f,1.0f,0.0f);	
        
        gl.bindTexture(GL.TEXTURE_2D, textureBuf.get(filter));
        
        switch(object) {
            case 0:
                drawCube();
                break;
            case 1:
                gl.translatef(0.0f, 0.0f, -1.5f);
                glu.cylinder(quadric, 1.0f, 1.0f, 3.0f, 32, 32);	
                break;
            case 2:
                glu.disk(quadric, 0.5f, 1.5f, 32, 32);
                break;
            case 3:
                glu.sphere(quadric, 1.3f, 32, 32);
                break;
            case 4:
                gl.translatef(0.0f, 0.0f, -1.5f);
                glu.cylinder(quadric, 1.0f, 0.0f, 3.0f, 32, 32);
                break;
            case 5:
                part1+=(frameTime * p1);
		part2+=(frameTime * p2);

                if(part1>359) {
                    p1=0;
                    part1=0;
                    p2=1;
                    part2=0;
                }
                if(part2>359) {
                    p1=1;
                    p2=0;
                }
                glu.partialDisk(quadric, 0.5f, 1.5f, 32, 32, part1, part2-part1);
                break;
        };
        
        /* X Axis Rotation */
        xrot+=(frameTime * xspeed);
        /* Y Axis Rotation */
        yrot+=(frameTime * yspeed);
        
        return true;
    }
    
    protected void killGLWindow() {
        glu.deleteQuadric(quadric);
        super.killGLWindow();
    }
    
    protected void input(float frameTime) {
        Keyboard.poll();
        
        /* Keys that have a toggle effect */
        if (Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
            done = true;
        }
                
        if (Keyboard.isKeyDown(Keyboard.KEY_L)) {
            if (!keys.l) {
                keys.l = true;
                
                light=!light;
                if (!light) {
                    gl.disable(GL.LIGHTING);
                }
                else {
                    gl.enable(GL.LIGHTING);
                }
            }
        } 
        else { keys.l = false; }
        
        if (Keyboard.isKeyDown(Keyboard.KEY_F)) {
            if (!keys.f) {
                keys.f = true;
                
                filter+=1;
                if (filter>2) {
                    filter=0;
                }
            }
        } 
        else { keys.f = false; }
        
        if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {
            if (!keys.space) {
                keys.space = true;
                object++;
                if (object > 5) {
                    object = 0;
                }
            }
        } 
        else { keys.space = false; }
        
        /* Keys that have a constant effect */
        if (Keyboard.isKeyDown(Keyboard.KEY_PRIOR)) {
            z-=frameTime * 10f;
        }
        if (Keyboard.isKeyDown(Keyboard.KEY_NEXT)) {
            z+=frameTime * 10f;
        }
        if (Keyboard.isKeyDown(Keyboard.KEY_UP)) {
            xspeed-=frameTime * 20f;
        }
        if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
            xspeed+=frameTime * 20f;
        }
        if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
            yspeed+=frameTime * 20f;
        }
        if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
            yspeed-=frameTime * 20f;
        }
    }
    
    public static void main(String[] arguments) {
        int err = 0;
        Quadrics lesson = new Quadrics();
        try {
            lesson.start(640, 480, 16, false);
        }
        catch (Exception e) {
            err = 1;
            e.printStackTrace();
        }
        System.exit(err);
    }
    
}

[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl/opengl GLU.java,1.5,1.6

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv29807/src/java/org/lwjgl/opengl

Modified Files:
	GLU.java 
Log Message:

GLU: Added full quadrics support (except gluQuadricCallback)

Quadrics.java: port of NeHe lesson18: Quadrics


Index: GLU.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GLU.java	19 Aug 2002 14:01:03 -0000	1.5
+++ GLU.java	27 Nov 2002 05:54:27 -0000	1.6
@@ -144,5 +144,213 @@
 		int type,
 		int data /*void*/
 	);
+        
+        /**
+         * creates and returns a pointer to a new quadrics object. This
+         * object must be referred to when calling quadrics rendering and control
+         * functions.  A return value of zero means that there is not enough memory to
+         * allocate the object
+         *
+         * @returns adress to a new quadrics object
+         */
+        public native int newQuadric();
+        
+        /**
+         * draws a cylinder oriented along the z axis. The base of the
+         * cylinder is placed at z = 0, and the top at z=height. Like a sphere, a
+         * cylinder is subdivided around the z axis into slices, and along the z axis
+         * into stacks.
+         *
+         * Note that if topRadius is set to zero, then this routine will generate a
+         * cone.
+         *
+         * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
+         * any generated normals point away from the z axis. Otherwise, they point
+         * toward the z axis.
+         *
+         * If texturing is turned on (with glu.quadricTexture), then texture
+         * coordinates are generated so that t ranges linearly from 0.0 at z = 0 to
+         * 1.0 at z = height, and s ranges from 0.0 at the +y axis, to 0.25 at the +x
+         * axis, to 0.5 at the -y axis, to 0.75 at the -x axis, and back to 1.0 at the
+         * +y axis.
+         *
+         * @param qobj  Specifies the quadrics object (created with glu.newQuadric).
+         *
+         * @param baseRadius  Specifies the radius of the cylinder at z = 0.
+         *
+         * @param topRadius   Specifies the radius of the cylinder at z = height.
+         *
+         * @param height      Specifies the height of the cylinder.
+         *
+         * @param slices      Specifies the number of subdivisions around the z axis.
+         *
+         * @param stacks      Specifies the number of subdivisions along the z axis.
+         */
+        public native void cylinder(
+                int qobj,
+                double baseRadius,
+                double topRadius,
+                double height,
+                int slices,
+                int stacks
+        );
+        
+        /**
+         * destroys the quadrics object and frees any memory used by
+         * it.  Once glu.deleteQuadric has been called, the object cannot be used again.
+         *
+         * @param qobj pecifies the quadrics object to be destroyed (created with
+	 * glu.newQuadric).
+         */
+        public native void deleteQuadric(
+                int qobj
+        );
+        
+        
+        /**
+         * renders a disk on the z = 0  plane.  The disk has a radius of
+         * outerRadius, and contains a concentric circular hole with a radius of
+         * innerRadius. If innerRadius is 0, then no hole is generated. The disk is
+         * subdivided around the z axis into slices (like pizza slices), and also
+         * about the z axis into rings (as specified by slices and loops,
+         * respectively).
+         *
+         * With respect to orientation, the +z side of the disk is considered to be
+         * "outside" (see glu.quadricOrientation).  This means that if the orientation
+         * is set to GLU.OUTSIDE, then any normals generated point along the +z axis.
+         * Otherwise, they point along the -z axis.
+         *
+         * If texturing is turned on (with glu.quadricTexture), texture coordinates are
+         * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
+         * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
+         * (0, -r, 0) it is (0.5, 0).
+         */
+        public native void disk(
+                int target,
+                double innerRadius,
+                double outerRadius,
+                int slices,
+                int loops
+        );
+
+        /**
+         * renders a partial disk on the z=0 plane.  A partial disk is
+         * similar to a full disk, except that only the subset of the disk from
+         * startAngle through startAngle + sweepAngle is included (where 0 degrees is
+         * along the +y axis, 90 degrees along the +x axis, 180 along the -y axis, and
+         * 270 along the -x axis).
+         *
+         * The partial disk has a radius	of outerRadius,	and contains a concentric
+         * circular hole with a radius of innerRadius.  If innerRadius is zero, then
+         * no hole is generated.  The partial disk is subdivided around the z axis
+         * into slices (like pizza slices), and also about the z axis into rings (as
+         * specified by slices and loops, respectively).
+         *
+         * With respect to orientation, the +z side of the partial disk is considered
+         * to be outside (see gluQuadricOrientation). This means that if the
+         * orientation is set to GLU_OUTSIDE, then any normals generated point along
+         * the +z axis. Otherwise, they point along the -z axis.
+         *
+         * If texturing is turned on (with gluQuadricTexture), texture coordinates are
+         * generated linearly such that where r=outerRadius, the value at (r, 0, 0) is
+         * (1, 0.5), at (0, r, 0) it is (0.5, 1), at (-r, 0, 0) it is (0, 0.5), and at
+         * (0, -r, 0) it is (0.5, 0).
+         */
+        public native void partialDisk(
+                int target,
+                double innerRadius,
+                double outerRadius,
+                int slices,
+                int loops,
+                double startAngle,
+                double sweepAngle
+        );
+
+        /**
+         * specifies the draw style for quadrics rendered with
+         * qobj.  The legal values are as follows:
+         *
+         * GLU.FILL:       Quadrics are rendered with polygon primitives. The polygons
+         *                 are drawn in a counterclockwise fashion with respect to
+         *                 their normals (as defined with glu.quadricOrientation).
+         *
+         * GLU.LINE:       Quadrics are rendered as a set of lines.
+         *
+         * GLU.SILHOUETTE: Quadrics are rendered as a set of lines, except that edges
+         * 		   separating coplanar faces will not be drawn.
+         *
+         * GLU.POINT:       Quadrics are rendered as a set of points.
+         */
+        public native void quadricDrawStyle(
+                int target,
+                int drawStyle
+        );
+        
+        /**
+         * specifies what kind	of normals are desired for quadrics
+         * rendered with	qobj.  The legal values	are as follows:
+         *
+         * GLU.NONE:     No normals are generated.
+         *
+         * GLU.FLAT:     One normal is generated for every facet of a quadric.
+         *
+         * GLU.SMOOTH:   One normal is generated for every vertex of a quadric.  This
+         *               is the default.
+         */
+        public native void quadricNormals(
+                int target,
+                int normals
+        );
+        
+        /**
+         * specifies what kind of orientation is desired for
+         * quadrics rendered with qobj.	The orientation	values are as follows:
+         *
+         * GLU.OUTSIDE:  Quadrics are drawn with normals pointing outward.
+         *
+         * GLU.INSIDE:   Normals point inward. The default is GLU.OUTSIDE.
+         *
+         * Note that the interpretation of outward and inward depends on the quadric
+         * being drawn.
+         */
+        public native void quadricOrientation(
+                int target,
+                int orientation
+        );
+        
+        /**
+         * specifies if texture coordinates should be generated for
+         * quadrics rendered with qobj. If the value of textureCoords is true,
+         * then texture coordinates are generated, and if textureCoords is false,
+         * they are not.. The default is false.
+         *
+         * The manner in which texture coordinates are generated depends upon the
+         * specific quadric rendered.
+         */
+        public native void quadricTexture(
+                int target,
+                boolean textureCoords
+        );
+        
+        /**
+         * draws a sphere of the given	radius centered	around the origin.
+         * The sphere is subdivided around the z axis into slices and along the z axis
+         * into stacks (similar to lines of longitude and latitude).
+         *
+         * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
+         * any normals generated point away from the center of the sphere. Otherwise,
+         * they point toward the center of the sphere.
 
+         * If texturing is turned on (with glu.quadricTexture), then texture
+         * coordinates are generated so that t ranges from 0.0 at z=-radius to 1.0 at
+         * z=radius (t increases linearly along longitudinal lines), and s ranges from
+         * 0.0 at the +y axis, to 0.25 at the +x axis, to 0.5 at the -y axis, to 0.75
+         * at the -x axis, and back to 1.0 at the +y axis.
+         */
+        public native void sphere(
+                int target,
+                double radius,
+                int slices,
+                int stacks
+        );
 }

[Java-game-lib-cvs] CVS: LWJGL/examples/data wall.png,NONE,1.1

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/data
In directory sc8-pr-cvs1:/tmp/cvs-serv29807/examples/data

Added Files:
	wall.png 
Log Message:

GLU: Added full quadrics support (except gluQuadricCallback)

Quadrics.java: port of NeHe lesson18: Quadrics


--- NEW FILE: wall.png ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/data/wall.png
‰PNG


‰""”QþN%óP„€DÁ`lcãì™öx¶îé­ºê­z·g9ûɇÓo1	¿ 9*©Ký¾õ<÷9ç^®ëºoàÿñE8¯®\y½i¥”1¦ëº!Ä{Ï“R
!ú¾÷Þ§”!ÆÎ9¥”sB†¡ï{¥ÔÎÎÎl6 µîû~>Ÿ;ç{xéRch[;Ÿ¦”ööövww§Óé|>???_­Vûûû{{{ãñXkm­uÎ
ÃàœóÞsÎcŒ1F)%¥´iš¢(ªªpzú§€&MÓ

|³Ù
1&„䫈1ÒíÊF{ïbŒZë|Ë)%B(!
!?<
p@
O€S
ñß¼ÿ.;<<,Ë׬ýœs‹NrA%䜐ç)­¬%Æl¬Õ@'ÄiQ¼Â×büNŒß£ôaY¶u9O!ø\Â)e)Eï½1ÆÚaÞ3æ÷8?(Š"Œü¢„§„”’s¶ï7Æô1Æ$¥4¥¹µÿ˹»!dë˜"”R“É“¦éIÓ4!¼0?
(
Üâ¹ÝݛEq™±IJœRQU“Íæ7ªê}Þ4÷!dÎhggÆZë\X.×]7PJ)eBH)UŒï›l=¥´(ÊÌ0…™Uæd’½y†®ëÞ{ï½÷ß<ߺuk4ݾ}ç֭ۏ?:==éûÞ¹?~
x	¨C°„Æ8!‚1•Ò½”N•*êúÓ×®ýêåË/Qõ}¿Ù¬Û¶M)åZä܊ó›ß¬ëO[ûŽ1ÆûMJ>%Eˆ`L0Æ·L+1ÆB¥Ä(UB
!ŽŽŽ®\¹zëÖ­Õji­†1¦”"„!ʲŒ1fà`­M)8×{£âÒÁÁ¿(Ë«1J)ct†abÌZ›ŽqãcànŒéœæ
qcgç:çÜûÓåò«gg__¯cÖëõ£G^}õÕ+W®þâ/~ñÞ½{ßþö_>yòèɓGRJ)r”1jŒÎ(RÚ¹ãÍFk=÷þh
/Ä^Y^mšKe9É*Ž”BAH†dLG(¥œø¼s†ÒÄX!„ô>¤¥2—O֞hýbÔJ}a6û\>ˬ£„à•b!ÌOO¿~|üÛ@‡­’uýúõ}ìÅñx¬”:99yûí<yòØó·ë
Àbq¾\.2»cŠ1‰™+9Œ%Î¥ÜZ­µOi‡±})¯¦tÙZ„ÐdÃ
`L;)u]Gf3Y×5gì¢=Z)xçJMÇ1~c[ž¯Çèb\¨¶}E	L•šyæóG‹ÅéÎÎ¥étÇ{¯õJëÁ{K)&“×õkÀ‘s2F!e.ޒR•‰"!$¥h­1æê0,¼?å|ÅùxlÌ<„”é.p||ø±ÓÙÙÉry/2
¼T
HB¾ÄX#%Êr·®÷…(„(cJ5Ö¢ëú®[tÝiߥvZŸ†ð§À7AY^»té_1ɃYÊåœ	!3V‹1£·¦˜!½µ}˔~
!Œ1Æç,çt³éû¾L]“Ǐß9>¸PÁBx&Rʲ”͍1Ìç§1&k­1=à
³o²ÛŸœýDß

Œ¥4M³kmÊ#S„ ë\æ4¢,Ÿ1„<!d;ä•çF˜”3Bže#1›Íhs^ʺÐ\맄”eù}B¾•Ó\×}˜M&›®ëR"œO•ª	!!Dkûú@HÉyM)ã\ç,€²T!ÀZÆØ*%ø”¢µÎÚ¨µ¶6¯9vYèûÎ9CHŠÑ¥”E.#ÉŸ­1ZÛkíâ#³zñ‚‘`“Òwûþ+ÛÏ^~8[­6@=™Ì&“I†ò]×Â8/(M! #ãœyct„ª1&ºnÓ¶óµ1ÁÚ8c¬r+¥R

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.3,1.4

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv20253

Modified Files:
	extal.h 
Log Message:

Modified so openal compiles on linux again


Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- extal.h	27 Nov 2002 02:34:24 -0000	1.3
+++ extal.h	27 Nov 2002 03:01:23 -0000	1.4
@@ -46,5 +46,9 @@
 EAXGet	eaxGet;						// EAXGet function, retrieved if EAX Extension is supported
 
 #endif
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alut.h>
 
 #endif

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.c,1.1,1.2

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv12020/src/native/common

Modified Files:
	extal.c 
Log Message:

fixed missing newline


Index: extal.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extal.c	25 Nov 2002 13:39:45 -0000	1.1
+++ extal.c	27 Nov 2002 02:34:58 -0000	1.2
@@ -38,4 +38,4 @@
  *
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
- */
\ No newline at end of file
+ */

[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.h,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv11882/src/native/common

Modified Files:
	extal.h 
Log Message:

fixed lack of newline

Index: extal.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extal.h	25 Nov 2002 21:50:41 -0000	1.2
+++ extal.h	27 Nov 2002 02:34:24 -0000	1.3
@@ -47,4 +47,4 @@
 
 #endif
 
-#endif
\ No newline at end of file
+#endif

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson06/data nehe.png,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson06/data
In directory sc8-pr-cvs1:/tmp/cvs-serv7158/nehe/lesson06/data

Removed Files:
	nehe.png 
Log Message:


Missed this one when I cleared the nehe dir


--- nehe.png DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson06/data/nehe.png