jake2-commits — Jake2 cvs commits

[Jake2-commits] jake2/src/net/java/games/joal/util ALut.java, 1.1, NONE

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java/games/joal/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27265/src/net/java/games/joal/util

Removed Files:
	ALut.java 
Log Message:
add the ALut class from joal only for the current webstart version
moved to jake2.sound.joal package

--- ALut.java DELETED ---

[Jake2-commits] jake2/src/net/java/games/joal/util ALut.java, NONE, 1.1

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java/games/joal/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20276/src/net/java/games/joal/util

Added Files:
	ALut.java 
Log Message:
add the ALut class from joal only for the current webstart version

--- NEW FILE: ALut.java ---
package net.java.games.joal.util;


import java.io.BufferedInputStream;
import java.io.InputStream;
import java.nio.ByteBuffer;

import net.java.games.joal.*;

/**
 * @author Athomas Goldberg
 *
 */
public final class ALut {

  private static ALC alc;
  private static ALCdevice device;
  private static ALCcontext context;
  private static Thread initializingThread;

  private ALut() { }

  /** Initializes the OpenAL Utility Toolkit, creates an OpenAL
      context and makes it current on the current thread. The ALut may
      only be initialized on one thread at any given time. */
  public static synchronized void alutInit() throws ALException {
    if (context != null) {
      throw new ALException("Already initialized on thread " + initializingThread.getName());
    }
    if (alc == null) {
      alc = ALFactory.getALC();
    }
    String deviceName = null;
    ALCdevice d = alc.alcOpenDevice(deviceName);
    if (d == null) {
      throw new ALException("Error opening default OpenAL device");
    }
    ALCcontext c = alc.alcCreateContext(d, null);
    if (c == null) {
      alc.alcCloseDevice(d);
      throw new ALException("Error creating OpenAL context");
    }
    alc.alcMakeContextCurrent(c);
    if (alc.alcGetError(d) != 0) {
      alc.alcDestroyContext(c);
      alc.alcCloseDevice(d);
      throw new ALException("Error making OpenAL context current");
    }
    // Fully initialized; finish setup
    device = d;
    context = c;
    initializingThread = Thread.currentThread();
  }

  /** Shuts down the OpenAL Utility Toolkit; releases and destroys the
      internal OpenAL context and closes the output device. Must be
      called from the same thread as alutInit(). Most applications
      should not need to call this; only those which wish to toggle
      sound on / off at run time by initializing and un-initializing
      OpenAL need to call it. */
  public static synchronized void alutExit() throws ALException {
    if (context == null) {
      throw new ALException("Not initialized");
    }
    alc.alcMakeContextCurrent(null);
    alc.alcDestroyContext(context);
    alc.alcCloseDevice(device);
    context = null;
    device = null;
    initializingThread = null;
  }

  public static void alutLoadWAVFile(String fileName,
                                     int[] format,
                                     ByteBuffer[] data,
                                     int[] size,
                                     int[] freq,
                                     int[] loop) throws ALException {
    try {
      WAVData wd = WAVLoader.loadFromFile(fileName);
      format[0] = wd.format;
      data[0] = wd.data;
      size[0] = wd.size;
      freq[0] = wd.freq;
      loop[0] = wd.loop ? AL.AL_TRUE : AL.AL_FALSE;
    } catch (Exception e) {
      throw new ALException(e);
    }
  }

  public static void alutLoadWAVFile(InputStream stream,
                                     int[] format,
                                     ByteBuffer[] data,
                                     int[] size,
                                     int[] freq,
                                     int[] loop) throws ALException {
    try {
      if (!(stream instanceof BufferedInputStream)) {
        stream = new BufferedInputStream(stream);
      }
      WAVData wd = WAVLoader.loadFromStream(stream);
      format[0] = wd.format;
      data[0] = wd.data;
      size[0] = wd.size;
      freq[0] = wd.freq;
      loop[0] = wd.loop ? AL.AL_TRUE : AL.AL_FALSE;
    } catch (Exception e) {
      throw new ALException(e);
    }
  }
}

