Commits

Valerio Riva  committed deb38b6

aggiunte librerie e ultimo merge

  • Participants
  • Parent commits 929813c

Comments (0)

Files changed (35)

 lwjgl-2.8.5/doc/LICENSE
 lwjgl-2.8.5/doc/README
 lwjgl-2.8.5/doc/lwjgl_hidden_switches.text
-lwjgl-2.8.5/jar/AppleJavaExtensions.jar
-lwjgl-2.8.5/jar/asm-debug-all.jar
-lwjgl-2.8.5/jar/jinput.jar
-lwjgl-2.8.5/jar/lwjgl-debug.jar
-lwjgl-2.8.5/jar/lwjgl.jar
-lwjgl-2.8.5/jar/lwjgl_test.jar
-lwjgl-2.8.5/jar/lwjgl_util.jar
-lwjgl-2.8.5/jar/lwjgl_util_applet.jar
-lwjgl-2.8.5/jar/lzma.jar
-lwjgl-2.8.5/native/linux/libjinput-linux.so
-lwjgl-2.8.5/native/linux/libjinput-linux64.so
-lwjgl-2.8.5/native/linux/liblwjgl.so
-lwjgl-2.8.5/native/linux/liblwjgl64.so
-lwjgl-2.8.5/native/linux/libopenal.so
-lwjgl-2.8.5/native/linux/libopenal64.so
-lwjgl-2.8.5/native/macosx/libjinput-osx.jnilib
-lwjgl-2.8.5/native/macosx/liblwjgl.jnilib
-lwjgl-2.8.5/native/macosx/openal.dylib
-lwjgl-2.8.5/native/solaris/liblwjgl.so
-lwjgl-2.8.5/native/solaris/liblwjgl64.so
-lwjgl-2.8.5/native/solaris/libopenal.so
-lwjgl-2.8.5/native/solaris/libopenal64.so
-lwjgl-2.8.5/native/windows/OpenAL32.dll
-lwjgl-2.8.5/native/windows/OpenAL64.dll
-lwjgl-2.8.5/native/windows/jinput-dx8.dll
-lwjgl-2.8.5/native/windows/jinput-dx8_64.dll
-lwjgl-2.8.5/native/windows/jinput-raw.dll
-lwjgl-2.8.5/native/windows/jinput-raw_64.dll
-lwjgl-2.8.5/native/windows/lwjgl.dll
-lwjgl-2.8.5/native/windows/lwjgl64.dll
 lwjgl-2.8.5/res/Footsteps.wav
 lwjgl-2.8.5/res/appletlogo.gif
 lwjgl-2.8.5/res/appletprogress.gif
 lwjgl-2.8.5/res/spaceinvaders/shot.wav
 lwjgl-2.8.5/res/spaceinvaders/start.wav
 lwjgl-2.8.5/res/spaceinvaders/win.wav
-lwjgl-2.8.5/res/spaceinvaders/youwin.gif
-slick.jar
+lwjgl-2.8.5/res/spaceinvaders/youwin.gif

File lib/jogg-0.0.7.jar

Binary file added.

File lib/jorbis-0.0.15.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/AppleJavaExtensions.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/asm-debug-all.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/jinput.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lwjgl-debug.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lwjgl.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lwjgl_test.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lwjgl_util.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lwjgl_util_applet.jar

Binary file added.

File lib/lwjgl-2.8.5/jar/lzma.jar

Binary file added.

File lib/lwjgl-2.8.5/native/linux/libjinput-linux.so

Binary file added.

File lib/lwjgl-2.8.5/native/linux/libjinput-linux64.so

Binary file added.

File lib/lwjgl-2.8.5/native/linux/liblwjgl.so

Binary file added.

File lib/lwjgl-2.8.5/native/linux/liblwjgl64.so

Binary file added.

File lib/lwjgl-2.8.5/native/linux/libopenal.so

Binary file added.

File lib/lwjgl-2.8.5/native/linux/libopenal64.so

Binary file added.

