jake2-commits — Jake2 cvs commits

[Jake2-commits] jake2/src/jake2/game gitem_t.java,1.6,1.7

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24251/src/jake2/game

Modified Files:
	gitem_t.java 
Log Message:
stronger typing

Index: gitem_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/gitem_t.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gitem_t.java	27 Feb 2007 14:00:33 -0000	1.6
--- gitem_t.java	13 Dec 2009 11:13:22 -0000	1.7
***************
*** 97,101 ****
      int weapmodel; // weapon model index (for weapons)
  
!     Object info;
  
      int tag;
--- 97,101 ----
      int weapmodel; // weapon model index (for weapons)
  
!     gitem_armor_t info;
  
      int tag;

[Jake2-commits] jake2/src/jake2 Jake2Applet.java,1.1,1.2

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	Jake2Applet.java 
Log Message:
Set background of Jake2Applet to black before fully initialized


Index: Jake2Applet.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/Jake2Applet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Jake2Applet.java	2 Mar 2008 20:21:12 -0000	1.1
--- Jake2Applet.java	2 Mar 2008 20:38:04 -0000	1.2
***************
*** 31,34 ****
--- 31,35 ----
  
  import java.awt.BorderLayout;
+ import java.awt.Color;
  import java.util.Locale;
  import javax.swing.JApplet;
***************
*** 46,49 ****
--- 47,56 ----
      private Object shutDownLock = new Object();
  
+     public void init() {
+         // Before Jake2 is fully initialized, make the applet black
+         // like the rest of the web page
+         setBackground(Color.BLACK);
+     }
+ 
      public void start() {
          setLayout(new BorderLayout());

[Jake2-commits] jake2 build.xml,1.38,1.39

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	build.xml 
Log Message:
Changes to enable Jake2 to run well as an applet inside the
next-generation Java Plug-In. Added Globals.appletMode, Globals.applet
and Globals.sizeChangeListener to be able to easily pass around the
knowledge that the system is running in applet mode, and the applet
itself, which becomes the parent container for the output. Most
changes were in Jsr231Driver to support putting the Display into a
preexisting parent container rather than a new Frame each
time. Changed JOGLKBD to allow manual initialization of the parent
container rather than obtaining it from a CreateNotify or
ConfigureNotify event since these will never be generated in the
applet case. Removed various calls to System.exit(), although strictly
speaking this is no longer necessary because it is expected that the
separate_jvm parameter will be used in conjunction with the new Java
Plug-In to create a fresh JVM instance for each run of Jake2. Video
mode switching in applet mode is working; the applet resizes (via
JavaScript) to accommodate the newly selected resolution. Full screen
mode when running as an applet is not implemented at this point, as
the intent was to show this inside the browser, though support could
be added very straightforwardly.


Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** build.xml	6 May 2007 21:02:19 -0000	1.38
--- build.xml	2 Mar 2008 20:21:09 -0000	1.39
***************
*** 27,30 ****
--- 27,31 ----
  		<pathelement location="lib/lwjgl/lwjgl.jar"/>
  		<pathelement location="lib/lwjgl/lwjgl_util.jar"/>
+ 		<pathelement location="${java.home}/lib/plugin.jar"/>
  	</path>
  	
***************
*** 153,156 ****
--- 154,158 ----
  		</jar>
  		<property name="classes" value="${java.home}/lib/rt.jar"/>
+ 		<property name="plugin" value="${java.home}/lib/plugin.jar"/>
          <condition property="classes" value="${java.home}/../Classes/classes.jar">
              <os name="Mac OS X"/>
***************
*** 164,167 ****
--- 166,170 ----
  			<libraryjar name="lib/joal/gluegen-rt.jar"/>
  			<libraryjar name="${classes}"/>
+ 			<libraryjar name="${plugin}"/>
  			<keep access="public" name="jake2.Jake2">
  				<method name="main(java.lang.String[])"/>

[Jake2-commits] jake2/src/jake2 CompatibilityApplet.java, NONE, 1.1 Jake2Applet.java, NONE, 1.1 SizeChangeListener.java, NONE, 1.1 Globals.java, 1.5, 1.6

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	Globals.java 
Added Files:
	CompatibilityApplet.java Jake2Applet.java 
	SizeChangeListener.java 
Log Message:
Changes to enable Jake2 to run well as an applet inside the
next-generation Java Plug-In. Added Globals.appletMode, Globals.applet
and Globals.sizeChangeListener to be able to easily pass around the
knowledge that the system is running in applet mode, and the applet
itself, which becomes the parent container for the output. Most
changes were in Jsr231Driver to support putting the Display into a
preexisting parent container rather than a new Frame each
time. Changed JOGLKBD to allow manual initialization of the parent
container rather than obtaining it from a CreateNotify or
ConfigureNotify event since these will never be generated in the
applet case. Removed various calls to System.exit(), although strictly
speaking this is no longer necessary because it is expected that the
separate_jvm parameter will be used in conjunction with the new Java
Plug-In to create a fresh JVM instance for each run of Jake2. Video
mode switching in applet mode is working; the applet resizes (via
JavaScript) to accommodate the newly selected resolution. Full screen
mode when running as an applet is not implemented at this point, as
the intent was to show this inside the browser, though support could
be added very straightforwardly.


--- NEW FILE: CompatibilityApplet.java ---
/*
 * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems nor the names of its
 *     contributors may be used to endorse or promote products derived
 *     from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package jake2;

import java.applet.*;
import java.awt.Canvas;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.*;
import java.awt.font.*;
import java.awt.geom.*;
import java.net.*;
import java.text.*;
import java.util.*;

/**
 * An applet to smooth the adoption of newer applet content which runs
 * only with the new Java Plug-In: in particular, applets launched via
 * JNLP. It displays some informative text; clicking on the text will
 * open a new browser window pointing to the download page for the new
 * Java Plug-In. This applet runs even on very early versions of the
 * JRE and can be referenced from the applet tag's code / archive
 * attributes while the jnlp_href can point to the new-style applet's
 * code.
 * <P>
 * In 6u10 build 13, it is necessary to copy this applet's source code
 * and rename it to be exactly the same class name as is in the
 * main-class attribute in the JNLP file, preferably referenced via
 * the archive attribute in a jar named something like
 * "BackwardCompatibility.jar". In 6u10 build 14, the applet tag may
 * refer to this class via its code attribute, and the JNLP file may
 * point to an entirely different class name, allowing one copy of the
 * compatibility applet to be used for many different JNLP-launched
 * applets.
 * <P>
 * Parameters supported:
 * <P>
 * <CODE>compat_fontsize</CODE> - the font size used to draw the text.<BR>
 * <CODE>compat_fgcolor</CODE> - the color used to draw the text.<BR>
 * <CODE>compat_bgcolor</CODE> - the color used to draw the text.
 *
 * @author Kenneth Russell
 */

public class CompatibilityApplet extends java.applet.Applet {
    private Font font;
    private static final String inputText = "Click here to get the new Java Plug-In";
    private static final String url = "https://jdk6.dev.java.net/6uNea.html";

    public void init() {
        int fontSize = 36;
        try {
            fontSize = Integer.parseInt(getParameter("compat_fontsize"));
        } catch (Exception e) {
        }
        Color fgColor = Color.black;
        Color bgColor = Color.white;
        try {
            fgColor = Color.decode(getParameter("compat_fgcolor"));
        } catch (Exception e) {
        }
        try {
            bgColor = Color.decode(getParameter("compat_bgcolor"));
        } catch (Exception e) {
        }
        font = new Font("SansSerif", Font.PLAIN, fontSize);
        setForeground(fgColor);
        setBackground(bgColor);
        addMouseListener(new MouseAdapter() {
                public void mouseClicked(MouseEvent e) {
                    try {
                        getAppletContext().showDocument(new URL(url), "_blank");
                    } catch (Exception ex) {
                    }
                }
            });
    }

    static class LineInfo {
        String text;
        float width;
        float height;

        LineInfo(String text, float width, float height) {
            this.text = text;
            this.width = width;
            this.height = height;
        }
    }

    public void paint(Graphics graphics) {
        Graphics2D g = (Graphics2D) graphics;
        List/*<LineInfo>*/ lines = new ArrayList();
        FontMetrics fm = g.getFontMetrics();
        FontRenderContext frc = g.getFontRenderContext();
        Map attrs = new HashMap();
        attrs.put(TextAttribute.FONT, font);
        float totalHeight = 0;
        int curPos = 0;
        AttributedString str = new AttributedString(inputText, attrs);
        LineBreakMeasurer measurer = new LineBreakMeasurer(str.getIterator(), frc);
        while (measurer.getPosition() < inputText.length()) {
            // Give us a few pixels inset from the edges
            int nextPos = measurer.nextOffset(getWidth() - 10);
            String line = inputText.substring(curPos, nextPos);
            GlyphVector gv = font.createGlyphVector(frc, line);
            Rectangle2D bounds = gv.getVisualBounds();
            float height = (float) bounds.getHeight() + 5;
            lines.add(new LineInfo(line, (float) bounds.getWidth(), height));
            totalHeight += height;
            curPos = nextPos;
            measurer.setPosition(curPos);
        }
        // Draw the strings centered vertically and horizontally in this component
        g.setFont(font);
        float curY = (getHeight() - totalHeight) / 2;
        for (Iterator iter = lines.iterator(); iter.hasNext(); ) {
            LineInfo line = (LineInfo) iter.next();
            curY += line.height;
            float x = (getWidth() - line.width) / 2;
            g.drawString(line.text, (int) x, (int) curY);
        }
    }
}

--- NEW FILE: SizeChangeListener.java ---
/*
 * SizeChangeListener.java
 * Copyright (C)  2008
 * 
 * $Id: SizeChangeListener.java,v 1.1 2008/03/02 20:21:13 kbrussel Exp $
 */

package jake2;

/** Provides a callback when the user changes the video mode of the
    game. */

public interface SizeChangeListener {
    public void sizeChanged(int width, int height);
}

Index: Globals.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/Globals.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Globals.java	7 Feb 2005 17:49:26 -0000	1.5
--- Globals.java	2 Mar 2008 20:21:12 -0000	1.6
***************
*** 386,388 ****
--- 386,398 ----
  	
  	public static Random rnd = new Random();
+ 
+ 	//=============================================================================
+ 
+         // Information used when we're running as an applet
+         // Whether we're running as an applet
+         public static boolean appletMode;
+         // The applet, represented as an Object to avoid an AWT dependency here
+         public static Object applet;
+         // A listener to receive video mode changes
+         public static SizeChangeListener sizeChangeListener;
  }

--- NEW FILE: Jake2Applet.java ---
/*
 * Jake2Applet.java
 * Copyright (C)  2008
 * 
 * $Id: Jake2Applet.java,v 1.1 2008/03/02 20:21:12 kbrussel Exp $
 */
/*
 Copyright (C) 1997-2001 Id Software, Inc.

 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
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */
package jake2;

import jake2.game.Cmd;
import jake2.qcommon.*;
import jake2.sys.Timer;

import java.awt.BorderLayout;
import java.util.Locale;
import javax.swing.JApplet;

import netscape.javascript.*;

/**
 * Jake2 is the main class of Quake2 for Java.
 */
public class Jake2Applet extends JApplet {

    private JSObject self;
    private volatile boolean shouldShutDown;
    private boolean shutDown;
    private Object shutDownLock = new Object();

    public void start() {
        setLayout(new BorderLayout());
        new GameThread().start();
    }

    public void stop() {
        synchronized(shutDownLock) {
            shouldShutDown = true;
            while (!shutDown) {
                try {
                    shutDownLock.wait();
                } catch (InterruptedException e) {
                }
            }
        }
        Cmd.ExecuteString("quit");
    }

    class GameThread extends Thread {
        public GameThread() {
            super("Jake2 Game Thread");
        }

        public void run() {
            // TODO: check if dedicated is set in config file
    	
            Globals.dedicated= Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET);
    
            // Set things up for applet execution
            Qcommon.appletMode = true;
            Qcommon.applet = Jake2Applet.this;
            Qcommon.sizeChangeListener = new SizeChangeListener() {
                    public void sizeChanged(int width, int height) {
                        try {
                            if (self == null) {
                                JSObject win = JSObject.getWindow(Jake2Applet.this);
                                self = (JSObject) win.eval("document.getElementById(\"" +
                                                           getParameter("id") + "\")");
                            }

                            self.setMember("width", new Integer(width));
                            self.setMember("height", new Integer(height));
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }
                };

            // open the q2dialog, if we are not in dedicated mode.
            if (Globals.dedicated.value != 1.0f) {
                Jake2.Q2Dialog = new Q2DataDialog();
                Locale.setDefault(Locale.US);
                Jake2.Q2Dialog.setVisible(true);
            }

            Qcommon.Init(new String[] { "Jake2" });

            Globals.nostdout = Cvar.Get("nostdout", "0", 0);

            try {
                while (!shouldShutDown) {
                    int oldtime = Timer.Milliseconds();
                    int newtime;
                    int time;
                    while (true) {
                        // find time spending rendering last frame
                        newtime = Timer.Milliseconds();
                        time = newtime - oldtime;

                        if (time > 0)
                            Qcommon.Frame(time);
                        oldtime = newtime;
                    }
                }
            } finally {
                synchronized(shutDownLock) {
                    shutDown = true;
                    shutDownLock.notifyAll();
                }
            }
        }
    }
}