[Jake2-commits] jake2/src/net/java/games/joal - New directory

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java/games/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20240/src/net/java/games/joal

Log Message:
Directory /cvsroot/jake2/jake2/src/net/java/games/joal added to the repository

[Jake2-commits] jake2/src/net/java - New directory

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20240/src/net/java

Log Message:
Directory /cvsroot/jake2/jake2/src/net/java added to the repository

[Jake2-commits] jake2/src/net - New directory

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20240/src/net

Log Message:
Directory /cvsroot/jake2/jake2/src/net added to the repository

[Jake2-commits] jake2/src/net/java/games - New directory

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java/games
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20240/src/net/java/games

Log Message:
Directory /cvsroot/jake2/jake2/src/net/java/games added to the repository

[Jake2-commits] jake2/src/net/java/games/joal/util - New directory

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/net/java/games/joal/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20240/src/net/java/games/joal/util

Log Message:
Directory /cvsroot/jake2/jake2/src/net/java/games/joal/util added to the repository

[Jake2-commits] jake2/lib/joal/windows gluegen-rt.dll, 1.2, 1.3 joal_native.dll, 1.2, 1.3

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/lib/joal/windows
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31286/lib/joal/windows

Modified Files:
	gluegen-rt.dll joal_native.dll 
Log Message:
update to new joal builds 2006-12-07
ALut.alutExit()

Index: joal_native.dll
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/windows/joal_native.dll,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsQ17rFq and /tmp/cvsstKWCG differ

Index: gluegen-rt.dll
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/windows/gluegen-rt.dll,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsRBYMAp and /tmp/cvsK0HyAF differ

[Jake2-commits] jake2/lib/joal joal.jar, 1.2, 1.3 gluegen-rt.jar, 1.2, 1.3

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/lib/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28457/lib/joal

Modified Files:
	joal.jar gluegen-rt.jar 
Log Message:
update to new joal builds 2006-12-07
ALut.alutExit()

Index: gluegen-rt.jar
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/gluegen-rt.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsvalsv5 and /tmp/cvse1FMGE differ

Index: joal.jar
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/joal.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsb40M26 and /tmp/cvsJxdLgG differ

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java, 1.20, 1.21

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28457/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
update to new joal builds 2006-12-07
ALut.alutExit()

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JOALSoundImpl.java	29 Nov 2006 15:28:52 -0000	1.20
--- JOALSoundImpl.java	7 Dec 2006 22:45:08 -0000	1.21
***************
*** 3,7 ****
   * Copyright (C) 2004
   *
-  * $Id$
   */
  package jake2.sound.joal;
--- 3,6 ----
***************
*** 33,37 ****
  	static AL al;
  	static ALC alc;
- 	static ALCcontext currentContext;
  	static EAX eax;
  	
--- 32,35 ----
***************
*** 48,100 ****
  	 */
  	public boolean Init() {
! 
! 	    try {
! 		initOpenAL();
! 		al = ALFactory.getAL();
! 		alc = ALFactory.getALC();
! 		checkError();
! 		initOpenALExtensions();		
! 	    } catch (ALException e) {
! 		Com.Printf(e.getMessage() + '\n');
! 		return false;
! 	    } catch (Throwable e) {
! 		Com.Printf(e.toString() + '\n');
! 		return false;
! 	    }
! 	    // set the master volume
! 	    s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE);
! 
! 	    al.alGenBuffers(buffers.length, buffers, 0);
! 	    int count = Channel.init(al, buffers);
! 	    Com.Printf("... using " + count + " channels\n");
! 	    al.alDistanceModel(AL.AL_INVERSE_DISTANCE_CLAMPED);
! 	    Cmd.AddCommand("play", new xcommand_t() {
! 		public void execute() {
! 		    Play();
! 		}
! 	    });
! 	    Cmd.AddCommand("stopsound", new xcommand_t() {
! 		public void execute() {
! 		    StopAllSounds();
! 		}
! 	    });
! 	    Cmd.AddCommand("soundlist", new xcommand_t() {
! 		public void execute() {
! 		    SoundList();
! 		}
! 	    });
! 	    Cmd.AddCommand("soundinfo", new xcommand_t() {
! 		public void execute() {
! 		    SoundInfo_f();
  		}
! 	    });
  