File lib/lwjgl-2.8.5/native/macosx/libjinput-osx.jnilib

Binary file added.

File lib/lwjgl-2.8.5/native/macosx/liblwjgl.jnilib

Binary file added.

File lib/lwjgl-2.8.5/native/macosx/openal.dylib

Binary file added.

File lib/lwjgl-2.8.5/native/solaris/liblwjgl.so

Binary file added.

File lib/lwjgl-2.8.5/native/solaris/liblwjgl64.so

Binary file added.

File lib/lwjgl-2.8.5/native/solaris/libopenal.so

Binary file added.

File lib/lwjgl-2.8.5/native/solaris/libopenal64.so

Binary file added.

File lib/lwjgl-2.8.5/native/windows/OpenAL32.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/OpenAL64.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/jinput-dx8.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/jinput-dx8_64.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/jinput-raw.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/jinput-raw_64.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/lwjgl.dll

Binary file added.

File lib/lwjgl-2.8.5/native/windows/lwjgl64.dll

Binary file added.

File lib/slick.jar

Binary file added.

File src/ggj/keysrace/RaceGame.java.orig

+package ggj.keysrace;
+
+import ggj.keyspong.game.OurGame;
+import ggj.keyspong.game.levels.ElementsType;
+import ggj.keyspong.game.levels.Level;
+import ggj.keyspong.utils.Constants;
+import ggj.keysrace.entities.HorizontalBottom;
+import ggj.keysrace.entities.HorizontalTop;
+import ggj.keysrace.entities.Player;
+import ggj.keysrace.entities.obstacles.Obstacle;
+
+import org.newdawn.slick.*;
+
+public class RaceGame extends OurGame {
+	public RaceGame(Level level) {
+		super(level);
+	}
+
+	protected static String title = "Race";
+
+	public void init(GameContainer gc) throws SlickException {
+		HorizontalBottom bottom = new HorizontalBottom();
+		HorizontalTop top = new HorizontalTop();
+		
+		Player player1 = new Player(collisionHandler,gc,entities);
+		Player player2 = new Player(collisionHandler,gc,entities);
+		Player player3 = new Player(collisionHandler,gc,entities);
+		Player player4 = new Player(collisionHandler,gc,entities);
+
+		//LIVELLO
+		ElementsType et = null;
+		int x = 0;
+		int maxSize = 0;
+		while ((et = this.getLevel().pop()) != null){
+			Obstacle o = ElementsType.getObstacle(et);
+			if (o != null) {
+				o.setXPosition(x);
+				this.entities.add(o);
+				int yposition = o.getYPosition()-this.getLevel().popPosition()*Constants.LEVEL_HEIGHT;
+				o.setYPosition(yposition);
+				if ( o.getCurrentAnimation().getCurrentFrame().getWidth()>maxSize) maxSize =  o.getCurrentAnimation().getCurrentFrame().getWidth();
+			}
+			else{
+				this.getLevel().popPosition();
+				x += maxSize;
+				maxSize = 0;
+			}
+		}
+		
+		//entities.add(bottom);
+		entities.add(top);
+		entities.add(player1);
+		entities.add(player2);
+		entities.add(player3);
+		entities.add(player4);
+
+		bottom.setPosition(Constants.BOTTOM_X, Constants.BOTTOM_Y);
+		top.setPosition(Constants.TOP_X, Constants.TOP_Y);
+		player1.setPosition(Constants.PLAYER_START_X+0*Constants.PLAYER_START_SPACE_X, Constants.PLAYER_START_Y);
+		player2.setPosition(Constants.PLAYER_START_X+1*Constants.PLAYER_START_SPACE_X, Constants.PLAYER_START_Y);
+		player3.setPosition(Constants.PLAYER_START_X+2*Constants.PLAYER_START_SPACE_X, Constants.PLAYER_START_Y);
+		player4.setPosition(Constants.PLAYER_START_X+3*Constants.PLAYER_START_SPACE_X, Constants.PLAYER_START_Y);
+	}
+}