[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java, 1.15, 1.16

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	Q2DataDialog.java 
Log Message:
Changes to enable Jake2 to run well as an applet inside the
next-generation Java Plug-In. Added Globals.appletMode, Globals.applet
and Globals.sizeChangeListener to be able to easily pass around the
knowledge that the system is running in applet mode, and the applet
itself, which becomes the parent container for the output. Most
changes were in Jsr231Driver to support putting the Display into a
preexisting parent container rather than a new Frame each
time. Changed JOGLKBD to allow manual initialization of the parent
container rather than obtaining it from a CreateNotify or
ConfigureNotify event since these will never be generated in the
applet case. Removed various calls to System.exit(), although strictly
speaking this is no longer necessary because it is expected that the
separate_jvm parameter will be used in conjunction with the new Java
Plug-In to create a fresh JVM instance for each run of Jake2. Video
mode switching in applet mode is working; the applet resizes (via
JavaScript) to accommodate the newly selected resolution. Full screen
mode when running as an applet is not implemented at this point, as
the intent was to show this inside the browser, though support could
be added very straightforwardly.


Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Q2DataDialog.java	27 Feb 2007 14:39:03 -0000	1.15
--- Q2DataDialog.java	2 Mar 2008 20:21:13 -0000	1.16
***************
*** 179,183 ****
      
      private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {
!     	System.exit(1);
      	dispose();
      }
--- 179,185 ----
      
      private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {
!         if (!Globals.appletMode) {
!             System.exit(1);
!         }
      	dispose();
      }
***************
*** 213,217 ****
  
      private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
!     	System.exit(1);
      	dispose();
      }//GEN-LAST:event_formWindowClosing
--- 215,221 ----
  
      private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
!         if (!Globals.appletMode) {
!             System.exit(1);
!         }
      	dispose();
      }//GEN-LAST:event_formWindowClosing
***************
*** 402,406 ****
--- 406,412 ----
  			exit.addActionListener(new ActionListener() {
  			public void actionPerformed(ActionEvent e) {
+                             if (!Globals.appletMode) {
  				System.exit(0);
+                             }
  			}});
  			add(exit, constraints);			
***************
*** 573,577 ****
  		
  		private void exit() {
! 			System.exit(0);
  		}
  		
--- 579,585 ----
  		
  		private void exit() {
!                     if (!Globals.appletMode) {
!                         System.exit(0);
!                     }
  		}
  		

[Jake2-commits] jake2/src/jake2/sys JOGLKBD.java, 1.12, 1.13 Sys.java, 1.11, 1.12

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	JOGLKBD.java Sys.java 
Log Message:
Changes to enable Jake2 to run well as an applet inside the
next-generation Java Plug-In. Added Globals.appletMode, Globals.applet
and Globals.sizeChangeListener to be able to easily pass around the
knowledge that the system is running in applet mode, and the applet
itself, which becomes the parent container for the output. Most
changes were in Jsr231Driver to support putting the Display into a
preexisting parent container rather than a new Frame each
time. Changed JOGLKBD to allow manual initialization of the parent
container rather than obtaining it from a CreateNotify or
ConfigureNotify event since these will never be generated in the
applet case. Removed various calls to System.exit(), although strictly
speaking this is no longer necessary because it is expected that the
separate_jvm parameter will be used in conjunction with the new Java
Plug-In to create a fresh JVM instance for each run of Jake2. Video
mode switching in applet mode is working; the applet resizes (via
JavaScript) to accommodate the newly selected resolution. Full screen
mode when running as an applet is not implemented at this point, as
the intent was to show this inside the browser, though support could
be added very straightforwardly.


Index: JOGLKBD.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JOGLKBD.java	12 May 2007 15:15:32 -0000	1.12
--- JOGLKBD.java	2 Mar 2008 20:21:15 -0000	1.13
***************
*** 1,4 ****
--- 1,5 ----
  package jake2.sys;
  
+ import jake2.Globals;
  import jake2.client.Key;
  
***************
*** 22,26 ****
--- 23,29 ----
  			robot = new Robot();
  		} catch (AWTException e) {
+                     if (!Globals.appletMode) {
  			System.exit(1);
+                     }
  		}
  	}
***************
*** 29,32 ****
--- 32,41 ----
  	}
  
+         // Used only for the applet case
+         public static void Init(Component component) {
+             c = component;
+             handleCreateAndConfigureNotify(component);
+         }
+ 
  	public void Update() {
  		// get events
***************
*** 86,107 ****
  				case Jake2InputEvent.CreateNotify :
  				case Jake2InputEvent.ConfigureNotify :
! 					Component c = ((ComponentEvent)event.ev).getComponent();
! 					win_x = 0;
! 					win_y = 0;
! 					win_w2 = c.getWidth() / 2;
! 					win_h2 = c.getHeight() / 2;
! 					int left = 0; int top = 0;
! 					while (c != null) {
! 						if (c instanceof Container) {
! 							Insets insets = ((Container)c).getInsets();
! 							left += insets.left;
! 							top += insets.top;
! 						}
! 						win_x += c.getX();
! 						win_y += c.getY();
! 						c = c.getParent();
! 					}
! 					win_x += left; win_y += top;
! 					win_w2 -= left / 2; win_h2 -= top / 2;
  					break;
  			}
--- 95,99 ----
  				case Jake2InputEvent.CreateNotify :
  				case Jake2InputEvent.ConfigureNotify :
!                                         handleCreateAndConfigureNotify(((ComponentEvent)event.ev).getComponent());
  					break;
  			}
***************
*** 114,117 ****
--- 106,141 ----
  	}
  
+         private static void handleCreateAndConfigureNotify(Component component) {
+             // Probably could unify this code better, but for now just
+             // leave the two code paths separate
+             if (!Globals.appletMode) {
+                 win_x = 0;
+                 win_y = 0;
+                 win_w2 = component.getWidth() / 2;
+                 win_h2 = component.getHeight() / 2;
+                 int left = 0; int top = 0;
+                 while (component != null) {
+                     if (component instanceof Container) {
+                         Insets insets = ((Container)component).getInsets();
+                         left += insets.left;
+                         top += insets.top;
+                     }
+                     win_x += component.getX();
+                     win_y += component.getY();
+                     component = component.getParent();
+                 }
+                 win_x += left; win_y += top;
+                 win_w2 -= left / 2; win_h2 -= top / 2;
+             } else {
+                 win_x = 0;
+                 win_y = 0;
+                 win_w2 = component.getWidth() / 2;
+                 win_h2 = component.getHeight() / 2;
+                 Point p = component.getLocationOnScreen();
+                 win_x = p.x;
+                 win_y = p.y;
+             }
+         }
+ 
  	// strange button numbering in java.awt.MouseEvent
  	// BUTTON1(left) BUTTON2(center) BUTTON3(right)

Index: Sys.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Sys.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Sys.java	1 Jul 2005 14:20:54 -0000	1.11
--- Sys.java	2 Mar 2008 20:21:15 -0000	1.12
***************
*** 46,50 ****
          //StackTrace();
          new Exception(error).printStackTrace();
!         System.exit(1);
      }
  
--- 46,52 ----
          //StackTrace();
          new Exception(error).printStackTrace();
!         if (!Globals.appletMode) {
!             System.exit(1);
!         }
      }
  
***************
*** 52,56 ****
          CL.Shutdown();
  
!         System.exit(0);
      }
  
--- 54,60 ----
          CL.Shutdown();
  
!         if (!Globals.appletMode) {
!             System.exit(0);
!         }
      }
  
***************
*** 241,243 ****
      }
  
! }
\ No newline at end of file
--- 245,247 ----
      }
  
! }

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.26, 1.27

[Kenneth B. R. <kbr...@us...>]

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

Modified Files:
	Jsr231Driver.java 
Log Message:
Changes to enable Jake2 to run well as an applet inside the
next-generation Java Plug-In. Added Globals.appletMode, Globals.applet
and Globals.sizeChangeListener to be able to easily pass around the
knowledge that the system is running in applet mode, and the applet
itself, which becomes the parent container for the output. Most
changes were in Jsr231Driver to support putting the Display into a
preexisting parent container rather than a new Frame each
time. Changed JOGLKBD to allow manual initialization of the parent
container rather than obtaining it from a CreateNotify or
ConfigureNotify event since these will never be generated in the
applet case. Removed various calls to System.exit(), although strictly
speaking this is no longer necessary because it is expected that the
separate_jvm parameter will be used in conjunction with the new Java
Plug-In to create a fresh JVM instance for each run of Jake2. Video
mode switching in applet mode is working; the applet resizes (via
JavaScript) to accommodate the newly selected resolution. Full screen
mode when running as an applet is not implemented at this point, as
the intent was to show this inside the browser, though support could
be added very straightforwardly.


Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Jsr231Driver.java	2 Mar 2008 14:58:22 -0000	1.26
--- Jsr231Driver.java	2 Mar 2008 20:21:15 -0000	1.27
***************
*** 27,30 ****
--- 27,32 ----
  
  import jake2.Defines;
+ import jake2.Globals;
+ import jake2.SizeChangeListener;
  import jake2.client.VID;
  import jake2.qcommon.Cbuf;
***************
*** 55,58 ****
--- 57,64 ----
  	private volatile Frame window;
  
+         // This is either the above Window reference or the global
+         // applet if we're running in applet mode
+         private volatile Container container;
+ 
  	// window position on the screen
  	int window_xpos, window_ypos;
***************
*** 136,139 ****
--- 142,149 ----
  		VID.Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
  		
+                 if (Globals.appletMode && container == null) {
+                     container = (Container) Globals.applet;
+                 }
+ 
  		/*
  		 * full screen handling
***************
*** 144,194 ****
  		}
         
! 		if (oldDisplayMode == null) {
! 			oldDisplayMode = device.getDisplayMode();
! 		}
  
! 		if (!VID.GetModeInfo(newDim, mode)) {
! 			VID.Printf(Defines.PRINT_ALL, " invalid mode\n");
! 			return Base.rserr_invalid_mode;
! 		}
  
! 		VID.Printf(Defines.PRINT_ALL, " " + newDim.width + " " + newDim.height + '\n');
  
! 		// destroy the existing window
! 		if (window != null) shutdown();
  
! 		window = new Frame("Jake2 (jsr231)");
! 		ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
! 		window.setIconImage(icon.getImage());
! 		window.setLayout(new GridBagLayout());
  		
! 		Display canvas = new Display(new GLCapabilities());
! 		// we want keypressed events for TAB key
! 		canvas.setFocusTraversalKeysEnabled(false);
  
! 		// the OpenGL canvas grows and shrinks with the window
! 		GridBagConstraints gbc = new GridBagConstraints();
! 		gbc.fill = GridBagConstraints.BOTH;
! 		gbc.weightx = gbc.weighty = 1;
! 		window.add(canvas, gbc);
! 		
! 		canvas.setSize(newDim.width, newDim.height);
  
! 		// register event listener
! 		window.addWindowListener(new WindowAdapter() {
! 			public void windowClosing(WindowEvent e) {
!                 Cbuf.ExecuteText(Defines.EXEC_APPEND, "quit");
! 			}
! 		});
  		
! 		// D I F F E R E N T   J A K E 2   E V E N T   P R O C E S S I N G      		
! 		window.addComponentListener(JOGLKBD.listener);
! 		canvas.addKeyListener(JOGLKBD.listener);
! 		canvas.addMouseListener(JOGLKBD.listener);
! 		canvas.addMouseMotionListener(JOGLKBD.listener);
! 		canvas.addMouseWheelListener(JOGLKBD.listener);
  				        
  		if (fullscreen) {
  
  		    DisplayMode displayMode = findDisplayMode(newDim);
  
--- 154,219 ----
  		}
         
!                 if (oldDisplayMode == null) {
!                     oldDisplayMode = device.getDisplayMode();
!                 }
  
!                 if (!VID.GetModeInfo(newDim, mode)) {
!                     VID.Printf(Defines.PRINT_ALL, " invalid mode\n");
!                     return Base.rserr_invalid_mode;
!                 }
  
!                 VID.Printf(Defines.PRINT_ALL, " " + newDim.width + " " + newDim.height + '\n');
  
!                 if (!Globals.appletMode) {
!                     // destroy the existing window
!                     if (window != null) shutdown();
  
!                     window = new Frame("Jake2 (jsr231)");
!                     container = window;
!                     ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
!                     window.setIconImage(icon.getImage());
!                     window.setLayout(new GridBagLayout());
!                     // register event listener
!                     window.addWindowListener(new WindowAdapter() {
!                             public void windowClosing(WindowEvent e) {
!                                 Cbuf.ExecuteText(Defines.EXEC_APPEND, "quit");
!                             }
!                         });
!                 }
  		
!                 if (Globals.appletMode) {
!                     // Destroy the previous display if there is one
!                     shutdown();
  
!                     // We don't support full-screen mode
!                     fullscreen = false;
  
!                     // We need to feed the container to the JOGL
!                     // keyboard class manually because we'll never get
!                     // a component shown event for it
!                     JOGLKBD.Init(container);
!                 }
! 
!                 Display canvas = new Display(new GLCapabilities());
!                 // we want keypressed events for TAB key
!                 canvas.setFocusTraversalKeysEnabled(false);
!                 canvas.setSize(newDim.width, newDim.height);
! 
!                 // the OpenGL canvas grows and shrinks with the window
!                 final GridBagConstraints gbc = new GridBagConstraints();
!                 gbc.fill = GridBagConstraints.BOTH;
!                 gbc.weightx = gbc.weighty = 1;
  		
!                 // D I F F E R E N T   J A K E 2   E V E N T   P R O C E S S I N G      		
!                 container.addComponentListener(JOGLKBD.listener);
!                 canvas.addKeyListener(JOGLKBD.listener);
!                 canvas.addMouseListener(JOGLKBD.listener);
!                 canvas.addMouseMotionListener(JOGLKBD.listener);
!                 canvas.addMouseWheelListener(JOGLKBD.listener);
  				        
  		if (fullscreen) {
  
+                     container.add(canvas, gbc);
+ 
  		    DisplayMode displayMode = findDisplayMode(newDim);
  
***************
*** 210,233 ****
  
  		} else {
! 		    final Frame f2 = window;
! 		    try {
! 			EventQueue.invokeAndWait(new Runnable() {
! 			    public void run() {
! 				//f2.setLocation(window_xpos, window_ypos);
! 				f2.pack();
! 				f2.setResizable(true);
! 				f2.setVisible(true);
! 			    }
! 			});
! 		    } catch (Exception e) {
! 			e.printStackTrace();
! 		    }
  		}
  		
! 		while (!canvas.isDisplayable() || !window.isDisplayable()) {
  			try {
! 				Thread.sleep(100);
  			} catch (InterruptedException e) {}
! 		}
  		canvas.requestFocus();
  		
--- 235,280 ----
  
  		} else {
!                     if (!Globals.appletMode) {
!                         container.add(canvas, gbc);
!                         final Frame f2 = window;
!                         try {
!                             EventQueue.invokeAndWait(new Runnable() {
!                                     public void run() {
!                                         //f2.setLocation(window_xpos, window_ypos);
!                                         f2.pack();
!                                         f2.setResizable(false);
!                                         f2.setVisible(true);
!                                     }
!                                 });
!                         } catch (Exception e) {
!                             e.printStackTrace();
!                         }
!                     } else {
!                         final Display fd = canvas;
!                         try {
!                             EventQueue.invokeAndWait(new Runnable() {
!                                     public void run() {
!                                         container.add(fd, BorderLayout.CENTER);
!                                         // Notify the size listener about the change
!                                         SizeChangeListener listener = Globals.sizeChangeListener;
!                                         if (listener != null) {
!                                             listener.sizeChanged(newDim.width, newDim.height);
!                                         }
!                                         fd.setSize(newDim.width, newDim.height);
!                                     }
!                                 });
!                         } catch (Exception e) {
!                             e.printStackTrace();
!                         }
!                     }
  		}
  		
!                 if (!Globals.appletMode) {
!                     while (!canvas.isDisplayable() || !window.isDisplayable()) {
  			try {
!                             Thread.sleep(100);
  			} catch (InterruptedException e) {}
!                     }
!                 }
  		canvas.requestFocus();
  		
***************
*** 241,277 ****
  
  	public void shutdown() {
! 		try {
  			EventQueue.invokeAndWait(new Runnable() {
  				public void run() {
! 					if (oldDisplayMode != null
! 							&& device.getFullScreenWindow() != null) {
! 						try {
! 							if (device.isFullScreenSupported()) {
! 								if (!device.getDisplayMode().equals(
! 										oldDisplayMode))
! 									device.setDisplayMode(oldDisplayMode);
  
! 							}
! 							device.setFullScreenWindow(null);
! 						} catch (Exception e) {
! 							e.printStackTrace();
! 						}
! 					}
  				}
! 			});
! 		} catch (Exception e) {
  			e.printStackTrace();
! 		}
! 		if (window != null) {
  			if (display != null) display.destroy();
  			window.dispose();
  			while (window.isDisplayable()) {
! 				try {
! 					Thread.sleep(100);
! 				} catch (InterruptedException e) {
! 				}
  
  			}
! 		}
  		display = null;
  	}
--- 288,332 ----
  
  	public void shutdown() {
!                 if (!Globals.appletMode) {
!                     try {
  			EventQueue.invokeAndWait(new Runnable() {
  				public void run() {
!                                     if (oldDisplayMode != null
!                                         && device.getFullScreenWindow() != null) {
!                                         try {
!                                             if (device.isFullScreenSupported()) {
!                                                 if (!device.getDisplayMode().equals(oldDisplayMode))
!                                                     device.setDisplayMode(oldDisplayMode);
  
!                                             }
!                                             device.setFullScreenWindow(null);
!                                         } catch (Exception e) {
!                                             e.printStackTrace();
!                                         }
!                                     }
  				}
!                             });
!                     } catch (Exception e) {
  			e.printStackTrace();
!                     }
! 
!                     if (window != null) {
  			if (display != null) display.destroy();
  			window.dispose();
  			while (window.isDisplayable()) {
!                             try {
!                                 Thread.sleep(100);
!                             } catch (InterruptedException e) {
!                             }
  
  			}
!                     }
!                 } else {
!                     if (display != null) {
!                         display.destroy();
!                         // Remove the old display if there is one
!                         container.remove(display);
!                     }
!                 }
  		display = null;
  	}

[Jake2-commits] jake2/src/jake2/client Console.java,1.8,1.9

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

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

Modified Files:
	Console.java 
Log Message:
bugfix: cast the space to byte avoid array overflows

Index: Console.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Console.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Console.java	2 Mar 2008 14:56:22 -0000	1.8
--- Console.java	2 Mar 2008 16:43:18 -0000	1.9
***************
*** 295,299 ****
  	int e = i + Globals.con.linewidth;
  	while (i++ < e)
! 	    Globals.con.text[i] = ' ';
      }
  
--- 295,299 ----
  	int e = i + Globals.con.linewidth;
  	while (i++ < e)
! 	    Globals.con.text[i] = (byte) ' ';
      }
  

[Jake2-commits] jake2/src/jake2/render Renderer.java, 1.12, 1.13 RenderAPI.java, 1.3, 1.4

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

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

Modified Files:
	Renderer.java RenderAPI.java 
Log Message:
formatted

Index: RenderAPI.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/RenderAPI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RenderAPI.java	22 Nov 2006 15:05:39 -0000	1.3
--- RenderAPI.java	2 Mar 2008 16:01:28 -0000	1.4
***************
*** 50,54 ****
  
      void R_BeginFrame(float camera_separation);
!     
      void GL_ScreenShot_f();
  }
--- 50,54 ----
  
      void R_BeginFrame(float camera_separation);
! 
      void GL_ScreenShot_f();
  }

Index: Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Renderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Renderer.java	2 Mar 2008 15:40:27 -0000	1.12
--- Renderer.java	2 Mar 2008 16:01:27 -0000	1.13
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
  
! 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
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
! */
  package jake2.render;
  
--- 6,27 ----
   */
  /*
!  Copyright (C) 1997-2001 Id Software, Inc.
  
!  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
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
!  */
  package jake2.render;
  
***************
*** 36,81 ****
   */
  public class Renderer {
!     
      static RenderAPI fastRenderer = new jake2.render.fast.Misc();
      static RenderAPI basicRenderer = new jake2.render.basic.Misc();
  
! 	static Vector drivers = new Vector(3);
  
! 	static {
! 	    try {
! 		try {
! 		    Class.forName("net.java.games.jogl.GL");
! 		    Class.forName("jake2.render.JoglRenderer");
! 		} catch (ClassNotFoundException e) {
! 		    // ignore the oldjogl drivers if runtime not in classpath
! 		}
! 		try {
! 		    Class.forName("org.lwjgl.opengl.GL11");
! 		    Class.forName("jake2.render.LwjglRenderer");
! 		} catch (ClassNotFoundException e) {
! 		    // ignore the lwjgl driver if runtime not in classpath
! 		}
! 		try {
! 		    Class.forName("javax.media.opengl.GL");
! 		    Class.forName("jake2.render.Jsr231Renderer");
! 		} catch (ClassNotFoundException e) {
! 		    // ignore the jnew ogl drivers if runtime not in classpath
! 		}
! 	    } catch (Throwable e) {
! 		e.printStackTrace();
! 	    }
! 	};
  
! 	public static void register(Ref impl) {
! 		if (impl == null) {
! 			throw new IllegalArgumentException("Ref implementation can't be null");
! 		}
! 		if (!drivers.contains(impl)) {
! 			drivers.add(impl);
! 		}
! 	}
  
      /**
       * Factory method to get the Renderer implementation.
       * @return refexport_t (Renderer singleton)
       */
--- 36,83 ----
   */
  public class Renderer {
! 
      static RenderAPI fastRenderer = new jake2.render.fast.Misc();
      static RenderAPI basicRenderer = new jake2.render.basic.Misc();
  
!     static Vector drivers = new Vector(3);
  
!     static {
!         try {
!             try {
!                 Class.forName("net.java.games.jogl.GL");
!                 Class.forName("jake2.render.JoglRenderer");
!             } catch (ClassNotFoundException e) {
!                 // ignore the old jogl driver if runtime not in classpath
!             }
!             try {
!                 Class.forName("org.lwjgl.opengl.GL11");
!                 Class.forName("jake2.render.LwjglRenderer");
!             } catch (ClassNotFoundException e) {
!                 // ignore the lwjgl driver if runtime not in classpath
!             }
!             try {
!                 Class.forName("javax.media.opengl.GL");
!                 Class.forName("jake2.render.Jsr231Renderer");
!             } catch (ClassNotFoundException e) {
!                 // ignore the new jogl driver if runtime not in classpath
!             }
!         } catch (Throwable e) {
!             e.printStackTrace();
!         }
!     };
  
!     public static void register(Ref impl) {
!         if (impl == null) {
!             throw new IllegalArgumentException(
!                     "Ref implementation can't be null");
!         }
!         if (!drivers.contains(impl)) {
!             drivers.add(impl);
!         }
!     }
  
      /**
       * Factory method to get the Renderer implementation.
+      * 
       * @return refexport_t (Renderer singleton)
       */
***************
*** 85,122 ****
  
      /**
! 	 * Factory method to get the Renderer implementation.
! 	 * @return refexport_t (Renderer singleton)
! 	 */
! 	public static refexport_t getDriver(String driverName, boolean fast) {
! 		// find a driver
! 		Ref driver = null;
! 		int count = drivers.size();
! 		for (int i = 0; i < count; i++) {
! 			driver = (Ref) drivers.get(i);
! 			if (driver.getName().equals(driverName)) {
! 				return driver.GetRefAPI((fast) ? fastRenderer : basicRenderer);
! 			}
! 		}
! 		// null if driver not found
! 		return null;
! 	}
! 	
! 	public static String getDefaultName() {
! 		return (drivers.isEmpty()) ? null : ((Ref) drivers.firstElement()).getName();
! 	}
  
! 	public static String getPreferedName() {
! 		return (drivers.isEmpty()) ? null :  ((Ref) drivers.lastElement()).getName();
! 	}
  
! 	public static String[] getDriverNames() {
! 		if (drivers.isEmpty()) return null;
! 		int count = drivers.size();
! 		String[] names = new String[count];
! 		for (int i = 0; i < count; i++) {
! 			names[i] = ((Ref) drivers.get(i)).getName();
! 		}
! 		return names;
! 	}
  
  }
\ No newline at end of file
--- 87,129 ----
  
      /**
!      * Factory method to get the Renderer implementation.
!      * 
!      * @return refexport_t (Renderer singleton)
!      */
!     public static refexport_t getDriver(String driverName, boolean fast) {
!         // find a driver
!         Ref driver = null;
!         int count = drivers.size();
!         for (int i = 0; i < count; i++) {
!             driver = (Ref) drivers.get(i);
!             if (driver.getName().equals(driverName)) {
!                 return driver.GetRefAPI((fast) ? fastRenderer : basicRenderer);
!             }
!         }
!         // null if driver not found
!         return null;
!     }
  
!     public static String getDefaultName() {
!         return (drivers.isEmpty()) ? null : ((Ref) drivers.firstElement())
!                 .getName();
!     }
  
!     public static String getPreferedName() {
!         return (drivers.isEmpty()) ? null : ((Ref) drivers.lastElement())
!                 .getName();
!     }
! 
!     public static String[] getDriverNames() {
!         if (drivers.isEmpty())
!             return null;
! 
!         int count = drivers.size();
!         String[] names = new String[count];
!         for (int i = 0; i < count; i++) {
!             names[i] = ((Ref) drivers.get(i)).getName();
!         }
!         return names;
!     }
  
  }