! 	    num_sfx = 0;
  
! 	    Com.Printf("sound sampling rate: 44100Hz\n");
  
! 	    StopAllSounds();
! 	    Com.Printf("------------------------------------\n");
! 	    return true;
  	}
  		
--- 46,98 ----
  	 */
  	public boolean Init() {
! 		        
! 		try {
! 		    ALut.alutInit();
! 		    al = ALFactory.getAL();
! 		    alc = ALFactory.getALC();
! 		    checkError();
! 		    initOpenALExtensions();		
! 		} catch (ALException e) {
! 		    Com.Printf(e.getMessage() + '\n');
! 		    return false;
! 		} catch (Throwable e) {
! 		    Com.Printf(e.toString() + '\n');
! 		    return false;
  		}
! 		// set the master volume
! 		s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE);
  
! 		al.alGenBuffers(buffers.length, buffers, 0);
! 		int count = Channel.init(al, buffers);
! 		Com.Printf("... using " + count + " channels\n");
! 		al.alDistanceModel(AL.AL_INVERSE_DISTANCE_CLAMPED);
! 		Cmd.AddCommand("play", new xcommand_t() {
! 			public void execute() {
! 				Play();
! 			}
! 		});
! 		Cmd.AddCommand("stopsound", new xcommand_t() {
! 			public void execute() {
! 				StopAllSounds();
! 			}
! 		});
! 		Cmd.AddCommand("soundlist", new xcommand_t() {
! 			public void execute() {
! 				SoundList();
! 			}
! 		});
! 		Cmd.AddCommand("soundinfo", new xcommand_t() {
! 			public void execute() {
! 				SoundInfo_f();
! 			}
! 		});
  
! 		num_sfx = 0;
  
! 		Com.Printf("sound sampling rate: 44100Hz\n");
! 
! 		StopAllSounds();
! 		Com.Printf("------------------------------------\n");
! 		return true;
  	}
  		
***************
*** 105,109 ****
  				Com.Printf("... using EAX2.0\n");
  			} catch (Throwable e) {
! 				Com.Printf("... EAX2.0 not found\n");
  				eax = null;
  			}
--- 103,107 ----
  				Com.Printf("... using EAX2.0\n");
  			} catch (Throwable e) {
! 				Com.Printf("... EAX2.0 not initialized\n");
  				eax = null;
  			}
***************
*** 114,150 ****
  	}
  	
- 	void initOpenAL() throws ALException {
- 	    alc = ALFactory.getALC();
- 	    String deviceName = null;
- 	    ALCcontext context;
- 	    ALCdevice device;
- 	    device = alc.alcOpenDevice(deviceName);
- 	    if (device == null) {
- 	      throw new ALException("Error opening default OpenAL device");
- 	    }
- 	    context = alc.alcCreateContext(device, null);
- 	    if (context == null) {
- 	      throw new ALException("Error creating OpenAL context");
- 	    }
- 	    alc.alcMakeContextCurrent(context);
- 	    if (alc.alcGetError(device) != 0) {
- 	      throw new ALException("Error making OpenAL context current");
- 	    }
- 	    currentContext = context;
- 	}
- 	
- 	void exitOpenAL() {
- 		alc.alcMakeContextCurrent(null);
- 		// Get the current context.
- 		//ALCcontext curContext = alc.alcGetCurrentContext();
- 		// Get the device used by that context.
- 		ALCdevice curDevice = alc.alcGetContextsDevice(currentContext);
- 		// Reset the current context to NULL.
- 		// Release the context and the device.
- 		alc.alcDestroyContext(currentContext);
- 		if (!alc.alcCloseDevice(curDevice)) {
- 		    System.err.println("DEBUG: Can't close AL device");
- 		}
- 	}
  	
      // TODO check the sfx direct buffer size
