added camera and removed old sound dident work whit the sound system. There is one problem whit the sound system its to quiet
This commit is contained in:
parent
28c3cd0529
commit
448fca2fdf
19 changed files with 833 additions and 36 deletions
6
log.txt
6
log.txt
|
|
@ -1,6 +0,0 @@
|
|||
2007-03-27 19:49:02:875 # Loading texture: data/units/tank.png
|
||||
2007-03-27 19:49:03:796 # Loading texture: data/particle.bmp
|
||||
2007-03-27 19:49:03:953 # Loading sound: data/sounds/test.wav
|
||||
2007-03-27 19:49:03:984 # Sound sources: quantity=0
|
||||
2007-03-27 19:49:03:984 # Stoping sound: source=0
|
||||
2007-03-27 19:49:03:984 # Playing sound: source=0 buffer=262015032
|
||||
BIN
raw/media/units/tank1.png
Normal file
BIN
raw/media/units/tank1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 237 KiB |
BIN
raw/media/units/tank2.png
Normal file
BIN
raw/media/units/tank2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 211 KiB |
BIN
src/data/sounds/center.wav
Normal file
BIN
src/data/sounds/center.wav
Normal file
Binary file not shown.
BIN
src/data/sounds/left.wav
Normal file
BIN
src/data/sounds/left.wav
Normal file
Binary file not shown.
BIN
src/data/sounds/right.wav
Normal file
BIN
src/data/sounds/right.wav
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -7,6 +7,7 @@ import org.lwjgl.opengl.Display;
|
|||
import org.lwjgl.opengl.DisplayMode;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ei.engine.renderer.Camera;
|
||||
import ei.engine.state.GameStateManager;
|
||||
import ei.engine.util.FpsTimer;
|
||||
import ei.engine.util.MultiPrintStream;
|
||||
|
|
@ -17,6 +18,8 @@ public class LWJGLGameWindow {
|
|||
// The size of the window
|
||||
private static int width;
|
||||
private static int height;
|
||||
// The camera
|
||||
private static Camera cam;
|
||||
// The framerate
|
||||
private int fps;
|
||||
// If fullscreen
|
||||
|
|
@ -26,6 +29,7 @@ public class LWJGLGameWindow {
|
|||
// The fps calculator
|
||||
private FpsTimer timer;
|
||||
|
||||
|
||||
/**
|
||||
* Creates a default window whit 800x600
|
||||
* no fullscreen
|
||||
|
|
@ -52,7 +56,6 @@ public class LWJGLGameWindow {
|
|||
this.title = title;
|
||||
|
||||
MultiPrintStream.makeInstance(new MultiPrintStream("log.txt"));
|
||||
timer = new FpsTimer();
|
||||
|
||||
try {
|
||||
initDisplay();
|
||||
|
|
@ -115,6 +118,10 @@ public class LWJGLGameWindow {
|
|||
// Enable vsync if we can (due to how OpenGL works, it cannot be guarenteed to always work)
|
||||
Display.setVSyncEnabled(true);
|
||||
|
||||
// The last steps
|
||||
timer = new FpsTimer();
|
||||
cam = new Camera();
|
||||
|
||||
init();
|
||||
|
||||
|
||||
|
|
@ -139,7 +146,7 @@ public class LWJGLGameWindow {
|
|||
// The window is in the foreground, so we should play the game
|
||||
else if (Display.isActive()) {
|
||||
GameStateManager.getInstance().update();
|
||||
update();
|
||||
mainUpdate();
|
||||
mainRender();
|
||||
Display.sync(fps);
|
||||
}
|
||||
|
|
@ -151,13 +158,14 @@ public class LWJGLGameWindow {
|
|||
Thread.sleep(100);
|
||||
} catch (InterruptedException e) {}
|
||||
GameStateManager.getInstance().update();
|
||||
update();
|
||||
mainUpdate();
|
||||
|
||||
// Only bother rendering if the window is visible or dirty
|
||||
if (Display.isVisible() || Display.isDirty()) {
|
||||
mainRender();
|
||||
}
|
||||
}
|
||||
|
||||
//calculate fps and print it on title
|
||||
if(frame >= fps/2){
|
||||
timer.stopTimer();
|
||||
|
|
@ -177,16 +185,25 @@ public class LWJGLGameWindow {
|
|||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
cam.setWorldTranslationGL();
|
||||
GL11.glPushMatrix();
|
||||
//let subsystem paint
|
||||
GameStateManager.getInstance().render();
|
||||
render();
|
||||
//let subsystem paint
|
||||
GameStateManager.getInstance().render();
|
||||
render();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
//update window contents
|
||||
Display.update();
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the engine
|
||||
*/
|
||||
private void mainUpdate() {
|
||||
cam.update();
|
||||
update();
|
||||
}
|
||||
|
||||
/**
|
||||
* this method shid be overriden
|
||||
*/
|
||||
|
|
@ -229,4 +246,12 @@ public class LWJGLGameWindow {
|
|||
return width;
|
||||
}
|
||||
|
||||
public static void setCamera(Camera c){
|
||||
cam = c;
|
||||
}
|
||||
|
||||
public static Camera getCamera(){
|
||||
return cam;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,8 +152,6 @@ public class Particles extends Entity{
|
|||
if(enabled){
|
||||
// store the current model matrix
|
||||
GL11.glPushMatrix();
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
texture.bindGL();
|
||||
|
||||
|
|
@ -219,8 +217,7 @@ public class Particles extends Entity{
|
|||
}
|
||||
}
|
||||
}
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
// restore the model view matrix to prevent contamination
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
|
|
|||
79
src/ei/engine/renderer/Camera.java
Normal file
79
src/ei/engine/renderer/Camera.java
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
package ei.engine.renderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ei.engine.LWJGLGameWindow;
|
||||
import ei.engine.math.Vector3f;
|
||||
import ei.engine.sound.SoundManager;
|
||||
|
||||
|
||||
/**
|
||||
* The Camera calss hadels the viewport of the user
|
||||
* and the sound listener location
|
||||
* @author Ziver
|
||||
*
|
||||
*/
|
||||
public class Camera{
|
||||
//coordinat
|
||||
private Vector3f location;
|
||||
//Sound
|
||||
private Vector3f velocity;
|
||||
|
||||
/**
|
||||
* Creates a camera
|
||||
*
|
||||
*/
|
||||
public Camera(){
|
||||
location = new Vector3f();
|
||||
velocity = new Vector3f();
|
||||
|
||||
SoundManager.getInstnace().setListenerLocation(
|
||||
location.getX() + (LWJGLGameWindow.getWidth()/2),
|
||||
location.getY() + (LWJGLGameWindow.getHeight()/2),
|
||||
location.getZ());
|
||||
SoundManager.getInstnace().setListenerVelocity(
|
||||
velocity.getX(),
|
||||
velocity.getY(),
|
||||
velocity.getZ());
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the camera
|
||||
*
|
||||
*/
|
||||
public void update(){
|
||||
SoundManager.getInstnace().setListenerLocation(
|
||||
location.getX() + (LWJGLGameWindow.getWidth()/2),
|
||||
location.getY() + (LWJGLGameWindow.getHeight()/2),
|
||||
location.getZ());
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the location of the camera
|
||||
*
|
||||
* @return The location of the camera
|
||||
*/
|
||||
public Vector3f getLocation(){
|
||||
return location;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the location of the world in opengl
|
||||
* should be used before rendering.
|
||||
*/
|
||||
public void setWorldTranslationGL(){
|
||||
// translate to the right location and prepare to draw
|
||||
GL11.glTranslatef(-location.getX(), -location.getY(), -location.getZ());
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the location of the camera
|
||||
*
|
||||
* @param v The location of the camera
|
||||
*/
|
||||
public void setLocation(Vector3f v){
|
||||
location = v;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -112,8 +112,6 @@ public class AnimatedSprite extends Entity {
|
|||
if(currentAnimation != null){
|
||||
// store the current model matrix
|
||||
GL11.glPushMatrix();
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
//Sets the scale of the sprite
|
||||
super.setScaleGL();
|
||||
|
|
@ -153,9 +151,6 @@ public class AnimatedSprite extends Entity {
|
|||
}
|
||||
GL11.glEnd();
|
||||
|
||||
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
// restore the model view matrix to prevent contamination
|
||||
GL11.glPopMatrix();
|
||||
//goes to the next texture
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public abstract class Entity {
|
|||
*/
|
||||
protected void setTranslationGL(){
|
||||
// translate to the right location and prepare to draw
|
||||
GL11.glTranslatef(location.getX(), location.getY(), 0);
|
||||
GL11.glTranslatef(location.getX(), location.getY(), location.getZ());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -84,8 +84,6 @@ public class Sprite extends Entity {
|
|||
public void render() {
|
||||
// store the current model matrix
|
||||
GL11.glPushMatrix();
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
//Sets the scale of the sprite
|
||||
super.setScaleGL();
|
||||
|
|
@ -118,9 +116,6 @@ public class Sprite extends Entity {
|
|||
}
|
||||
GL11.glEnd();
|
||||
|
||||
|
||||
//Reset The Current Modelview Matrix
|
||||
GL11.glLoadIdentity();
|
||||
// restore the model view matrix to prevent contamination
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,10 +75,15 @@ public class Sound extends Entity{
|
|||
update();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the sound
|
||||
*/
|
||||
public void update() {
|
||||
//AL10.alSource(source.get(0), AL10.AL_POSITION, sourcePos);
|
||||
SoundManager.getInstnace().setSoundLocation(
|
||||
this, getLocation().getX(),getLocation().getY(),getLocation().getZ());
|
||||
SoundManager.getInstnace().setSoundLocation(this,
|
||||
getLocation().getX(),
|
||||
getLocation().getY(),
|
||||
getLocation().getZ());
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package ei.engine.sound;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
|
@ -119,6 +120,7 @@ public class SoundManager {
|
|||
/**
|
||||
* Looks for a availablee source. Creates a source if
|
||||
* necessary
|
||||
*
|
||||
* @return The source id
|
||||
*/
|
||||
private int getAvailableSource(){
|
||||
|
|
@ -155,6 +157,7 @@ public class SoundManager {
|
|||
|
||||
/**
|
||||
* Stops playing a sound
|
||||
*
|
||||
* @param sourceId The id of the source
|
||||
*/
|
||||
public void stopSound(Sound sound){
|
||||
|
|
@ -166,6 +169,7 @@ public class SoundManager {
|
|||
|
||||
/**
|
||||
* Stops playing a sound
|
||||
*
|
||||
* @param sourceId The id of the source
|
||||
*/
|
||||
private void stopSound(int sourceId){
|
||||
|
|
@ -177,6 +181,7 @@ public class SoundManager {
|
|||
|
||||
/**
|
||||
* Specify the location of the sound
|
||||
*
|
||||
* @param sourceId The id of the source
|
||||
* @param x The x axes
|
||||
* @param y The y axes
|
||||
|
|
@ -214,12 +219,19 @@ public class SoundManager {
|
|||
/**
|
||||
* Set the orientation of the listener
|
||||
*
|
||||
* @param rx The x rotation
|
||||
* @param ry The y rotation
|
||||
* @param rz The z rotation
|
||||
* @param x The x coordinate
|
||||
* @param y The y coordinate
|
||||
* @param z The z coordinate
|
||||
*/
|
||||
public void setListenerOrientation(float x, float y, float z){
|
||||
AL10.alListener3f(AL10.AL_ORIENTATION, x, y, z);
|
||||
public void setListenerOrientation(float rx, float ry, float rz,float x, float y, float z){
|
||||
float[] data = new float[] { rx, ry, rz , x, y, z };
|
||||
FloatBuffer listenerOrientation = BufferUtils.createFloatBuffer(data.length).put(data);
|
||||
listenerOrientation.flip();
|
||||
|
||||
AL10.alListener(AL10.AL_ORIENTATION,listenerOrientation);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
141
src/ei/engine/test/ex/BasicTest.java
Normal file
141
src/ei/engine/test/ex/BasicTest.java
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
/*
|
||||
* Copyright (c) 2002-2004 LWJGL Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* * Neither the name of 'LWJGL' nor the names of
|
||||
* its contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package ei.engine.test.ex;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.openal.AL;
|
||||
import org.lwjgl.openal.AL10;
|
||||
import org.lwjgl.opengl.DisplayMode;
|
||||
|
||||
/**
|
||||
*
|
||||
* This is a basic test, which contains the most used stuff
|
||||
*
|
||||
* @author Brian Matzon <brian@matzon.dk>
|
||||
* @version $Revision$
|
||||
* $Id$
|
||||
*/
|
||||
public abstract class BasicTest {
|
||||
|
||||
/**
|
||||
* Creates an instance of PlayTest
|
||||
*/
|
||||
public BasicTest() {
|
||||
try {
|
||||
String[] imps = AL.getImplementations();
|
||||
if(imps.length > 0) {
|
||||
System.out.println("Available devices: ");
|
||||
for(int i=0; i<imps.length; i++) {
|
||||
System.out.println(" " + i + ": " + imps[i]);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.out.println("Unable to query available devices: " + e.getMessage());
|
||||
}
|
||||
|
||||
try {
|
||||
AL.create();
|
||||
} catch (Exception e) {
|
||||
System.out.println("Unable to create OpenAL.\nPlease make sure that OpenAL is available on this system. Exception: " + e);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Shutdowns OpenAL
|
||||
*/
|
||||
protected void alExit() {
|
||||
if(AL.isCreated()) {
|
||||
AL.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a float buffer to hold specified float array
|
||||
* - strictly a utility method
|
||||
*
|
||||
* @param array to hold
|
||||
* @return created FloatBuffer
|
||||
*/
|
||||
protected FloatBuffer createFloatBuffer(float[] data) {
|
||||
FloatBuffer temp = BufferUtils.createFloatBuffer(data.length).put(data);
|
||||
temp.flip();
|
||||
return temp;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pauses the invoking thread for specified milliseconds
|
||||
*
|
||||
* @param time Milliseconds to sleep
|
||||
*/
|
||||
protected void pause(long time) {
|
||||
try {
|
||||
Thread.sleep(time);
|
||||
} catch (InterruptedException inte) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Exits the test NOW, printing errorcode to stdout
|
||||
*
|
||||
* @param error Error code causing exit
|
||||
*/
|
||||
protected void exit(int error) {
|
||||
System.out.println("OpenAL Error: " + AL10.alGetString(error));
|
||||
alExit();
|
||||
System.exit(-1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the display mode for fullscreen mode
|
||||
*/
|
||||
protected boolean setDisplayMode() {
|
||||
try {
|
||||
// get modes
|
||||
DisplayMode[] dm = org.lwjgl.util.Display.getAvailableDisplayModes(640, 480, -1, -1, -1, -1, 60, 60);
|
||||
|
||||
org.lwjgl.util.Display.setDisplayMode(dm, new String[] {
|
||||
"width=" + 640,
|
||||
"height=" + 480,
|
||||
"freq=" + 60,
|
||||
"bpp=" + org.lwjgl.opengl.Display.getDisplayMode().getBitsPerPixel()
|
||||
});
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ei.engine.test;
|
||||
package ei.engine.test.ex;
|
||||
/*
|
||||
* This Code Was Created By Jeff Molofee and GB Schmick 2000
|
||||
* A HUGE Thanks To Fredric Echols For Cleaning Up
|
||||
553
src/ei/engine/test/ex/PositionTest.java
Normal file
553
src/ei/engine/test/ex/PositionTest.java
Normal file
|
|
@ -0,0 +1,553 @@
|
|||
/*
|
||||
* Copyright (c) 2002-2004 LWJGL Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* * Neither the name of 'LWJGL' nor the names of
|
||||
* its contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package ei.engine.test.ex;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.LWJGLUtil;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.input.Mouse;
|
||||
import org.lwjgl.openal.AL;
|
||||
import org.lwjgl.openal.AL10;
|
||||
import org.lwjgl.opengl.Display;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.glu.GLU;
|
||||
import org.lwjgl.util.WaveData;
|
||||
|
||||
|
||||
/**
|
||||
* <br>
|
||||
* This test demonstrates OpenAL positioning Based on the example by Chad Armstrong
|
||||
* (http://www.edenwaith.com/products/pige/tutorials/openal.php)
|
||||
*
|
||||
* @author Brian Matzon <brian@matzon.dk>
|
||||
* @version $Revision$
|
||||
* $Id$
|
||||
*/
|
||||
public class PositionTest extends BasicTest {
|
||||
|
||||
/** *Small* glut implementation :) */
|
||||
private GLUT glut;
|
||||
|
||||
/** Width of window */
|
||||
public static final int WINDOW_WIDTH = 640;
|
||||
|
||||
/** Height of window */
|
||||
public static final int WINDOW_HEIGHT = 480;
|
||||
|
||||
/** LEFT enumeration */
|
||||
public static final int LEFT = 0;
|
||||
|
||||
/** CENTER enumeration */
|
||||
public static final int CENTER = 1;
|
||||
|
||||
/** RIGHT enumeration */
|
||||
public static final int RIGHT = 2;
|
||||
|
||||
/** Whether the demo is done */
|
||||
private boolean finished = false;
|
||||
|
||||
/** Whether in pause mode */
|
||||
private boolean pauseMode = false;
|
||||
|
||||
// OpenAL stuff
|
||||
// ===================================================
|
||||
|
||||
/** OpenAL buffers */
|
||||
private IntBuffer soundBuffers = BufferUtils.createIntBuffer(3);
|
||||
|
||||
/** OpenAL sources */
|
||||
private IntBuffer soundSources = BufferUtils.createIntBuffer(3);
|
||||
|
||||
/** Position of listener */
|
||||
private FloatBuffer listenerPosition = createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Velocity of listener */
|
||||
private FloatBuffer listenerVelocity = createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Orientation of listener */
|
||||
private FloatBuffer listenerOrientation =
|
||||
createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f });
|
||||
|
||||
/** Position of left sound */
|
||||
private FloatBuffer leftPosition = createFloatBuffer(new float[] { -2.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Velocity of left sound */
|
||||
private FloatBuffer leftVelocity = createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Position of center sound */
|
||||
private FloatBuffer centerPosition = createFloatBuffer(new float[] { 0.0f, 0.0f, -4.0f });
|
||||
|
||||
/** Velocity of center sound */
|
||||
private FloatBuffer centerVelocity = createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Position of right sound */
|
||||
private FloatBuffer rightPosition = createFloatBuffer(new float[] { 2.0f, 0.0f, 0.0f });
|
||||
|
||||
/** Velocity of right sound */
|
||||
private FloatBuffer rightVelocity = createFloatBuffer(new float[] { 0.0f, 0.0f, 0.0f });
|
||||
// ---------------------------------------------------
|
||||
|
||||
/**
|
||||
* Runs the actual test, using supplied arguments
|
||||
*/
|
||||
protected void execute(String[] args) {
|
||||
// Setup needed stuff
|
||||
try {
|
||||
setup();
|
||||
} catch (Exception e) {
|
||||
System.out.println("Error setting up demonstration: ");
|
||||
e.printStackTrace();
|
||||
System.exit(-1);
|
||||
}
|
||||
|
||||
// run the actual demonstration
|
||||
run();
|
||||
|
||||
// shutdown
|
||||
shutdown();
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs setup of demonstration
|
||||
*/
|
||||
private void setup() throws Exception {
|
||||
|
||||
// Setup Window
|
||||
// =====================================================
|
||||
LWJGLUtil.log("Setting up window");
|
||||
|
||||
// calc center
|
||||
int centerX = (Display.getDisplayMode().getWidth() - WINDOW_WIDTH) / 2;
|
||||
int centerY = (Display.getDisplayMode().getHeight() - WINDOW_HEIGHT) / 2;
|
||||
|
||||
// setup window
|
||||
setDisplayMode();
|
||||
Display.create();
|
||||
// -----------------------------------------------------
|
||||
|
||||
// Setup OpenGL
|
||||
// =====================================================
|
||||
LWJGLUtil.log("Setting up OpenGL");
|
||||
|
||||
GL11.glViewport(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||
GL11.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GL11.glLoadIdentity();
|
||||
GLU.gluPerspective(50.0f, (float) WINDOW_WIDTH / WINDOW_HEIGHT, 0.0f, 50.0f);
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GL11.glLoadIdentity();
|
||||
GL11.glTranslatef(0.0f, 0.0f, -6.6f);
|
||||
GL11.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
||||
glut = this.new GLUT();
|
||||
|
||||
Display.setVSyncEnabled(true);
|
||||
// -----------------------------------------------------
|
||||
|
||||
// Setup OpenAL
|
||||
// =====================================================
|
||||
LWJGLUtil.log("Setting up OpenAL");
|
||||
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
AL10.alListener(AL10.AL_VELOCITY, listenerVelocity);
|
||||
//AL10.alListener(AL10.AL_ORIENTATION, listenerOrientation);
|
||||
|
||||
// creating buffers
|
||||
LWJGLUtil.log("Creating buffers");
|
||||
AL10.alGenBuffers(soundBuffers);
|
||||
soundBuffers.rewind();
|
||||
|
||||
// creating sources
|
||||
AL10.alGenSources(soundSources);
|
||||
soundSources.rewind();
|
||||
|
||||
// load sound files (left, center, right).wav
|
||||
LWJGLUtil.log("Loading soundfiles...");
|
||||
|
||||
LWJGLUtil.log("Loading left.wav");
|
||||
WaveData left = WaveData.create("data/sounds/left.wav");
|
||||
AL10.alBufferData(soundBuffers.get(LEFT), left.format, left.data, left.samplerate);
|
||||
AL10.alSourcef(soundSources.get(LEFT), AL10.AL_PITCH, 1.0f);
|
||||
AL10.alSourcef(soundSources.get(LEFT), AL10.AL_GAIN, 1.0f);
|
||||
AL10.alSource(soundSources.get(LEFT), AL10.AL_POSITION, leftPosition);
|
||||
AL10.alSource(soundSources.get(LEFT), AL10.AL_VELOCITY, leftVelocity);
|
||||
AL10.alSourcei(soundSources.get(LEFT), AL10.AL_BUFFER, soundBuffers.get(LEFT));
|
||||
AL10.alSourcei(soundSources.get(LEFT), AL10.AL_LOOPING, AL10.AL_TRUE);
|
||||
|
||||
LWJGLUtil.log("Loading center.wav");
|
||||
WaveData center = WaveData.create("data/sounds/center.wav");
|
||||
AL10.alBufferData(soundBuffers.get(CENTER), center.format, center.data, center.samplerate);
|
||||
AL10.alSourcef(soundSources.get(CENTER), AL10.AL_PITCH, 1.0f);
|
||||
AL10.alSourcef(soundSources.get(CENTER), AL10.AL_GAIN, 1.0f);
|
||||
AL10.alSource(soundSources.get(CENTER), AL10.AL_POSITION, centerPosition);
|
||||
AL10.alSource(soundSources.get(CENTER), AL10.AL_VELOCITY, centerVelocity);
|
||||
AL10.alSourcei(soundSources.get(CENTER), AL10.AL_BUFFER, soundBuffers.get(CENTER));
|
||||
AL10.alSourcei(soundSources.get(CENTER), AL10.AL_LOOPING, AL10.AL_TRUE);
|
||||
|
||||
LWJGLUtil.log("Loading right.wav");
|
||||
WaveData right = WaveData.create("data/sounds/right.wav");
|
||||
AL10.alBufferData(soundBuffers.get(RIGHT), right.format, right.data, right.samplerate);
|
||||
AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_PITCH, 1.0f);
|
||||
AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_GAIN, 1.0f);
|
||||
AL10.alSource(soundSources.get(RIGHT), AL10.AL_POSITION, rightPosition);
|
||||
AL10.alSource(soundSources.get(RIGHT), AL10.AL_VELOCITY, rightVelocity);
|
||||
AL10.alSourcei(soundSources.get(RIGHT), AL10.AL_BUFFER, soundBuffers.get(RIGHT));
|
||||
AL10.alSourcei(soundSources.get(RIGHT), AL10.AL_LOOPING, AL10.AL_TRUE);
|
||||
|
||||
LWJGLUtil.log("Soundfiles loaded successfully");
|
||||
// -----------------------------------------------------
|
||||
|
||||
Mouse.setGrabbed(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs the actual demonstration
|
||||
*/
|
||||
private void run() {
|
||||
boolean firstRun = true;
|
||||
|
||||
System.out.println("Press 1/4 (left), 2/5 (center) or 3/6 (right) to toggle sound");
|
||||
System.out.println("Press LEFT/RIGHT to move along x axis");
|
||||
System.out.println("Press SHIFT and either UP/DOWN to move along y axis");
|
||||
System.out.println("Press UP/DOWN to move along z axis");
|
||||
System.out.println("Move along the x and y axis with the mouse");
|
||||
System.out.println("Press LEFT or RIGHT mouse button to move along z axis");
|
||||
System.out.println("Press ESC to exit demo");
|
||||
|
||||
LWJGLUtil.log(
|
||||
"Listener position: "
|
||||
+ listenerPosition.get(0)
|
||||
+ ", "
|
||||
+ listenerPosition.get(1)
|
||||
+ ", "
|
||||
+ listenerPosition.get(2));
|
||||
LWJGLUtil.log("Left position: " + leftPosition.get(0) + ", " + leftPosition.get(1) + ", " + leftPosition.get(2));
|
||||
LWJGLUtil.log("Center position: " + centerPosition.get(0) + ", " + centerPosition.get(1) + ", " + centerPosition.get(2));
|
||||
LWJGLUtil.log("Right position: " + rightPosition.get(0) + ", " + rightPosition.get(1) + ", " + rightPosition.get(2));
|
||||
|
||||
while (!finished) {
|
||||
// handle any input
|
||||
handleInput();
|
||||
|
||||
// allow window to process internal messages
|
||||
Display.update();
|
||||
|
||||
// render and paint if !minimized and not dirty
|
||||
if(Display.isVisible()) {
|
||||
render();
|
||||
} else {
|
||||
// sleeeeeep
|
||||
pause(100);
|
||||
}
|
||||
|
||||
// act on pause mode
|
||||
paused(!(Display.isVisible() || Display.isActive()));
|
||||
|
||||
// start sound after first paint, since we don't want
|
||||
// the delay before something is painted on the screen
|
||||
if (firstRun && !pauseMode) {
|
||||
firstRun = false;
|
||||
|
||||
// start sounds with delays
|
||||
startSounds();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts playing the sounds at different times
|
||||
*/
|
||||
private void startSounds() {
|
||||
AL10.alSourcePlay(soundSources.get(LEFT));
|
||||
pause(300);
|
||||
AL10.alSourcePlay(soundSources.get(CENTER));
|
||||
pause(500);
|
||||
AL10.alSourcePlay(soundSources.get(RIGHT));
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles any changes in pause mode
|
||||
*
|
||||
* @param paused Which pause mode to enter
|
||||
*/
|
||||
private void paused(boolean paused) {
|
||||
// if requesting pause, and not paused - pause and stop sound
|
||||
if(paused && !pauseMode) {
|
||||
pauseMode = true;
|
||||
AL10.alSourcePause(soundSources);
|
||||
System.out.println("pauseMode = true");
|
||||
}
|
||||
|
||||
// else go out of pause mode and start sounds
|
||||
else if(!paused && pauseMode) {
|
||||
pauseMode = false;
|
||||
startSounds();
|
||||
System.out.println("pauseMode = false");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles any input
|
||||
*/
|
||||
private void handleInput() {
|
||||
// User wants to exit?
|
||||
finished = Display.isCloseRequested() || Keyboard.isKeyDown(Keyboard.KEY_ESCAPE);
|
||||
if (finished) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
||||
|
||||
// Test for play
|
||||
// ============================================
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_1)) {
|
||||
AL10.alSourcePlay(soundSources.get(LEFT));
|
||||
LWJGLUtil.log("Playing left.wav");
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_2)) {
|
||||
AL10.alSourcePlay(soundSources.get(CENTER));
|
||||
LWJGLUtil.log("Playing center.wav");
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_3)) {
|
||||
AL10.alSourcePlay(soundSources.get(RIGHT));
|
||||
LWJGLUtil.log("Playing right.wav");
|
||||
}
|
||||
// --------------------------------------------
|
||||
|
||||
// Test for stop
|
||||
// ============================================
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_4)) {
|
||||
AL10.alSourceStop(soundSources.get(LEFT));
|
||||
LWJGLUtil.log("Stopped left.wav");
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_5)) {
|
||||
AL10.alSourceStop(soundSources.get(CENTER));
|
||||
LWJGLUtil.log("Stopped center.wav");
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_6)) {
|
||||
AL10.alSourceStop(soundSources.get(RIGHT));
|
||||
LWJGLUtil.log("Stopped right.wav");
|
||||
}
|
||||
// --------------------------------------------
|
||||
|
||||
// Test for movement with keyboard
|
||||
// ============================================
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
|
||||
listenerPosition.put(0, listenerPosition.get(0) - 0.1f);
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
|
||||
listenerPosition.put(0, listenerPosition.get(0) + 0.1f);
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_UP)) {
|
||||
if (shift) {
|
||||
listenerPosition.put(1, listenerPosition.get(1) + 0.1f);
|
||||
} else {
|
||||
listenerPosition.put(2, listenerPosition.get(2) - 0.1f);
|
||||
}
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
}
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
|
||||
if (shift) {
|
||||
listenerPosition.put(1, listenerPosition.get(1) - 0.1f);
|
||||
} else {
|
||||
listenerPosition.put(2, listenerPosition.get(2) + 0.1f);
|
||||
}
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
}
|
||||
// --------------------------------------------
|
||||
|
||||
// Test for movement with Mouse
|
||||
// ============================================
|
||||
listenerPosition.put(0, listenerPosition.get(0) + (0.01f * Mouse.getDX()));
|
||||
listenerPosition.put(1, listenerPosition.get(1) + (0.01f * Mouse.getDY()));
|
||||
if (Mouse.isButtonDown(0)) {
|
||||
listenerPosition.put(2, listenerPosition.get(2) - 0.1f);
|
||||
}
|
||||
if (Mouse.isButtonDown(1)) {
|
||||
listenerPosition.put(2, listenerPosition.get(2) + 0.1f);
|
||||
}
|
||||
|
||||
AL10.alListener(AL10.AL_POSITION, listenerPosition);
|
||||
|
||||
// empty mouse buffer
|
||||
while(Mouse.next());
|
||||
}
|
||||
|
||||
/**
|
||||
* Render the scene
|
||||
*/
|
||||
private void render() {
|
||||
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
|
||||
GL11.glPushMatrix();
|
||||
{
|
||||
GL11.glRotatef(20.0f, 1.0f, 1.0f, 0.0f);
|
||||
|
||||
// left
|
||||
GL11.glPushMatrix();
|
||||
{
|
||||
GL11.glTranslatef(leftPosition.get(0), leftPosition.get(1), leftPosition.get(2));
|
||||
GL11.glColor3f(1.0f, 0.0f, 0.0f);
|
||||
glut.glutWireCube(0.5f);
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
|
||||
// center
|
||||
GL11.glPushMatrix();
|
||||
{
|
||||
GL11.glTranslatef(centerPosition.get(0), centerPosition.get(1), centerPosition.get(2));
|
||||
GL11.glColor3f(0.0f, 0.0f, 1.0f);
|
||||
glut.glutWireCube(0.5f);
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
|
||||
// right
|
||||
GL11.glPushMatrix();
|
||||
{
|
||||
GL11.glTranslatef(rightPosition.get(0), rightPosition.get(1), rightPosition.get(2));
|
||||
GL11.glColor3f(0.0f, 1.0f, 0.0f);
|
||||
glut.glutWireCube(0.5f);
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
|
||||
// listener
|
||||
GL11.glPushMatrix();
|
||||
{
|
||||
GL11.glTranslatef(listenerPosition.get(0), listenerPosition.get(1), listenerPosition.get(2));
|
||||
GL11.glColor3f(1.0f, 1.0f, 1.0f);
|
||||
glut.glutSolidCube(0.5f);
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
/**
|
||||
* Shutdown of demonstration
|
||||
*/
|
||||
private void shutdown() {
|
||||
LWJGLUtil.log("Shutting down OpenAL");
|
||||
AL10.alSourceStop(soundSources);
|
||||
AL10.alDeleteSources(soundSources);
|
||||
AL10.alDeleteBuffers(soundBuffers);
|
||||
AL.destroy();
|
||||
|
||||
LWJGLUtil.log("Shutting down Window");
|
||||
Display.destroy();
|
||||
}
|
||||
|
||||
/**
|
||||
* main entry point
|
||||
*
|
||||
* @param args
|
||||
* String array containing arguments
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
PositionTest positionTest = new PositionTest();
|
||||
positionTest.execute(args);
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Minute implementation of GLUT: <br>COPYRIGHT:
|
||||
*
|
||||
* The OpenGL Utility Toolkit distribution for Win32 (Windows NT & Windows
|
||||
* 95) contains source code modified from the original source code for GLUT
|
||||
* version 3.3 which was developed by Mark J. Kilgard. The original source
|
||||
* code for GLUT is Copyright 1997 by Mark J. Kilgard. GLUT for Win32 is
|
||||
* Copyright 1997 by Nate Robins and is not in the public domain, but it is
|
||||
* freely distributable without licensing fees. It is provided without
|
||||
* guarantee or warrantee expressed or implied. It was ported with the
|
||||
* permission of Mark J. Kilgard by Nate Robins.
|
||||
*
|
||||
* THIS SOURCE CODE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
|
||||
* EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OR MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
class GLUT {
|
||||
|
||||
float n[][] = new float[][] { { -1.0f, 0.0f, 0.0f }, {
|
||||
0.0f, 1.0f, 0.0f }, {
|
||||
1.0f, 0.0f, 0.0f }, {
|
||||
0.0f, -1.0f, 0.0f }, {
|
||||
0.0f, 0.0f, 1.0f }, {
|
||||
0.0f, 0.0f, -1.0f }
|
||||
};
|
||||
|
||||
int faces[][] = new int[][] { { 0, 1, 2, 3 }, {
|
||||
3, 2, 6, 7 }, {
|
||||
7, 6, 5, 4 }, {
|
||||
4, 5, 1, 0 }, {
|
||||
5, 6, 2, 1 }, {
|
||||
7, 4, 0, 3 }
|
||||
};
|
||||
float v[][] = new float[8][3];
|
||||
|
||||
public void glutWireCube(float size) {
|
||||
drawBox(size, GL11.GL_LINE_LOOP);
|
||||
}
|
||||
|
||||
public void glutSolidCube(float size) {
|
||||
drawBox(size, GL11.GL_QUADS);
|
||||
}
|
||||
|
||||
private void drawBox(float size, int type) {
|
||||
|
||||
v[0][0] = v[1][0] = v[2][0] = v[3][0] = -size / 2;
|
||||
v[4][0] = v[5][0] = v[6][0] = v[7][0] = size / 2;
|
||||
v[0][1] = v[1][1] = v[4][1] = v[5][1] = -size / 2;
|
||||
v[2][1] = v[3][1] = v[6][1] = v[7][1] = size / 2;
|
||||
v[0][2] = v[3][2] = v[4][2] = v[7][2] = -size / 2;
|
||||
v[1][2] = v[2][2] = v[5][2] = v[6][2] = size / 2;
|
||||
|
||||
for (int i = 5; i >= 0; i--) {
|
||||
GL11.glBegin(type);
|
||||
GL11.glNormal3f(n[i][0], n[i][1], n[i][2]);
|
||||
GL11.glVertex3f(v[faces[i][0]][0], v[faces[i][0]][1], v[faces[i][0]][2]);
|
||||
GL11.glVertex3f(v[faces[i][1]][0], v[faces[i][1]][1], v[faces[i][1]][2]);
|
||||
GL11.glVertex3f(v[faces[i][2]][0], v[faces[i][2]][1], v[faces[i][2]][2]);
|
||||
GL11.glVertex3f(v[faces[i][3]][0], v[faces[i][3]][1], v[faces[i][3]][2]);
|
||||
GL11.glEnd();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package ei.game.gamestate;
|
||||
|
||||
import ei.engine.LWJGLGameWindow;
|
||||
import ei.engine.effects.Particles;
|
||||
import ei.engine.math.Vector2f;
|
||||
import ei.engine.scene.Node;
|
||||
|
|
@ -27,8 +28,9 @@ public class InGameState extends GameState{
|
|||
p.setLocation(sprite1.getLocation());
|
||||
rootNode.add(p);
|
||||
|
||||
sound1 = new Sound("sound","data/sounds/test.wav");
|
||||
sound1.play();
|
||||
sound1 = new Sound("sound","data/sounds/center.wav");
|
||||
sound1.loop();
|
||||
sound1.setLocation(sprite1.getLocation());
|
||||
rootNode.add(sound1);
|
||||
}
|
||||
|
||||
|
|
@ -39,9 +41,8 @@ public class InGameState extends GameState{
|
|||
|
||||
@Override
|
||||
public void update() {
|
||||
sprite1.getLocation().add(new Vector2f(0.5f,0.5f));
|
||||
LWJGLGameWindow.getCamera().getLocation().add(new Vector2f(-1.5f,-1.5f));
|
||||
sprite1.getRotation().add(0, 0, 0.5f);
|
||||
sound1.getLocation().add(new Vector2f(1,0));
|
||||
rootNode.update();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue