From c886a36fc540f078826446a97084e4fdb91f863b Mon Sep 17 00:00:00 2001 From: Gregory Pierce Date: Fri, 20 Dec 2002 23:00:37 +0000 Subject: [PATCH] no message --- src/java/org/lwjgl/vector/Vector2f.java | 11 ++- src/java/org/lwjgl/vector/Vector3f.java | 11 ++- src/java/org/lwjgl/vector/Vector4f.java | 11 ++- src/native/macosx/org_lwjgl_Display.cpp | 2 +- src/native/macosx/org_lwjgl_input_GamePad.cpp | 92 +------------------ 5 files changed, 35 insertions(+), 92 deletions(-) diff --git a/src/java/org/lwjgl/vector/Vector2f.java b/src/java/org/lwjgl/vector/Vector2f.java index c2aae802..3f7a01b7 100644 --- a/src/java/org/lwjgl/vector/Vector2f.java +++ b/src/java/org/lwjgl/vector/Vector2f.java @@ -148,7 +148,16 @@ public class Vector2f extends Vector { return dest; } - + + /** + * Get the magnitude of of the vector + * @return the magnitude of the vector + */ + public float magnitude() + { + return Math.sqrt( (x * x) + (y * y) ); + } + /** * The dot product of two vectors is calculated as * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z diff --git a/src/java/org/lwjgl/vector/Vector3f.java b/src/java/org/lwjgl/vector/Vector3f.java index 507e17a7..c5d6c3e4 100644 --- a/src/java/org/lwjgl/vector/Vector3f.java +++ b/src/java/org/lwjgl/vector/Vector3f.java @@ -213,7 +213,16 @@ public class Vector3f extends Vector { return dest; } - + + /** + * Get the magnitude of of the vector + * @return the magnitude of the vector + */ + public float magnitude() + { + return Math.sqrt( (x * x) + (y * y) + (z * z) ); + } + /** * The dot product of two vectors is calculated as * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z diff --git a/src/java/org/lwjgl/vector/Vector4f.java b/src/java/org/lwjgl/vector/Vector4f.java index 7b8d22aa..9ae6d79e 100644 --- a/src/java/org/lwjgl/vector/Vector4f.java +++ b/src/java/org/lwjgl/vector/Vector4f.java @@ -191,7 +191,16 @@ public class Vector4f extends Vector { return dest; } - + + /** + * Get the magnitude of of the vector + * @return the magnitude of the vector + */ + public float magnitude() + { + return Math.sqrt( (x * x) + (y * y) + (z * z) + (w * w) ); + } + /** * The dot product of two vectors is calculated as * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z + v1.w * v2.w diff --git a/src/native/macosx/org_lwjgl_Display.cpp b/src/native/macosx/org_lwjgl_Display.cpp index c07a0612..7d5cce84 100644 --- a/src/native/macosx/org_lwjgl_Display.cpp +++ b/src/native/macosx/org_lwjgl_Display.cpp @@ -70,7 +70,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_nCreate Rect rect; SetRect( &rect, 0, 0, width, height ); - WindowPtr windowPtr = NewCWindow( NULL, &rect, "Lightweight Java Gaming Library", true, kWindowShadowDialogProc, (WindowPtr) -1L, true, 0L ); + WindowPtr windowPtr = NewCWindow( NULL, &rect, "LWJGL", true, kWindowShadowDialogProc, (WindowPtr) -1L, true, 0L ); SetPortWindowPort( windowPtr ); diff --git a/src/native/macosx/org_lwjgl_input_GamePad.cpp b/src/native/macosx/org_lwjgl_input_GamePad.cpp index ebcb16ff..18deebe5 100644 --- a/src/native/macosx/org_lwjgl_input_GamePad.cpp +++ b/src/native/macosx/org_lwjgl_input_GamePad.cpp @@ -1,63 +1,34 @@ /* * Copyright (c) 2002 Light Weight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ @@ -65,162 +36,107 @@ /** * $Id$ * - * Win32 digital (Atari) joystick handling. These days it's a gamepad. + * OSX joystick handling. These days it's a gamepad. * * @author gregorypierce * @version $Revision$ */ - - - #include "org_lwjgl_input_GamePad.h" /* - * Class: org_lwjgl_input_GamePad - * Method: initIDs - * Signature: ()V - */ JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_initIDs - - (JNIEnv * env, jclass clazz) {} + (JNIEnv * env, jclass clazz) +{ +} /* - * Class: org_lwjgl_input_GamePad - * Method: nCreate - * Signature: ()Z - */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_GamePad_nCreate - (JNIEnv * env, jclass clazz) - { - printf("GamePad not implemented yet!\n"); return JNI_FALSE; - } /* - * Class: org_lwjgl_input_GamePad - * Method: nDestroy - * Signature: ()V - */ JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nDestroy - (JNIEnv * env, jclass clazz) - { - } /* - * Class: org_lwjgl_input_GamePad - * Method: nPoll - * Signature: (I)V - */ JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nPoll - (JNIEnv * env, jclass clazz, jint buf) - { - } /* - * Class: org_lwjgl_input_GamePad - * Method: nRead - * Signature: (I)I - */ - JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nRead - (JNIEnv * env, jclass clazz, jint buf) - { - return 0; - } /* - * Class: org_lwjgl_input_GamePad - * Method: nEnableBuffer - * Signature: ()I - */ - JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nEnableBuffer - (JNIEnv * env, jclass clazz) - { - return 0; - } /* - * Class: org_lwjgl_input_GamePad - * Method: nGetNumButtons - * Signature: ()I - */ - JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nGetNumButtons - (JNIEnv * env, jclass clazz) - { - return 0; - }