--- 112,115 ----
***************
*** 188,192 ****
  		Channel.shutdown();
  		al.alDeleteBuffers(buffers.length, buffers, 0);
! 		exitOpenAL();
  
  		Cmd.RemoveCommand("play");
--- 153,157 ----
  		Channel.shutdown();
  		al.alDeleteBuffers(buffers.length, buffers, 0);
! 		ALut.alutExit();
  
  		Cmd.RemoveCommand("play");

[Jake2-commits] jake2/lib/joal/osx libjoal_native.jnilib, 1.2, 1.3 libgluegen-rt.jnilib, 1.2, 1.3

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/lib/joal/osx
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28457/lib/joal/osx

Modified Files:
	libjoal_native.jnilib libgluegen-rt.jnilib 
Log Message:
update to new joal builds 2006-12-07
ALut.alutExit()

Index: libjoal_native.jnilib
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/osx/libjoal_native.jnilib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvseJwchr and /tmp/cvsGCpEZ0 differ

Index: libgluegen-rt.jnilib
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/osx/libgluegen-rt.jnilib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsWJ4p8t and /tmp/cvse4sSU3 differ

[Jake2-commits] jake2/lib/joal/linux libjoal_native.so,1.2,1.3

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/lib/joal/linux
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28457/lib/joal/linux

Modified Files:
	libjoal_native.so 
Log Message:
update to new joal builds 2006-12-07
ALut.alutExit()

Index: libjoal_native.so
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/joal/linux/libjoal_native.so,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsHjyVYg and /tmp/cvszvGstQ differ

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.13, 1.14

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23493/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
unused resize removed

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Jsr231Driver.java	30 Nov 2006 17:39:41 -0000	1.13
--- Jsr231Driver.java	7 Dec 2006 22:31:10 -0000	1.14
***************
*** 334,341 ****
          }
  
- 	public void resize(int width, int height) {
- 	    super.resize(width, height);
- 	}
- 
          public void addNotify() {
              super.addNotify();
--- 334,337 ----

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.12, 1.13

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20982

Modified Files:
	Jsr231Driver.java 
Log Message:
not compatible with java 1.4

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Jsr231Driver.java	30 Nov 2006 17:32:59 -0000	1.12
--- Jsr231Driver.java	30 Nov 2006 17:39:41 -0000	1.13
***************
*** 334,338 ****
          }
  