\ No newline at end of file

[Jake2-commits] jake2/.settings org.eclipse.jdt.core.prefs, 1.4, 1.5 org.eclipse.jdt.ui.prefs, 1.3, 1.4

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

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

Modified Files:
	org.eclipse.jdt.core.prefs org.eclipse.jdt.ui.prefs 
Log Message:
use java code style conventions but with spaces only

Index: org.eclipse.jdt.core.prefs
===================================================================
RCS file: /cvsroot/jake2/jake2/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** org.eclipse.jdt.core.prefs	2 Mar 2008 08:28:16 -0000	1.4
--- org.eclipse.jdt.core.prefs	2 Mar 2008 15:59:57 -0000	1.5
***************
*** 1,4 ****
! #Sun Mar 02 09:25:39 CET 2008
  eclipse.preferences.version=1
  org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
--- 1,12 ----
! #Sun Mar 02 16:46:58 CET 2008
  eclipse.preferences.version=1
+ org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+ org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+ org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+ org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+ org.eclipse.jdt.core.codeComplete.localPrefixes=
+ org.eclipse.jdt.core.codeComplete.localSuffixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
  org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
  org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
***************
*** 83,87 ****
  org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
  org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
! org.eclipse.jdt.core.formatter.indentation.size=4
  org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
  org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
--- 91,95 ----
  org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
  org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
! org.eclipse.jdt.core.formatter.indentation.size=8
  org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
  org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
***************
*** 263,268 ****
  org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
  org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
! org.eclipse.jdt.core.formatter.tabulation.char=mixed
! org.eclipse.jdt.core.formatter.tabulation.size=8
  org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
  org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
--- 271,276 ----
  org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
  org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
! org.eclipse.jdt.core.formatter.tabulation.char=space
! org.eclipse.jdt.core.formatter.tabulation.size=4
  org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
  org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

Index: org.eclipse.jdt.ui.prefs
===================================================================
RCS file: /cvsroot/jake2/jake2/.settings/org.eclipse.jdt.ui.prefs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** org.eclipse.jdt.ui.prefs	1 Mar 2008 17:42:47 -0000	1.3
--- org.eclipse.jdt.ui.prefs	2 Mar 2008 15:59:57 -0000	1.4
***************
*** 1,9 ****
! #Sat Mar 01 18:36:38 GMT+01:00 2008
  eclipse.preferences.version=1
! formatter_profile=org.eclipse.jdt.ui.default.sun_profile
  formatter_settings_version=11
  org.eclipse.jdt.ui.ignorelowercasenames=true
  org.eclipse.jdt.ui.importorder=java;javax;org;com;
  org.eclipse.jdt.ui.ondemandthreshold=4
  org.eclipse.jdt.ui.staticondemandthreshold=4
! org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
--- 1,14 ----
! #Sun Mar 02 16:57:03 CET 2008
  eclipse.preferences.version=1
! formatter_profile=_Jake2 Conventions
  formatter_settings_version=11
+ org.eclipse.jdt.ui.exception.name=e
+ org.eclipse.jdt.ui.gettersetter.use.is=true
  org.eclipse.jdt.ui.ignorelowercasenames=true
  org.eclipse.jdt.ui.importorder=java;javax;org;com;
+ org.eclipse.jdt.ui.javadoc=false
+ org.eclipse.jdt.ui.keywordthis=false
  org.eclipse.jdt.ui.ondemandthreshold=4
+ org.eclipse.jdt.ui.overrideannotation=true
  org.eclipse.jdt.ui.staticondemandthreshold=4
! org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>

[Jake2-commits] jake2/src/jake2/render Renderer.java, 1.11, 1.12 Jsr231cbRenderer.java, 1.2, NONE

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

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

Modified Files:
	Renderer.java 
Removed Files:
	Jsr231cbRenderer.java 
Log Message:
the callback renderer is never used

--- Jsr231cbRenderer.java DELETED ---

Index: Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Renderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Renderer.java	11 Dec 2006 15:44:29 -0000	1.11
--- Renderer.java	2 Mar 2008 15:40:27 -0000	1.12
***************
*** 48,52 ****
  		    Class.forName("jake2.render.JoglRenderer");
  		} catch (ClassNotFoundException e) {
! 		    // ignore the fastjogl drivers if runtime not in classpath
  		}
  		try {
--- 48,52 ----
  		    Class.forName("jake2.render.JoglRenderer");
  		} catch (ClassNotFoundException e) {
! 		    // ignore the oldjogl drivers if runtime not in classpath
  		}
  		try {
***************
*** 58,69 ****
  		try {
  		    Class.forName("javax.media.opengl.GL");
! 		    // TODO this is a hack for Win32
! 		    if (System.getProperty("os.name").startsWith("Windows")) {
! 			    Class.forName("jake2.render.Jsr231Renderer");
! 		    } else {
! 			    Class.forName("jake2.render.Jsr231Renderer");
! 		    }
  		} catch (ClassNotFoundException e) {
! 		    // ignore the jogl drivers if runtime not in classpath
  		}
  	    } catch (Throwable e) {
--- 58,64 ----
  		try {
  		    Class.forName("javax.media.opengl.GL");
! 		    Class.forName("jake2.render.Jsr231Renderer");
  		} catch (ClassNotFoundException e) {
! 		    // ignore the jnew ogl drivers if runtime not in classpath
  		}
  	    } catch (Throwable e) {

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231cbDriver.java, 1.3, NONE

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

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

Removed Files:
	Jsr231cbDriver.java 
Log Message:
the callback renderer is never used

--- Jsr231cbDriver.java DELETED ---

[Jake2-commits] jake2/src/jake2/client viddef_t.java,1.2,1.3

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

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

Modified Files:
	viddef_t.java 
Log Message:
better javadoc

Index: viddef_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/viddef_t.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** viddef_t.java	2 Mar 2008 14:53:46 -0000	1.2
--- viddef_t.java	2 Mar 2008 15:11:09 -0000	1.3
***************
*** 29,33 ****
  
      /**
!      * This method doesn't affect <code>width</code> and <code>height</code>
       * directly. The new values will be active after an <code>update()</code>
       * call.
--- 29,33 ----
  
      /**
!      * This method hasn't an effect on <code>width</code> and <code>height</code>
       * directly. The new values will be active after an <code>update()</code>
       * call.

[Jake2-commits] jake2/src/jake2/render/opengl Jsr231Driver.java, 1.25, 1.26

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

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

Modified Files:
	Jsr231Driver.java 
Log Message:
changes to handle resizable screens.
GridBagLayout is used to resize the GL canvas together with the frame

Index: Jsr231Driver.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Jsr231Driver.java	3 Nov 2007 13:04:23 -0000	1.25
--- Jsr231Driver.java	2 Mar 2008 14:58:22 -0000	1.26
***************
*** 137,141 ****
  		
  		/*
! 		 * fullscreen handling
  		 */
  		if (device == null) {
--- 137,141 ----
  		
  		/*
! 		 * full screen handling
  		 */
  		if (device == null) {
***************
*** 161,164 ****
--- 161,165 ----
  		ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
  		window.setIconImage(icon.getImage());
+ 		window.setLayout(new GridBagLayout());
  		
  		Display canvas = new Display(new GLCapabilities());
***************
*** 166,170 ****
  		canvas.setFocusTraversalKeysEnabled(false);
  
! 		window.add(canvas);	
  		canvas.setSize(newDim.width, newDim.height);
  
--- 167,176 ----
  		canvas.setFocusTraversalKeysEnabled(false);
  
! 		// the OpenGL canvas grows and shrinks with the window
! 		GridBagConstraints gbc = new GridBagConstraints();
! 		gbc.fill = GridBagConstraints.BOTH;
! 		gbc.weightx = gbc.weighty = 1;
! 		window.add(canvas, gbc);
! 		
  		canvas.setSize(newDim.width, newDim.height);
  
***************
*** 210,214 ****
  				//f2.setLocation(window_xpos, window_ypos);
  				f2.pack();
! 				f2.setResizable(false);
  				f2.setVisible(true);
  			    }
--- 216,220 ----
  				//f2.setLocation(window_xpos, window_ypos);
  				f2.pack();
! 				f2.setResizable(true);
  				f2.setVisible(true);
  			    }
***************
*** 228,235 ****
  		this.display = canvas;
  
- 		Base.setVid(newDim.width, newDim.height);
- 
- 		// let the sound and input subsystems know about the new window
- 		VID.NewWindow(newDim.width, newDim.height);
  		setGL(display.getGL());
  		init(0, 0);
--- 234,237 ----
***************
*** 285,289 ****
  	    // 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);
--- 287,291 ----
  	    // first buffer
  	    beginFrame(0.0f);
! 	    glViewport(0, 0, display.getWidth(), display.getHeight());
  	    glClearColor(0, 0, 0, 0);
  	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
***************
*** 291,295 ****
  	    // 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);
--- 293,297 ----
  	    // second buffer
  	    beginFrame(0.0f);
! 	    glViewport(0, 0, display.getWidth(), display.getHeight());
  	    glClearColor(0, 0, 0, 0);
  	    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
***************
*** 348,352 ****
              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
--- 350,373 ----
              return context.getGL();
          }
!         
!         
!     /**
! 	 * @see java.awt.Component#setBounds(int, int, int, int)
! 	 */
! 	public void setBounds(int x, int y, int width, int height) {
! 	    final int mask = ~0x03;
! 	    if ((width & 0x03) != 0) {
! 		width &= mask;
! 		width += 4;
! 	    }
! 
! //	    System.out.println("display bounds: " + x + ", " + y + ", " +  width + ", " + height);
! 	    super.setBounds(x, y, width, height);
! 	    Base.setVid(width, height);
! 	    // let the sound and input subsystems know about the new window
! 	    VID.NewWindow(width, height);
! 	}
! 
! 	/** <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

[Jake2-commits] jake2/src/jake2/client VID.java, 1.20, 1.21 CL_view.java, 1.4, 1.5 CL_inv.java, 1.3, 1.4 Console.java, 1.7, 1.8 Menu.java, 1.22, 1.23 SCR.java, 1.20, 1.21

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

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

Modified Files:
	VID.java CL_view.java CL_inv.java Console.java Menu.java 
	SCR.java 
Log Message:
use getters and setters of modified viddef_t

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** VID.java	13 Jan 2007 18:36:23 -0000	1.20
--- VID.java	2 Mar 2008 14:56:22 -0000	1.21
***************
*** 148,153 ****
  	*/
  	public static void NewWindow(int width, int height) {
! 		Globals.viddef.width = width;
! 		Globals.viddef.height = height;
  	}
  
--- 148,152 ----
  	*/
  	public static void NewWindow(int width, int height) {
! 		Globals.viddef.setSize(width, height);
  	}
  
***************
*** 239,244 ****
  	public static void CheckChanges()
  	{
! 		cvar_t gl_mode;
! 
  		if ( vid_ref.modified )
  		{
--- 238,243 ----
  	public static void CheckChanges()
  	{
! 	    Globals.viddef.update();
! 	    
  		if ( vid_ref.modified )
  		{
***************
*** 566,570 ****
  		}
  
! 		s_opengl_menu.x = (int)(viddef.width * 0.50f);
  		s_opengl_menu.nitems = 0;
  		
--- 565,569 ----
  		}
  
! 		s_opengl_menu.x = (int)(viddef.getWidth() * 0.50f);
  		s_opengl_menu.nitems = 0;
  		
***************
*** 706,710 ****
  		Dimension dim = new Dimension();
  		re.DrawGetPicSize( dim, "m_banner_video" );
! 		re.DrawPic( viddef.width / 2 - dim.width / 2, viddef.height /2 - 110, "m_banner_video" );
  
  		/*
--- 705,709 ----
  		Dimension dim = new Dimension();
  		re.DrawGetPicSize( dim, "m_banner_video" );
! 		re.DrawPic( viddef.getWidth() / 2 - dim.width / 2, viddef.getHeight() /2 - 110, "m_banner_video" );
  
  		/*

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Menu.java	2 Mar 2008 08:35:30 -0000	1.22
--- Menu.java	2 Mar 2008 14:56:22 -0000	1.23
***************
*** 178,183 ****
          Globals.re.DrawGetPicSize(dim, name);
  
!         Globals.re.DrawPic(viddef.width / 2 - dim.width / 2,
!                 viddef.height / 2 - 110, name);
      }
  
--- 178,183 ----
          Globals.re.DrawGetPicSize(dim, name);
  
!         Globals.re.DrawPic(viddef.getWidth() / 2 - dim.width / 2,
!                 viddef.getHeight() / 2 - 110, name);
      }
  
***************
*** 327,332 ****
       */
      public static void DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.width - 320) >> 1), cy
!                 + ((viddef.height - 240) >> 1), num);
      }
  
--- 327,332 ----
       */
      public static void DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.getWidth() - 320) >> 1), cy
!                 + ((viddef.getHeight() - 240) >> 1), num);
      }
  