-         @Override
  	public void resize(int width, int height) {
  	    super.resize(width, height);
--- 334,337 ----

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.11, 1.12

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18325/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
hope this solves the pixel displacement problem on some Win32 systems

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Jsr231Driver.java	30 Nov 2006 17:21:39 -0000	1.11
--- Jsr231Driver.java	30 Nov 2006 17:32:59 -0000	1.12
***************
*** 254,257 ****
--- 254,258 ----
  	    // first buffer
  	    beginFrame(0.0f);
+ 	    glViewport(0, 0, window.getWidth(), window.getHeight());
  	    glClearColor(0, 0, 0, 0);
  	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
***************
*** 259,262 ****
--- 260,264 ----
  	    // second buffer
  	    beginFrame(0.0f);
+ 	    glViewport(0, 0, window.getWidth(), window.getHeight());
  	    glClearColor(0, 0, 0, 0);
  	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
***************
*** 335,339 ****
  	public void resize(int width, int height) {
  	    super.resize(width, height);
- 	    getGL().glViewport(0, 0, width, width);
  	}
  
--- 337,340 ----

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.10, 1.11

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14006/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
hope this solves the pixel displacement problem on some Win32 systems

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Jsr231Driver.java	29 Nov 2006 14:15:42 -0000	1.10
--- Jsr231Driver.java	30 Nov 2006 17:21:39 -0000	1.11
***************
*** 301,305 ****
      
      private static class Display extends Canvas {
!         private GLDrawable drawable;
  
          private GLContext context;
--- 301,305 ----
      
      private static class Display extends Canvas {
! 	private GLDrawable drawable;
  
          private GLContext context;
***************
*** 332,335 ****
--- 332,341 ----
          }
  
+         @Override
+ 	public void resize(int width, int height) {
+ 	    super.resize(width, height);
+ 	    getGL().glViewport(0, 0, width, width);
+ 	}
+ 
          public void addNotify() {
              super.addNotify();

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java, 1.19, 1.20

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10242/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
try to solve the sound on/off/on bug on linux 

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JOALSoundImpl.java	29 Nov 2006 12:55:09 -0000	1.19
--- JOALSoundImpl.java	29 Nov 2006 15:28:52 -0000	1.20
***************
*** 33,36 ****
--- 33,37 ----
  	static AL al;
  	static ALC alc;
+ 	static ALCcontext currentContext;
  	static EAX eax;
  	
***************
*** 47,99 ****
  	 */
  	public boolean Init() {
- 		        
- 		try {
-             ALut.alutInit();
- 			al = ALFactory.getAL();
-             alc = ALFactory.getALC();
- 			checkError();
- 			initOpenALExtensions();		
- 		} catch (ALException e) {
- 			Com.Printf(e.getMessage() + '\n');
- 			return false;
- 		} catch (Throwable e) {
- 			Com.Printf(e.toString() + '\n');
- 			return false;
- 		}
- 		// set the master volume
- 		s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE);
  
! 		al.alGenBuffers(buffers.length, buffers, 0);
! 		int count = Channel.init(al, buffers);
! 		Com.Printf("... using " + count + " channels\n");
! 		al.alDistanceModel(AL.AL_INVERSE_DISTANCE_CLAMPED);
! 		Cmd.AddCommand("play", new xcommand_t() {
! 			public void execute() {
! 				Play();
! 			}
! 		});
! 		Cmd.AddCommand("stopsound", new xcommand_t() {
! 			public void execute() {
! 				StopAllSounds();
! 			}
! 		});
! 		Cmd.AddCommand("soundlist", new xcommand_t() {
! 			public void execute() {
! 				SoundList();
! 			}
! 		});
! 		Cmd.AddCommand("soundinfo", new xcommand_t() {
! 			public void execute() {
! 				SoundInfo_f();
! 			}
! 		});
  
! 		num_sfx = 0;
  
! 		Com.Printf("sound sampling rate: 44100Hz\n");
  
! 		StopAllSounds();
! 		Com.Printf("------------------------------------\n");
! 		return true;
  	}
  		
--- 48,100 ----
  	 */
  	public boolean Init() {
  
! 	    try {
! 		initOpenAL();
! 		al = ALFactory.getAL();
! 		alc = ALFactory.getALC();
! 		checkError();
! 		initOpenALExtensions();		
! 	    } catch (ALException e) {
! 		Com.Printf(e.getMessage() + '\n');
! 		return false;
! 	    } catch (Throwable e) {
! 		Com.Printf(e.toString() + '\n');
! 		return false;
! 	    }
! 	    // set the master volume
! 	    s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE);
  
! 	    al.alGenBuffers(buffers.length, buffers, 0);
! 	    int count = Channel.init(al, buffers);
! 	    Com.Printf("... using " + count + " channels\n");
! 	    al.alDistanceModel(AL.AL_INVERSE_DISTANCE_CLAMPED);
! 	    Cmd.AddCommand("play", new xcommand_t() {
! 		public void execute() {
! 		    Play();
! 		}
! 	    });
! 	    Cmd.AddCommand("stopsound", new xcommand_t() {
! 		public void execute() {
! 		    StopAllSounds();
! 		}
! 	    });
! 	    Cmd.AddCommand("soundlist", new xcommand_t() {
! 		public void execute() {
! 		    SoundList();
! 		}
! 	    });
! 	    Cmd.AddCommand("soundinfo", new xcommand_t() {
! 		public void execute() {
! 		    SoundInfo_f();
! 		}
! 	    });
  
! 	    num_sfx = 0;
  
! 	    Com.Printf("sound sampling rate: 44100Hz\n");
! 
! 	    StopAllSounds();
! 	    Com.Printf("------------------------------------\n");
! 	    return true;
  	}
  		
***************
*** 113,126 ****
  	}
  	
  	void exitOpenAL() {
  		// Get the current context.
! 		ALCcontext curContext = alc.alcGetCurrentContext();
  		// Get the device used by that context.
! 		ALCdevice curDevice = alc.alcGetContextsDevice(curContext);
  		// Reset the current context to NULL.
- 		alc.alcMakeContextCurrent(null);
  		// Release the context and the device.
! 		alc.alcDestroyContext(curContext);
! 		alc.alcCloseDevice(curDevice);
  	}
  	
--- 114,149 ----
  	}
  	
+ 	void initOpenAL() throws ALException {
+ 	    alc = ALFactory.getALC();
+ 	    String deviceName = null;
+ 	    ALCcontext context;
+ 	    ALCdevice device;
+ 	    device = alc.alcOpenDevice(deviceName);
+ 	    if (device == null) {
+ 	      throw new ALException("Error opening default OpenAL device");
+ 	    }
+ 	    context = alc.alcCreateContext(device, null);
+ 	    if (context == null) {
+ 	      throw new ALException("Error creating OpenAL context");
+ 	    }
+ 	    alc.alcMakeContextCurrent(context);
+ 	    if (alc.alcGetError(device) != 0) {
+ 	      throw new ALException("Error making OpenAL context current");
+ 	    }
+ 	    currentContext = context;
+ 	}
+ 	
  	void exitOpenAL() {
+ 		alc.alcMakeContextCurrent(null);
  		// Get the current context.
! 		//ALCcontext curContext = alc.alcGetCurrentContext();
  		// Get the device used by that context.
! 		ALCdevice curDevice = alc.alcGetContextsDevice(currentContext);
  		// Reset the current context to NULL.
  		// Release the context and the device.
! 		alc.alcDestroyContext(currentContext);
! 		if (!alc.alcCloseDevice(curDevice)) {
! 		    System.err.println("DEBUG: Can't close AL device");
! 		}
  	}
  	

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.9, 1.10

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12287/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
clear first and second buffer of GLContext

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Jsr231Driver.java	29 Nov 2006 14:06:50 -0000	1.9
--- Jsr231Driver.java	29 Nov 2006 14:15:42 -0000	1.10
***************
*** 252,255 ****
--- 252,261 ----
  	    window_ypos = ypos;
  	    // clear the screen
+ 	    // first buffer
+ 	    beginFrame(0.0f);
+ 	    glClearColor(0, 0, 0, 0);
+ 	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ 	    endFrame();
+ 	    // second buffer
  	    beginFrame(0.0f);
  	    glClearColor(0, 0, 0, 0);

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.8, 1.9

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8621/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
hope this solves the pixel flicker problem on some Win32 systems

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Jsr231Driver.java	29 Nov 2006 13:17:48 -0000	1.8
--- Jsr231Driver.java	29 Nov 2006 14:06:50 -0000	1.9
***************
*** 223,226 ****
--- 223,227 ----
  		VID.NewWindow(newDim.width, newDim.height);
  		setGL(display.getGL());
+ 		init(0, 0);
          
  		return Base.rserr_ok;
***************
*** 247,254 ****
  	 */
  	public boolean init(int xpos, int ypos) {
! 		// set window position
! 		window_xpos = xpos;
! 		window_ypos = ypos;
! 		return true;
  	}
  