***************
*** 349,354 ****
  
      public static void DrawPic(int x, int y, String pic) {
!         re.DrawPic(x + ((viddef.width - 320) >> 1), y
!                 + ((viddef.height - 240) >> 1), pic);
      }
  
--- 349,354 ----
  
      public static void DrawPic(int x, int y, String pic) {
!         re.DrawPic(x + ((viddef.getWidth() - 320) >> 1), y
!                 + ((viddef.getHeight() - 240) >> 1), pic);
      }
  
***************
*** 455,460 ****
          }
  
!         ystart = (Globals.viddef.height / 2 - 110);
!         xoffset = (Globals.viddef.width - widest + 70) / 2;
  
          for (i = 0; i < names.length; i++) {
--- 455,460 ----
          }
  
!         ystart = (Globals.viddef.getHeight() / 2 - 110);
!         xoffset = (Globals.viddef.getWidth() - widest + 70) / 2;
  
          for (i = 0; i < names.length; i++) {
***************
*** 587,591 ****
  
      static void Multiplayer_MenuInit() {
!         s_multiplayer_menu.x = (int) (viddef.width * 0.50f - 64);
          s_multiplayer_menu.nitems = 0;
  
--- 587,591 ----
  
      static void Multiplayer_MenuInit() {
!         s_multiplayer_menu.x = (int) (viddef.getWidth() * 0.50f - 64);
          s_multiplayer_menu.nitems = 0;
  
***************
*** 818,822 ****
          int i = 0;
  
!         s_keys_menu.x = (int) (viddef.width * 0.50);
          s_keys_menu.nitems = 0;
          s_keys_menu.cursordraw = new mcallback() {
--- 818,822 ----
          int i = 0;
  
!         s_keys_menu.x = (int) (viddef.getWidth() * 0.50);
          s_keys_menu.nitems = 0;
          s_keys_menu.cursordraw = new mcallback() {
***************
*** 1447,1452 ****
           * * configure controls menu and menu items
           */
!         s_options_menu.x = viddef.width / 2;
!         s_options_menu.y = viddef.height / 2 - 58;
          s_options_menu.nitems = 0;
  
--- 1447,1452 ----
           * * configure controls menu and menu items
           */
!         s_options_menu.x = viddef.getWidth() / 2;
!         s_options_menu.y = viddef.getHeight() / 2 - 58;
          s_options_menu.nitems = 0;
  
***************
*** 1842,1847 ****
           * * draw the credits
           */
!         for (i = 0, y = (int) (viddef.height - ((cls.realtime - credits_start_time) / 40.0F)); credits[i] != null
!                 && y < viddef.height; y += 10, i++) {
              int j, stringoffset = 0;
              boolean bold = false;
--- 1842,1847 ----
           * * draw the credits
           */
!         for (i = 0, y = (int) (viddef.getHeight() - ((cls.realtime - credits_start_time) / 40.0F)); credits[i] != null
!                 && y < viddef.getHeight(); y += 10, i++) {
              int j, stringoffset = 0;
              boolean bold = false;
***************
*** 1861,1865 ****
                  int x;
  
!                 x = (viddef.width - credits[i].length() * 8 - stringoffset * 8)
                          / 2 + (j + stringoffset) * 8;
  
--- 1861,1865 ----
                  int x;
  
!                 x = (viddef.getWidth() - credits[i].length() * 8 - stringoffset * 8)
                          / 2 + (j + stringoffset) * 8;
  
***************
*** 2009,2013 ****
      static void Game_MenuInit() {
  
!         s_game_menu.x = (int) (viddef.width * 0.50);
          s_game_menu.nitems = 0;
  
--- 2009,2013 ----
      static void Game_MenuInit() {
  
!         s_game_menu.x = (int) (viddef.getWidth() * 0.50);
          s_game_menu.nitems = 0;
  
***************
*** 2195,2200 ****
          int i;
  
!         s_loadgame_menu.x = viddef.width / 2 - 120;
!         s_loadgame_menu.y = viddef.height / 2 - 58;
          s_loadgame_menu.nitems = 0;
  
--- 2195,2200 ----
          int i;
  
!         s_loadgame_menu.x = viddef.getWidth() / 2 - 120;
!         s_loadgame_menu.y = viddef.getHeight() / 2 - 58;
          s_loadgame_menu.nitems = 0;
  
***************
*** 2288,2293 ****
          int i;
  
!         s_savegame_menu.x = viddef.width / 2 - 120;
!         s_savegame_menu.y = viddef.height / 2 - 58;
          s_savegame_menu.nitems = 0;
  
--- 2288,2293 ----
          int i;
  
!         s_savegame_menu.x = viddef.getWidth() / 2 - 120;
!         s_savegame_menu.y = viddef.getHeight() / 2 - 58;
          s_savegame_menu.nitems = 0;
  
***************
*** 2452,2456 ****
          int i;
  
!         s_joinserver_menu.x = (int) (viddef.width * 0.50 - 120);
          s_joinserver_menu.nitems = 0;
  
--- 2452,2456 ----
          int i;
  
!         s_joinserver_menu.x = (int) (viddef.getWidth() * 0.50 - 120);
          s_joinserver_menu.nitems = 0;
  
***************
*** 2749,2753 ****
           * * initialize the menu stuff
           */
!         s_startserver_menu.x = (int) (viddef.width * 0.50);
          s_startserver_menu.nitems = 0;
  
--- 2749,2753 ----
           * * initialize the menu stuff
           */
!         s_startserver_menu.x = (int) (viddef.getWidth() * 0.50);
          s_startserver_menu.nitems = 0;
  
***************
*** 3082,3086 ****
          int y = 0;
  
!         s_dmoptions_menu.x = (int) (viddef.width * 0.50);
          s_dmoptions_menu.nitems = 0;
  
--- 3082,3086 ----
          int y = 0;
  
!         s_dmoptions_menu.x = (int) (viddef.getWidth() * 0.50);
          s_dmoptions_menu.nitems = 0;
  
***************
*** 3436,3440 ****
          int y = 0;
  
!         s_downloadoptions_menu.x = (int) (viddef.width * 0.50);
          s_downloadoptions_menu.nitems = 0;
  
--- 3436,3440 ----
          int y = 0;
  
!         s_downloadoptions_menu.x = (int) (viddef.getWidth() * 0.50);
          s_downloadoptions_menu.nitems = 0;
  
***************
*** 3567,3572 ****
  
      static void AddressBook_MenuInit() {
!         s_addressbook_menu.x = viddef.width / 2 - 142;
!         s_addressbook_menu.y = viddef.height / 2 - 58;
          s_addressbook_menu.nitems = 0;
  
--- 3567,3572 ----
  
      static void AddressBook_MenuInit() {
!         s_addressbook_menu.x = viddef.getWidth() / 2 - 142;
!         s_addressbook_menu.y = viddef.getHeight() / 2 - 58;
          s_addressbook_menu.nitems = 0;
  
***************
*** 3959,3964 ****
          }
  
!         s_player_config_menu.x = viddef.width / 2 - 95;
!         s_player_config_menu.y = viddef.height / 2 - 97;
          s_player_config_menu.nitems = 0;
  
--- 3959,3964 ----
          }
  
!         s_player_config_menu.x = viddef.getWidth() / 2 - 95;
!         s_player_config_menu.y = viddef.getHeight() / 2 - 97;
          s_player_config_menu.nitems = 0;
  
***************
*** 4084,4089 ****
          //memset(refdef, 0, sizeof(refdef));
  
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144;
          refdef.height = 168;
--- 4084,4089 ----
          //memset(refdef, 0, sizeof(refdef));
  
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144;
          refdef.height = 168;
***************
*** 4130,4135 ****
  
              DrawTextBox(
!                     (int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                     (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                      refdef.width / 8, refdef.height / 8);
              refdef.height += 4;
--- 4130,4135 ----
  
              DrawTextBox(
!                     (int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                     (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                      refdef.width / 8, refdef.height / 8);
              refdef.height += 4;
***************
*** 4235,4239 ****
          w = d.width;
          h = d.height;
!         re.DrawPic((viddef.width - w) / 2, (viddef.height - h) / 2, "quit");
      }
  
--- 4235,4239 ----
          w = d.width;
          h = d.height;
!         re.DrawPic((viddef.getWidth() - w) / 2, (viddef.getHeight() - h) / 2, "quit");
      }
  
***************
*** 4297,4301 ****
          // dim everything behind it down
          if (cl.cinematictime > 0)
!             re.DrawFill(0, 0, viddef.width, viddef.height, 0);
          else
              re.DrawFadeScreen();
--- 4297,4301 ----
          // dim everything behind it down
          if (cl.cinematictime > 0)
!             re.DrawFill(0, 0, viddef.getWidth(), viddef.getHeight(), 0);
          else
              re.DrawFadeScreen();
***************
*** 4596,4600 ****
          height += 10;
  
!         menu.y = (viddef.height - height) / 2;
      }
  
--- 4596,4600 ----
          height += 10;
  
!         menu.y = (viddef.getHeight() - height) / 2;
      }
  
***************
*** 4661,4672 ****
          if (string != null) {
              int l = string.length();
!             int maxrow = viddef.height / 8;
!             int maxcol = viddef.width / 8;
              int col = maxcol / 2 - l / 2;
  
!             re.DrawFill(0, viddef.height - 8, viddef.width, 8, 4);
!             Menu_DrawString(col * 8, viddef.height - 8, string);
          } else {
!             re.DrawFill(0, viddef.height - 8, viddef.width, 8, 0);
          }
      }
--- 4661,4672 ----
          if (string != null) {
              int l = string.length();
!             int maxrow = viddef.getHeight() / 8;
!             int maxcol = viddef.getWidth() / 8;
              int col = maxcol / 2 - l / 2;
  
!             re.DrawFill(0, viddef.getHeight() - 8, viddef.getWidth(), 8, 4);
!             Menu_DrawString(col * 8, viddef.getHeight() - 8, string);
          } else {
!             re.DrawFill(0, viddef.getHeight() - 8, viddef.getWidth(), 8, 0);
          }
      }

Index: Console.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Console.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Console.java	30 Jun 2005 08:36:22 -0000	1.7
--- Console.java	2 Mar 2008 14:56:22 -0000	1.8
***************
*** 43,169 ****
  
      public static xcommand_t ToggleConsole_f = new xcommand_t() {
!         public void execute() {
!             SCR.EndLoadingPlaque(); // get rid of loading plaque
  
!             if (Globals.cl.attractloop) {
!                 Cbuf.AddText("killserver\n");
!                 return;
!             }
  
[...1053 lines suppressed...]
! 		if (j == n)
! 		    dlbar.append((char) 0x83);
! 		else
! 		    dlbar.append((char) 0x81);
! 	    }
! 	    dlbar.append((char) 0x82);
! 	    dlbar.append((cls.downloadpercent < 10) ? " 0" : " ");
! 	    dlbar.append(cls.downloadpercent).append('%');
! 	    // draw it
! 	    y = con.vislines - 12;
! 	    for (i = 0; i < dlbar.length(); i++)
! 		re.DrawChar((i + 1) << 3, y, dlbar.charAt(i));
! 	}
! 	// ZOID
! 
! 	// draw the input prompt, user text, and cursor if desired
! 	DrawInput();
      }
  }
\ No newline at end of file

Index: CL_view.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_view.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CL_view.java	22 Sep 2004 19:22:07 -0000	1.4
--- CL_view.java	2 Mar 2008 14:56:22 -0000	1.5
***************
*** 58,62 ****
  
          SCR.AddDirtyPoint(0, 0);
!         SCR.AddDirtyPoint(Globals.viddef.width - 1, Globals.viddef.height - 1);
  
          // let the render dll load the map
--- 58,62 ----
  
          SCR.AddDirtyPoint(0, 0);
!         SCR.AddDirtyPoint(Globals.viddef.getWidth() - 1, Globals.viddef.getHeight() - 1);
  
          // let the render dll load the map

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SCR.java	13 May 2007 00:07:34 -0000	1.20
--- SCR.java	2 Mar 2008 14:56:22 -0000	1.21
***************
*** 298,302 ****
  
          if (scr_center_lines <= 4)
!             y = (int) (viddef.height * 0.35);
          else
              y = 48;
--- 298,302 ----
  
          if (scr_center_lines <= 4)
!             y = (int) (viddef.getHeight() * 0.35);
          else
              y = 48;
***************
*** 308,312 ****
                          || cs.charAt(start + l) == '\n')
                      break;
!             x = (viddef.width - l * 8) / 2;
              SCR.AddDirtyPoint(x, y);
              for (j = 0; j < l; j++, x += 8) {
--- 308,312 ----
                          || cs.charAt(start + l) == '\n')
                      break;
!             x = (viddef.getWidth() - l * 8) / 2;
              SCR.AddDirtyPoint(x, y);
              for (j = 0; j < l; j++, x += 8) {
***************
*** 356,367 ****
          size = (int) scr_viewsize.value;
  
!         scr_vrect.width = viddef.width * size / 100;
          scr_vrect.width &= ~7;
  
!         scr_vrect.height = viddef.height * size / 100;
          scr_vrect.height &= ~1;
  
!         scr_vrect.x = (viddef.width - scr_vrect.width) / 2;
!         scr_vrect.y = (viddef.height - scr_vrect.height) / 2;
      }
  
--- 356,367 ----
          size = (int) scr_viewsize.value;
  
!         scr_vrect.width = viddef.getWidth() * size / 100;
          scr_vrect.width &= ~7;
  
!         scr_vrect.height = viddef.getHeight() * size / 100;
          scr_vrect.height &= ~1;
  
!         scr_vrect.x = (viddef.getWidth() - scr_vrect.width) / 2;
!         scr_vrect.y = (viddef.getHeight() - scr_vrect.height) / 2;
      }
  
***************
*** 490,494 ****
  
          re.DrawGetPicSize(dim, "pause");
!         re.DrawPic((viddef.width - dim.width) / 2, viddef.height / 2 + 8,
                  "pause");
      }
--- 490,494 ----
  
          re.DrawGetPicSize(dim, "pause");
!         re.DrawPic((viddef.getWidth() - dim.width) / 2, viddef.getHeight() / 2 + 8,
                  "pause");
      }
***************
*** 505,510 ****
          scr_draw_loading = 0;
          re.DrawGetPicSize(dim, "loading");
!         re.DrawPic((viddef.width - dim.width) / 2,
!                 (viddef.height - dim.height) / 2, "loading");
      }
  