--- 248,260 ----
  	 */
  	public boolean init(int xpos, int ypos) {
! 	    // set window position
! 	    window_xpos = xpos;
! 	    window_ypos = ypos;
! 	    // clear the screen
! 	    beginFrame(0.0f);
! 	    glClearColor(0, 0, 0, 0);
! 	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
! 	    endFrame();
! 	    return true;
  	}
  

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.7, 1.8

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21242/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
hope this solves the pixel flicker problem on some Win32 systems

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Jsr231Driver.java	29 Nov 2006 12:56:20 -0000	1.7
--- Jsr231Driver.java	29 Nov 2006 13:17:48 -0000	1.8
***************
*** 303,306 ****
--- 303,313 ----
              return context.getGL();
          }
+         /** <B>Overrides:</B>
+         <DL><DD><CODE>paint</CODE> in class <CODE>java.awt.Component</CODE></DD></DL> */
+         // Overridden from Canvas to prevent the AWT's clearing of the
+         // canvas from interfering with the OpenGL rendering.
+         public void paint(Graphics g) {
+             // do nothing
+         }
          
          /** <B>Overrides:</B>

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.6, 1.7

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12777/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
hope this solves the pixel flicker problem on some Win32 systems

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Jsr231Driver.java	23 Nov 2006 22:50:18 -0000	1.6
--- Jsr231Driver.java	29 Nov 2006 12:56:20 -0000	1.7
***************
*** 257,263 ****
      }
      
! 	public void endFrame() {
! 		glFlush();
! 		display.update();
      }
  
--- 257,263 ----
      }
      
!     public void endFrame() {
! 	glFlush();
! 	display.update();
      }
  
***************
*** 303,309 ****
--- 303,319 ----
              return context.getGL();
          }
+         
+         /** <B>Overrides:</B>
+         <DL><DD><CODE>update</CODE> in class <CODE>java.awt.Component</CODE></DD></DL> */
+         // Overridden from Canvas to prevent the AWT's clearing of the
+         // canvas from interfering with the OpenGL rendering.
+         public void update(Graphics g) {
+             // do nothing
+             //paint(g);
+         }
  
          public void addNotify() {
              super.addNotify();
+             super.setBackground(Color.BLACK);
              drawable.setRealized(true);
          }

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java, 1.18, 1.19

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12355/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
organize imports

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** JOALSoundImpl.java	24 Nov 2006 00:40:30 -0000	1.18
--- JOALSoundImpl.java	29 Nov 2006 12:55:09 -0000	1.19
***************
*** 15,19 ****
  import jake2.util.Vargs;
  
- import java.io.*;
  import java.nio.*;
  
--- 15,18 ----

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java, 1.17, 1.18

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv518/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
magic linux openal handling removed

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JOALSoundImpl.java	23 Nov 2006 14:29:42 -0000	1.17
--- JOALSoundImpl.java	24 Nov 2006 00:40:30 -0000	1.18
***************
*** 40,69 ****
  	private int[] buffers = new int[MAX_SFX + STREAM_QUEUE];
  
- 	// singleton 
  	private JOALSoundImpl() {
  	}
  
- 	/**
- 	 * unpack OpenAL shared library on Linux
- 	 */
- 	private void unpack() {
- 		String path = System.getProperty("user.home") + "/.jake2/libopenal.so";
- 		File f = new File(path);
- 		if (!f.exists()) {
- 			try {
- 				f.createNewFile();
- 				InputStream in = getClass().getResourceAsStream("/libopenal.so");
- 				OutputStream out = new FileOutputStream(f);
- 				byte[] buf = new byte[8192];
- 				int len;
- 				while ((len = in.read(buf)) > 0) {
- 					out.write(buf, 0, len);
- 				}
- 			} catch (Exception e) {
- 				f.delete();
- 			}
- 		}
- 	}
- 	
  	/* (non-Javadoc)
  	 * @see jake2.sound.SoundImpl#Init()
--- 40,47 ----
  	private int[] buffers = new int[MAX_SFX + STREAM_QUEUE];
  
  	private JOALSoundImpl() {
+ 	    // singleton 
  	}
  
  	/* (non-Javadoc)
  	 * @see jake2.sound.SoundImpl#Init()

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.5, 1.6

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21898/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
use a java.awt.Frame instead of swing JFrame
(hope this solves the 2 Pixel border flickering problem)

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Jsr231Driver.java	23 Nov 2006 18:10:32 -0000	1.5
--- Jsr231Driver.java	23 Nov 2006 22:50:18 -0000	1.6
***************
*** 41,45 ****
  import javax.media.opengl.*;
  import javax.swing.ImageIcon;
- import javax.swing.JFrame;
  
  /**
--- 41,44 ----
***************
*** 55,59 ****
  	private DisplayMode oldDisplayMode; 
  	private Display display;
! 	JFrame window;
  
  	// window position on the screen
--- 54,58 ----
  	private DisplayMode oldDisplayMode; 
  	private Display display;
! 	Frame window;
  
  	// window position on the screen
***************
*** 158,162 ****
  		shutdown();
  
! 		window = new JFrame("Jake2 (jsr231)");
  		ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
  		window.setIconImage(icon.getImage());
--- 157,161 ----
  		shutdown();
  
! 		window = new Frame("Jake2 (jsr231)");
  		ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
  		window.setIconImage(icon.getImage());
***************
*** 166,170 ****
  		canvas.setFocusTraversalKeysEnabled(false);
  
! 		window.getContentPane().add(canvas);	
  		canvas.setSize(newDim.width, newDim.height);
  
--- 165,169 ----
  		canvas.setFocusTraversalKeysEnabled(false);
  
! 		window.add(canvas);	
  		canvas.setSize(newDim.width, newDim.height);
  

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.4, 1.5

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5700/src/jake2/render/opengl

Modified Files:
	Jsr231Driver.java 
Log Message:
add some context init code from jogl-demos

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Jsr231Driver.java	22 Nov 2006 22:09:54 -0000	1.4
--- Jsr231Driver.java	23 Nov 2006 18:10:32 -0000	1.5
***************
*** 162,166 ****
  		window.setIconImage(icon.getImage());
  		
! 		Display canvas = new Display();
  		// we want keypressed events for TAB key
  		canvas.setFocusTraversalKeysEnabled(false);
--- 162,166 ----
  		window.setIconImage(icon.getImage());
  		
! 		Display canvas = new Display(new GLCapabilities());
  		// we want keypressed events for TAB key
  		canvas.setFocusTraversalKeysEnabled(false);
***************
*** 289,300 ****
      // --------------------------------------------------------------------------
      
!     private class Display extends Canvas {
          private GLDrawable drawable;
  
          private GLContext context;
  
!         public Display() {
!             drawable = GLDrawableFactory.getFactory().getGLDrawable(this,
!                     new GLCapabilities(), null);
              context = drawable.createContext(null);
          }
--- 289,300 ----
      // --------------------------------------------------------------------------
      
!     private static class Display extends Canvas {
          private GLDrawable drawable;
  
          private GLContext context;
  
!         public Display(GLCapabilities capabilities) {
!             super(unwrap((AWTGraphicsConfiguration)GLDrawableFactory.getFactory().chooseGraphicsConfiguration(capabilities, null, null)));
!             drawable = GLDrawableFactory.getFactory().getGLDrawable(this, capabilities, null);
              context = drawable.createContext(null);
          }
***************
*** 335,338 ****
--- 335,345 ----
              drawable.setRealized(false);
          }
+ 
+         private static GraphicsConfiguration unwrap(AWTGraphicsConfiguration config) {
+             if (config == null) {
+               return null;
+             }
+             return config.getGraphicsConfiguration();
+         }
      }
  }