--- 505,510 ----
          scr_draw_loading = 0;
          re.DrawGetPicSize(dim, "loading");
!         re.DrawPic((viddef.getWidth() - dim.width) / 2,
!                 (viddef.getHeight() - dim.height) / 2, "loading");
      }
  
***************
*** 552,556 ****
                                                               // can't render
              Console.DrawConsole(0.5f);
!             re.DrawFill(0, viddef.height / 2, viddef.width, viddef.height / 2,
                      0);
              return;
--- 552,556 ----
                                                               // can't render
              Console.DrawConsole(0.5f);
!             re.DrawFill(0, viddef.getHeight() / 2, viddef.getWidth(), viddef.getHeight() / 2,
                      0);
              return;
***************
*** 645,649 ****
      static void DirtyScreen() {
          AddDirtyPoint(0, 0);
!         AddDirtyPoint(viddef.width - 1, viddef.height - 1);
      }
  
--- 645,649 ----
      static void DirtyScreen() {
          AddDirtyPoint(0, 0);
!         AddDirtyPoint(viddef.getWidth() - 1, viddef.getHeight() - 1);
      }
  
***************
*** 695,699 ****
  
          // don't bother with anything convered by the console)
!         top = (int) (scr_con_current * viddef.height);
          if (top >= clear.y1)
              clear.y1 = top;
--- 695,699 ----
  
          // don't bother with anything convered by the console)
!         top = (int) (scr_con_current * viddef.getHeight());
          if (top >= clear.y1)
              clear.y1 = top;
***************
*** 903,912 ****
              if (parser.tokenEquals("xr")) {
                  parser.next();
!                 x = viddef.width + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("xv")) {
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  continue;
              }
--- 903,912 ----
              if (parser.tokenEquals("xr")) {
                  parser.next();
!                 x = viddef.getWidth() + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("xv")) {
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  continue;
              }
***************
*** 919,928 ****
              if (parser.tokenEquals("yb")) {
                  parser.next();
!                 y = viddef.height + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("yv")) {
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  continue;
              }
--- 919,928 ----
              if (parser.tokenEquals("yb")) {
                  parser.next();
!                 y = viddef.getHeight() + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("yv")) {
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  continue;
              }
***************
*** 945,951 ****
  
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
--- 945,951 ----
  
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
***************
*** 982,988 ****
  
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
--- 982,988 ----
  
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
***************
*** 1215,1220 ****
                  scr_draw_loading = 0; // false
                  re.DrawGetPicSize(dim, "loading");
!                 re.DrawPic((viddef.width - dim.width) / 2,
!                         (viddef.height - dim.height) / 2, "loading");
              }
              // if a cinematic is supposed to be running, handle menus
--- 1215,1220 ----
                  scr_draw_loading = 0; // false
                  re.DrawGetPicSize(dim, "loading");
!                 re.DrawPic((viddef.getWidth() - dim.width) / 2,
!                         (viddef.getHeight() - dim.height) / 2, "loading");
              }
              // if a cinematic is supposed to be running, handle menus
***************
*** 1346,1350 ****
                  lasttime = cls.realtime;
              }
!             int x = viddef.width - 8 * fpsvalue.length() - 2;
              for (int i = 0; i < fpsvalue.length(); i++) {
                  re.DrawChar(x, 2, fpsvalue.charAt(i));
--- 1346,1350 ----
                  lasttime = cls.realtime;
              }
!             int x = viddef.getWidth() - 8 * fpsvalue.length() - 2;
              for (int i = 0; i < fpsvalue.length(); i++) {
                  re.DrawChar(x, 2, fpsvalue.charAt(i));
***************
*** 1804,1808 ****
              return true;
          
!         Globals.re.DrawStretchRaw(0, 0, viddef.width, viddef.height, cin.width, cin.height, cin.pic);
          
          return true;
--- 1804,1808 ----
              return true;
          
!         Globals.re.DrawStretchRaw(0, 0, viddef.getWidth(), viddef.getHeight(), cin.width, cin.height, cin.pic);
          
          return true;

Index: CL_inv.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_inv.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CL_inv.java	18 Dec 2005 22:10:10 -0000	1.3
--- CL_inv.java	2 Mar 2008 14:56:22 -0000	1.4
***************
*** 104,109 ****
  			top = 0;
  
! 		x = (Globals.viddef.width - 256) / 2;
! 		y = (Globals.viddef.height - 240) / 2;
  
  		// repaint everything next frame
--- 104,109 ----
  			top = 0;
  
! 		x = (Globals.viddef.getWidth() - 256) / 2;
! 		y = (Globals.viddef.getHeight() - 240) / 2;
  
  		// repaint everything next frame

[Jake2-commits] jake2/src/jake2/render/basic Main.java, 1.4, 1.5 Draw.java, 1.2, 1.3 Misc.java, 1.4, 1.5

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

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

Modified Files:
	Main.java Draw.java Misc.java 
Log Message:
use getters and setters of modified viddef_t

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Main.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.java	27 Feb 2007 14:00:35 -0000	1.4
--- Main.java	2 Mar 2008 14:56:23 -0000	1.5
***************
*** 680,684 ****
  			gl.glScissor(
  				r_newrefdef.x,
! 				vid.height - r_newrefdef.height - r_newrefdef.y,
  				r_newrefdef.width,
  				r_newrefdef.height);
--- 680,684 ----
  			gl.glScissor(
  				r_newrefdef.x,
! 				vid.getHeight() - r_newrefdef.height - r_newrefdef.y,
  				r_newrefdef.width,
  				r_newrefdef.height);
***************
*** 716,723 ****
  		// set up viewport
  		//
! 		x = (int) Math.floor(r_newrefdef.x * vid.width / vid.width);
! 		x2 = (int) Math.ceil((r_newrefdef.x + r_newrefdef.width) * vid.width / vid.width);
! 		y = (int) Math.floor(vid.height - r_newrefdef.y * vid.height / vid.height);
! 		y2 = (int) Math.ceil(vid.height - (r_newrefdef.y + r_newrefdef.height) * vid.height / vid.height);
  
  		w = x2 - x;
--- 716,723 ----
  		// set up viewport
  		//
! 		x = (int) Math.floor(r_newrefdef.x * vid.getWidth() / vid.getWidth());
! 		x2 = (int) Math.ceil((r_newrefdef.x + r_newrefdef.width) * vid.getWidth() / vid.getWidth());
! 		y = (int) Math.floor(vid.getHeight() - r_newrefdef.y * vid.getHeight() / vid.getHeight());
! 		y2 = (int) Math.ceil(vid.getHeight() - (r_newrefdef.y + r_newrefdef.height) * vid.getHeight() / vid.getHeight());
  
  		w = x2 - x;
***************
*** 867,874 ****
  	void R_SetGL2D() {
  		// set 2D virtual screen size
! 		gl.glViewport(0, 0, vid.width, vid.height);
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.width, vid.height, 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
--- 867,874 ----
  	void R_SetGL2D() {
  		// set 2D virtual screen size
! 		gl.glViewport(0, 0, vid.getWidth(), vid.getHeight());
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.getWidth(), vid.getHeight(), 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
***************
*** 1036,1040 ****
  		gl_mode.modified = false;
  
! 		Dimension dim = new Dimension(vid.width, vid.height);
  
  		if ((err = glImpl.setMode(dim, (int) gl_mode.value, fullscreen)) == rserr_ok) {
--- 1036,1040 ----
  		gl_mode.modified = false;
  
! 		Dimension dim = new Dimension(vid.getWidth(), vid.getHeight());
  
  		if ((err = glImpl.setMode(dim, (int) gl_mode.value, fullscreen)) == rserr_ok) {
***************
*** 1359,1363 ****
  	*/
  	public void R_BeginFrame(float camera_separation) {
! 
  		gl_state.camera_separation = camera_separation;
  
--- 1359,1365 ----
  	*/
  	public void R_BeginFrame(float camera_separation) {
! 	    
! 	    vid.update();
! 	    
  		gl_state.camera_separation = camera_separation;
  
***************
*** 1411,1418 ****
  		** go into 2D mode
  		*/
! 		gl.glViewport(0, 0, vid.width, vid.height);
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.width, vid.height, 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
--- 1413,1420 ----
  		** go into 2D mode
  		*/
! 		gl.glViewport(0, 0, vid.getWidth(), vid.getHeight());
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.getWidth(), vid.getHeight(), 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();

Index: Draw.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Draw.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Draw.java	21 Nov 2006 00:50:46 -0000	1.2
--- Draw.java	2 Mar 2008 14:56:23 -0000	1.3
***************
*** 291,297 ****
  
  		gl.glVertex2f(0,0);
! 		gl.glVertex2f(vid.width, 0);
! 		gl.glVertex2f(vid.width, vid.height);
! 		gl.glVertex2f(0, vid.height);
  
  		gl.glEnd();
--- 291,297 ----
  
  		gl.glVertex2f(0,0);
! 		gl.glVertex2f(vid.getWidth(), 0);
! 		gl.glVertex2f(vid.getWidth(), vid.getHeight());
! 		gl.glVertex2f(0, vid.getHeight());
  
  		gl.glEnd();

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Misc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Misc.java	11 Jan 2007 23:36:15 -0000	1.4
--- Misc.java	2 Mar 2008 14:56:23 -0000	1.5
***************
*** 144,148 ****
  	        RandomAccessFile out = new RandomAccessFile(file, "rw");
  	        FileChannel ch = out.getChannel();
! 	        int fileLength = TGA_HEADER_SIZE + vid.width * vid.height * 3;
  	        out.setLength(fileLength);
  	        MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0,
--- 144,148 ----
  	        RandomAccessFile out = new RandomAccessFile(file, "rw");
  	        FileChannel ch = out.getChannel();
! 	        int fileLength = TGA_HEADER_SIZE + vid.getWidth() * vid.getHeight() * 3;
  	        out.setLength(fileLength);
  	        MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0,
***************
*** 152,159 ****
  	        image.put(0, (byte) 0).put(1, (byte) 0);
  	        image.put(2, (byte) 2); // uncompressed type
! 	        image.put(12, (byte) (vid.width & 0xFF)); // vid.width
! 	        image.put(13, (byte) (vid.width >> 8)); // vid.width
! 	        image.put(14, (byte) (vid.height & 0xFF)); // vid.height
! 	        image.put(15, (byte) (vid.height >> 8)); // vid.height
  	        image.put(16, (byte) 24); // pixel size
  	        
--- 152,159 ----
  	        image.put(0, (byte) 0).put(1, (byte) 0);
  	        image.put(2, (byte) 2); // uncompressed type
! 	        image.put(12, (byte) (vid.getWidth() & 0xFF)); // vid.getWidth()
! 	        image.put(13, (byte) (vid.getWidth() >> 8)); // vid.getWidth()
! 	        image.put(14, (byte) (vid.getHeight() & 0xFF)); // vid.getHeight()
! 	        image.put(15, (byte) (vid.getHeight() >> 8)); // vid.getHeight()
  	        image.put(16, (byte) 24); // pixel size
  	        
***************
*** 164,168 ****
  
  	        // change pixel alignment for reading
! 	        if (vid.width % 4 != 0) {
  	            gl.glPixelStorei(GL_PACK_ALIGNMENT, 1); 
  	        }
--- 164,168 ----
  
  	        // change pixel alignment for reading
! 	        if (vid.getWidth() % 4 != 0) {
  	            gl.glPixelStorei(GL_PACK_ALIGNMENT, 1); 
  	        }
***************
*** 173,180 ****
  	        if (gl_config.getOpenGLVersion() >= 1.2f) {
  	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL_BGR, GL_UNSIGNED_BYTE, rgb);
  	        } else {
  	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL_RGB, GL_UNSIGNED_BYTE, rgb);
  		        // flip RGB to BGR
  		        byte tmp;
--- 173,180 ----
  	        if (gl_config.getOpenGLVersion() >= 1.2f) {
  	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.getWidth(), vid.getHeight(), GL_BGR, GL_UNSIGNED_BYTE, rgb);
  	        } else {
  	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.getWidth(), vid.getHeight(), GL_RGB, GL_UNSIGNED_BYTE, rgb);
  		        // flip RGB to BGR
  		        byte tmp;

[Jake2-commits] jake2/src/jake2/render/fast Draw.java, 1.3, 1.4 Misc.java, 1.4, 1.5 Main.java, 1.5, 1.6

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

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

Modified Files:
	Draw.java Misc.java Main.java 
Log Message:
use getters and setters of modified viddef_t

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Main.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Main.java	12 Dec 2006 14:46:04 -0000	1.5
--- Main.java	2 Mar 2008 14:56:23 -0000	1.6
***************
*** 668,672 ****
  			gl.glScissor(
  				r_newrefdef.x,
! 				vid.height - r_newrefdef.height - r_newrefdef.y,
  				r_newrefdef.width,
  				r_newrefdef.height);
--- 668,672 ----
  			gl.glScissor(
  				r_newrefdef.x,
! 				vid.getHeight() - r_newrefdef.height - r_newrefdef.y,
  				r_newrefdef.width,
  				r_newrefdef.height);
***************
*** 706,717 ****
  		// set up viewport
  		//
! 		//int x = (int) Math.floor(r_newrefdef.x * vid.width / vid.width);
  		int x = r_newrefdef.x;
! 		//int x2 = (int) Math.ceil((r_newrefdef.x + r_newrefdef.width) * vid.width / vid.width);
  		int x2 = r_newrefdef.x + r_newrefdef.width;
! 		//int y = (int) Math.floor(vid.height - r_newrefdef.y * vid.height / vid.height);
! 		int y = vid.height - r_newrefdef.y;
! 		//int y2 = (int) Math.ceil(vid.height - (r_newrefdef.y + r_newrefdef.height) * vid.height / vid.height);
! 		int y2 = vid.height - (r_newrefdef.y + r_newrefdef.height);
  
  		int w = x2 - x;
--- 706,717 ----
  		// set up viewport
  		//
! 		//int x = (int) Math.floor(r_newrefdef.x * vid.getWidth() / vid.getWidth());
  		int x = r_newrefdef.x;
! 		//int x2 = (int) Math.ceil((r_newrefdef.x + r_newrefdef.width) * vid.getWidth() / vid.getWidth());
  		int x2 = r_newrefdef.x + r_newrefdef.width;
! 		//int y = (int) Math.floor(vid.getHeight() - r_newrefdef.y * vid.getHeight() / vid.getHeight());
! 		int y = vid.getHeight() - r_newrefdef.y;
! 		//int y2 = (int) Math.ceil(vid.getHeight() - (r_newrefdef.y + r_newrefdef.height) * vid.getHeight() / vid.getHeight());
! 		int y2 = vid.getHeight() - (r_newrefdef.y + r_newrefdef.height);
  
  		int w = x2 - x;
***************
*** 862,869 ****
  	void R_SetGL2D() {
  		// set 2D virtual screen size
! 		gl.glViewport(0, 0, vid.width, vid.height);
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.width, vid.height, 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
--- 862,869 ----
  	void R_SetGL2D() {
  		// set 2D virtual screen size
! 		gl.glViewport(0, 0, vid.getWidth(), vid.getHeight());
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.getWidth(), vid.getHeight(), 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
***************
*** 1016,1020 ****
  		gl_mode.modified = false;
  
! 		Dimension dim = new Dimension(vid.width, vid.height);
  
  		int err; //  enum rserr_t
--- 1016,1020 ----
  		gl_mode.modified = false;
  
! 		Dimension dim = new Dimension(vid.getWidth(), vid.getHeight());
  
  		int err; //  enum rserr_t
***************
*** 1313,1316 ****
--- 1313,1319 ----
  	 */
  	public void R_BeginFrame(float camera_separation) {
+ 	    
+ 	    vid.update();
+ 
  
  		gl_state.camera_separation = camera_separation;
***************
*** 1365,1372 ****
  		** go into 2D mode
  		*/
! 		gl.glViewport(0, 0, vid.width, vid.height);
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.width, vid.height, 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();
--- 1368,1375 ----
  		** go into 2D mode
  		*/
! 		gl.glViewport(0, 0, vid.getWidth(), vid.getHeight());
  		gl.glMatrixMode(GL_PROJECTION);
  		gl.glLoadIdentity();
! 		gl.glOrtho(0, vid.getWidth(), vid.getHeight(), 0, -99999, 99999);
  		gl.glMatrixMode(GL_MODELVIEW);
  		gl.glLoadIdentity();

Index: Draw.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Draw.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Draw.java	12 May 2007 23:20:29 -0000	1.3
--- Draw.java	2 Mar 2008 14:56:23 -0000	1.4
***************
*** 286,292 ****
  
  		gl.glVertex2f(0,0);
! 		gl.glVertex2f(vid.width, 0);
! 		gl.glVertex2f(vid.width, vid.height);
! 		gl.glVertex2f(0, vid.height);
  
  		gl.glEnd();
--- 286,292 ----
  
  		gl.glVertex2f(0,0);
! 		gl.glVertex2f(vid.getWidth(), 0);
! 		gl.glVertex2f(vid.getWidth(), vid.getHeight());
! 		gl.glVertex2f(0, vid.getHeight());
  
  		gl.glEnd();

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Misc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Misc.java	11 Jan 2007 23:36:21 -0000	1.4
--- Misc.java	2 Mar 2008 14:56:23 -0000	1.5
***************
*** 137,141 ****
  	        RandomAccessFile out = new RandomAccessFile(file, "rw");
  	        FileChannel ch = out.getChannel();
! 	        int fileLength = TGA_HEADER_SIZE + vid.width * vid.height * 3;
  	        out.setLength(fileLength);
  	        MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0,
--- 137,141 ----
  	        RandomAccessFile out = new RandomAccessFile(file, "rw");
  	        FileChannel ch = out.getChannel();
! 	        int fileLength = TGA_HEADER_SIZE + vid.getWidth() * vid.getHeight() * 3;
  	        out.setLength(fileLength);
  	        MappedByteBuffer image = ch.map(FileChannel.MapMode.READ_WRITE, 0,
***************
*** 145,152 ****
  	        image.put(0, (byte) 0).put(1, (byte) 0);
  	        image.put(2, (byte) 2); // uncompressed type
! 	        image.put(12, (byte) (vid.width & 0xFF)); // vid.width
! 	        image.put(13, (byte) (vid.width >> 8)); // vid.width
! 	        image.put(14, (byte) (vid.height & 0xFF)); // vid.height
! 	        image.put(15, (byte) (vid.height >> 8)); // vid.height
  	        image.put(16, (byte) 24); // pixel size
  	        
--- 145,152 ----
  	        image.put(0, (byte) 0).put(1, (byte) 0);
  	        image.put(2, (byte) 2); // uncompressed type
! 	        image.put(12, (byte) (vid.getWidth() & 0xFF)); // vid.getWidth()
! 	        image.put(13, (byte) (vid.getWidth() >> 8)); // vid.getWidth()
! 	        image.put(14, (byte) (vid.getHeight() & 0xFF)); // vid.getHeight()
! 	        image.put(15, (byte) (vid.getHeight() >> 8)); // vid.getHeight()
  	        image.put(16, (byte) 24); // pixel size
  	        
***************
*** 156,160 ****
  	        
  	        // change pixel alignment for reading
! 	        if (vid.width % 4 != 0) {
  	            gl.glPixelStorei(GL_PACK_ALIGNMENT, 1); 
  	        }
--- 156,160 ----
  	        
  	        // change pixel alignment for reading
! 	        if (vid.getWidth() % 4 != 0) {
  	            gl.glPixelStorei(GL_PACK_ALIGNMENT, 1); 
  	        }
***************
*** 165,172 ****
  	        if (gl_config.getOpenGLVersion() >= 1.2f) {
  	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL_BGR, GL_UNSIGNED_BYTE, image);
  	        } else {
  	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL_RGB, GL_UNSIGNED_BYTE, image);
  		        // flip RGB to BGR
  		        byte tmp;
--- 165,172 ----
  	        if (gl_config.getOpenGLVersion() >= 1.2f) {
  	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.getWidth(), vid.getHeight(), GL_BGR, GL_UNSIGNED_BYTE, image);
  	        } else {
  	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.getWidth(), vid.getHeight(), GL_RGB, GL_UNSIGNED_BYTE, image);
  		        // flip RGB to BGR
  		        byte tmp;

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

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

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

Modified Files:
	Base.java 
Log Message:
use getters and setters of modified viddef_t

Index: Base.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Base.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Base.java	1 Mar 2008 20:48:32 -0000	1.4
--- Base.java	2 Mar 2008 14:56:23 -0000	1.5
***************
*** 180,186 ****
      }
  
!     public static void setVid(int width, int height) {
!         vid.width = width;
!         vid.height = height;
      }
      
--- 180,185 ----
      }
  
!     public static synchronized void setVid(int width, int height) {
! 	vid.setSize(width, height);
      }
      

[Jake2-commits] jake2/test/jake2/render DebugCulling.java, 1.5, 1.6 TestMap.java, 1.9, 1.10 DancingQueens.java, 1.12, 1.13 TestRenderer.java, 1.8, 1.9

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

Update of /cvsroot/jake2/jake2/test/jake2/render
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11126/test/jake2/render

Modified Files:
	DebugCulling.java TestMap.java DancingQueens.java 
	TestRenderer.java 
Log Message:
use getters and setters of modified viddef_t

Index: TestMap.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestMap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestMap.java	27 Feb 2007 14:00:35 -0000	1.9
--- TestMap.java	2 Mar 2008 14:56:21 -0000	1.10
***************
*** 144,149 ****
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
! 				re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
  				currentState = 1;
  				break;
--- 144,149 ----
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
! 				re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
  				currentState = 1;
  				break;
***************
*** 164,168 ****
  				testMap();
  
! 				drawString(10, viddef.height - 16, text);
  		}
  		
--- 164,168 ----
  				testMap();
  
! 				drawString(10, viddef.getHeight() - 16, text);
  		}
  		
***************
*** 235,240 ****
  	};
  
- 	private float yaw = 0;
- 
  	private float fov_x = 90;
  	
--- 235,238 ----
***************
*** 255,260 ****
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.width;
! 			refdef.height = viddef.height;
  			refdef.fov_x = (Globals.fov == null) ? this.fov_x : Globals.fov.value;
  			refdef.fov_x = this.fov_x;
--- 253,258 ----
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.getWidth();
! 			refdef.height = viddef.getHeight();
  			refdef.fov_x = (Globals.fov == null) ? this.fov_x : Globals.fov.value;
  			refdef.fov_x = this.fov_x;
***************
*** 367,375 ****
  	
  	private LinkedList active_particles = new LinkedList();
- 	private boolean explode = false; 
- 	private float[] target; 
- 	
- 	private boolean initParticles = true;
- 	
  	private void animateParticles()
  	{
--- 365,368 ----

Index: DebugCulling.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DebugCulling.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DebugCulling.java	27 Feb 2007 14:00:35 -0000	1.5
--- DebugCulling.java	2 Mar 2008 14:56:21 -0000	1.6
***************
*** 103,108 ****
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
! 				re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
  				currentState = 1;
  				break;
--- 103,108 ----
  		{
  			case 0 :
! 				re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
! 				re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
  				currentState = 1;
  				break;
***************
*** 125,129 ****
  				testMap();
  
! 				drawString(10, viddef.height - 16, text);
  		}
  		
--- 125,129 ----
  				testMap();
  
! 				drawString(10, viddef.getHeight() - 16, text);
  		}
  		
***************
*** 134,139 ****
  	//		===================================================================
  
- 	private float yaw = 0;
- 
  	private float fov_x = 90;
  	
--- 134,137 ----
***************
*** 148,153 ****
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.width;
! 			refdef.height = viddef.height;
  			refdef.fov_x = fov_x;
  			refdef.fov_y = CalcFov(fov_x, refdef.width -10, refdef.height-10);
--- 146,151 ----
  			refdef.x = 0;
  			refdef.y = 0;
! 			refdef.width = viddef.getWidth();
! 			refdef.height = viddef.getHeight();
  			refdef.fov_x = fov_x;
  			refdef.fov_y = CalcFov(fov_x, refdef.width -10, refdef.height-10);

Index: TestRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestRenderer.java	21 Nov 2006 01:59:41 -0000	1.8
--- TestRenderer.java	2 Mar 2008 14:56:21 -0000	1.9
***************
*** 110,114 ****
          re.BeginFrame(0.0f);
          viddef = Globals.viddef;
!         re.DrawStretchPic(0, 0, viddef.width, viddef.height, "conback");
          
          if (framecount % 500 == 0) {
--- 110,114 ----
          re.BeginFrame(0.0f);
          viddef = Globals.viddef;
!         re.DrawStretchPic(0, 0, viddef.getWidth(), viddef.getHeight(), "conback");
          
          if (framecount % 500 == 0) {
***************
*** 120,124 ****
          
          for (int i = 0; i < text.length(); i++) {
!             re.DrawChar(10 + 8 * i, viddef.height / 2, (int) text.charAt(i));
          }
          
--- 120,124 ----
          
          for (int i = 0; i < text.length(); i++) {
!             re.DrawChar(10 + 8 * i, viddef.getHeight() / 2, (int) text.charAt(i));
          }
          
***************
*** 126,130 ****
          re.DrawGetPicSize(wal, "/textures/e1u1/basemap.wal");
          
!         re.DrawPic(0, viddef.height - wal.height, "/textures/e1u1/basemap.wal");
          
          switch (testnr) {
--- 126,130 ----
          re.DrawGetPicSize(wal, "/textures/e1u1/basemap.wal");
          
!         re.DrawPic(0, viddef.getHeight() - wal.height, "/textures/e1u1/basemap.wal");
          
          switch (testnr) {
***************
*** 173,178 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 173,178 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 182,186 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          String modelName = "players/female/tris.md2";
--- 182,185 ----
***************
*** 224,229 ****
          //			 Menu_Draw(& s_player_config_menu);
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 223,228 ----
          //			 Menu_Draw(& s_player_config_menu);
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 250,257 ****
          if (loading) {
              
!             re.DrawPic(viddef.width / 2 - 50, viddef.height / 2, "loading");
              String name = sprites[spriteCount];
              
!             drawString(viddef.width / 2 - 50, viddef.height / 2 + 50, name);
              
              re.RegisterModel(name);
--- 249,256 ----
          if (loading) {
              
!             re.DrawPic(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2, "loading");
              String name = sprites[spriteCount];
              
!             drawString(viddef.getWidth() / 2 - 50, viddef.getHeight() / 2 + 50, name);
              
              re.RegisterModel(name);
***************
*** 262,267 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 261,266 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 271,275 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          
--- 270,273 ----
***************
*** 295,300 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 293,298 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 308,313 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
--- 306,311 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144 * 2;
          refdef.height = 168 * 2;
***************
*** 317,321 ****
          refdef.time = 1.0f * 0.001f;
          
-         int maxframe = 29;
          entity_t entity = new entity_t();
          
--- 315,318 ----
***************
*** 351,356 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 348,353 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 365,370 ****
      private float[] target;
      
-     private boolean initParticles = true;
-     
      private void testParticles() {
          
--- 362,365 ----
***************
*** 384,389 ****
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 400;
          refdef.height = 400;
--- 379,384 ----
          refdef_t refdef = new refdef_t();
          
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 400;
          refdef.height = 400;
***************
*** 406,411 ****
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                 (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
--- 401,406 ----
          refdef.rdflags = Defines.RDF_NOWORLDMODEL;
          
!         M_DrawTextBox((int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                 (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                  refdef.width / 8, refdef.height / 8);
          refdef.height += 4;
***************
*** 465,470 ****
       */
      private void M_DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.width - 320) >> 1), cy
!                 + ((viddef.height - 240) >> 1), num);
      }
      
--- 460,465 ----
       */
      private void M_DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.getWidth() - 320) >> 1), cy
!                 + ((viddef.getHeight() - 240) >> 1), num);
      }
      
***************
*** 472,480 ****
      
      private void Explosion(float[] org) {
-         float[] dir = { 0, 0, 0 };
-         int i;
          cparticle_t p;
          
!         for (i = 0; i < 256; i++) {
              p = new cparticle_t();
              
--- 467,473 ----
      
      private void Explosion(float[] org) {
          cparticle_t p;
          
!         for (int i = 0; i < 256; i++) {
              p = new cparticle_t();
              

Index: DancingQueens.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DancingQueens.java	20 Mar 2007 18:57:16 -0000	1.12
--- DancingQueens.java	2 Mar 2008 14:56:21 -0000	1.13
***************
*** 101,105 ****
          
          viddef = Globals.viddef;
!         fov_y = Math3D.CalcFov(fov_x, viddef.width, viddef.height);
      }
      
--- 101,105 ----
          
          viddef = Globals.viddef;
!         fov_y = Math3D.CalcFov(fov_x, viddef.getWidth(), viddef.getHeight());
      }
      
***************
*** 120,124 ****
          testModel();
          
!         drawString(10, viddef.height - 16, text);
          
          re.EndFrame();
--- 120,124 ----
          testModel();
          
!         drawString(10, viddef.getHeight() - 16, text);
          
          re.EndFrame();
***************
*** 163,168 ****
          refdef.x = 0;
          refdef.y = 0;
!         refdef.width = viddef.width;
!         refdef.height = viddef.height;
          refdef.fov_x = fov_x;
          refdef.fov_y = fov_y;
--- 163,168 ----
          refdef.x = 0;
          refdef.y = 0;
!         refdef.width = viddef.getWidth();
!         refdef.height = viddef.getHeight();
          refdef.fov_x = fov_x;
          refdef.fov_y = fov_y;

[Jake2-commits] jake2/src/jake2/client viddef_t.java,1.1.1.1,1.2

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

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

Modified Files:
	viddef_t.java 
Log Message:
changes to handle resizable screens

Index: viddef_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/viddef_t.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** viddef_t.java	7 Jul 2004 19:58:52 -0000	1.1.1.1
--- viddef_t.java	2 Mar 2008 14:53:46 -0000	1.2
***************
*** 17,28 ****
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
! */
  
  // Created on 20.11.2003 by RST.
- // $Id$
- 
  package jake2.client;
  
  public class viddef_t {
! 	public int width, height;
  }
--- 17,61 ----
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
!  */
  
  // Created on 20.11.2003 by RST.
  package jake2.client;
  
  public class viddef_t {
!     private int width;
!     private int height;
!     private int newWidth;
!     private int newHeight;
! 
!     /**
!      * This method doesn't affect <code>width</code> and <code>height</code>
!      * directly. The new values will be active after an <code>update()</code>
!      * call.
!      * 
!      * @param width
!      *                the visible render screen width.
!      * @param height
!      *                the visible render screen height.
!      */
!     public synchronized void setSize(int width, int height) {
! 	newWidth = width;
! 	newHeight = height;
!     }
! 
!     /**
!      * Updates the buffered <code>width</code> and <code>height</code>. The
!      * method should be called once at the beginning of a frame.
!      */
!     public synchronized void update() {
! 	width = newWidth;
! 	height = newHeight;
!     }
! 
!     public int getWidth() {
! 	return width;
!     }
! 
!     public int getHeight() {
! 	return height;
!     }
  }

[Jake2-commits] jake2/src/jake2/client Menu.java,1.21,1.22

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

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

Modified Files:
	Menu.java 
Log Message:
inline cursorname

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Menu.java	24 Oct 2006 22:15:53 -0000	1.21
--- Menu.java	2 Mar 2008 08:35:30 -0000	1.22
***************
*** 362,368 ****
  
      static void DrawCursor(int x, int y, int f) {
-         //char cursorname[80];
-         String cursorname;
- 
          assert (f >= 0) : "negative time and cursor bug";
  
--- 362,365 ----
***************
*** 370,385 ****
  
          if (!cached) {
!             int i;
! 
!             for (i = 0; i < NUM_CURSOR_FRAMES; i++) {
!                 cursorname = "m_cursor" + i;
! 
!                 re.RegisterPic(cursorname);
              }
              cached = true;
          }
! 
!         cursorname = "m_cursor" + f;
!         re.DrawPic(x, y, cursorname);
      }
  
--- 367,376 ----
  
          if (!cached) {
!             for (int i = 0; i < NUM_CURSOR_FRAMES; i++) {
!                 re.RegisterPic("m_cursor" + i);
              }
              cached = true;
          }
!         re.DrawPic(x, y, "m_cursor" + f);
      }
  

[Jake2-commits] jake2 .classpath,1.9,1.10

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

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

Modified Files:
	.classpath 
Log Message:
use the project specific jre alias "jdk1.6" 

Index: .classpath
===================================================================
RCS file: /cvsroot/jake2/jake2/.classpath,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .classpath	28 Apr 2007 18:43:48 -0000	1.9
--- .classpath	2 Mar 2008 08:31:23 -0000	1.10
***************
*** 3,7 ****
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="src" path="test"/>
- 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry kind="lib" path="lib/joal/joal.jar"/>
  	<classpathentry kind="lib" path="lib/jogl/jogl.jar"/>
--- 3,6 ----
***************
*** 11,14 ****
--- 10,14 ----
  	<classpathentry kind="lib" path="lib/lwjgl/lwjgl.jar"/>
  	<classpathentry kind="lib" path="resources"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6"/>
  	<classpathentry kind="output" path="build"/>
  </classpath>

[Jake2-commits] jake2/.settings org.eclipse.jdt.core.prefs, 1.3, 1.4

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

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

Modified Files:
	org.eclipse.jdt.core.prefs 
Log Message:
set code compliance to Java 5

Index: org.eclipse.jdt.core.prefs
===================================================================
RCS file: /cvsroot/jake2/jake2/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** org.eclipse.jdt.core.prefs	1 Mar 2008 17:45:43 -0000	1.3
--- org.eclipse.jdt.core.prefs	2 Mar 2008 08:28:16 -0000	1.4
***************
*** 1,4 ****
! #Sat Mar 01 18:45:41 GMT+01:00 2008
  eclipse.preferences.version=1
  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
--- 1,14 ----
! #Sun Mar 02 09:25:39 CET 2008
  eclipse.preferences.version=1
+ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+ org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+ org.eclipse.jdt.core.compiler.compliance=1.5
+ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+ org.eclipse.jdt.core.compiler.debug.localVariable=generate
+ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+ org.eclipse.jdt.core.compiler.source=1.5
  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
  org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

[Jake2-commits] jake2/src/jake2/render Base.java,1.3,1.4

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

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

Modified Files:
	Base.java 
Log Message:
makes the reference constant

Index: Base.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Base.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Base.java	15 Feb 2007 13:57:12 -0000	1.3
--- Base.java	1 Mar 2008 20:48:32 -0000	1.4
***************
*** 167,171 ****
       * base members
       */
!     protected static viddef_t vid = new viddef_t();
  
      protected cvar_t vid_fullscreen;
--- 167,171 ----
       * base members
       */
!     protected final static viddef_t vid = new viddef_t();
  
      protected cvar_t vid_fullscreen;

[Jake2-commits] jake2/.settings org.eclipse.jdt.core.prefs, 1.2, 1.3

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

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

Modified Files:
	org.eclipse.jdt.core.prefs 
Log Message:
version of eclipse 3.3 formatter settings changed

Index: org.eclipse.jdt.core.prefs
===================================================================
RCS file: /cvsroot/jake2/jake2/.settings/org.eclipse.jdt.core.prefs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** org.eclipse.jdt.core.prefs	10 Jan 2007 14:38:40 -0000	1.2
--- org.eclipse.jdt.core.prefs	1 Mar 2008 17:45:43 -0000	1.3
***************
*** 1,3 ****
! #Wed Jan 10 14:09:23 CET 2007
  eclipse.preferences.version=1
  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
--- 1,3 ----
! #Sat Mar 01 18:45:41 GMT+01:00 2008
  eclipse.preferences.version=1
  org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
***************
*** 24,28 ****
  org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
  org.eclipse.jdt.core.formatter.blank_lines_after_package=1
! org.eclipse.jdt.core.formatter.blank_lines_before_field=1
  org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
  org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
--- 24,28 ----
  org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
  org.eclipse.jdt.core.formatter.blank_lines_after_package=1
! org.eclipse.jdt.core.formatter.blank_lines_before_field=0
  org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
  org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
***************
*** 31,34 ****
--- 31,35 ----
  org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
  org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+ org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
  org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
  org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
***************
*** 44,50 ****
--- 45,56 ----
  org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
  org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+ org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+ org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+ org.eclipse.jdt.core.formatter.comment.format_block_comments=true
  org.eclipse.jdt.core.formatter.comment.format_comments=true
  org.eclipse.jdt.core.formatter.comment.format_header=false
  org.eclipse.jdt.core.formatter.comment.format_html=true
+ org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+ org.eclipse.jdt.core.formatter.comment.format_line_comments=true
  org.eclipse.jdt.core.formatter.comment.format_source_code=true
  org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
***************
*** 221,224 ****
--- 227,231 ----
  org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
  org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+ org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
  org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
  org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
***************
*** 241,244 ****
--- 248,253 ----
  org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
  org.eclipse.jdt.core.formatter.lineSplit=80
+ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+ org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
  org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
  org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
***************
*** 247,248 ****
--- 256,258 ----
  org.eclipse.jdt.core.formatter.tabulation.size=8
  org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+ org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true