ziver/evil-inside
1
0
Fork 0
Code Pull requests Releases Activity

Browse source
This commit is contained in:
Jesper Lundin 2007-05-07 15:44:53 +00:00
parent 1acec322f3
commit cded357ea9
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/data/map/asfalt.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 138 KiB

Before After
Before After

56
src/data/map/default.map
View file

@ -6,35 +6,35 @@
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000344400000000000000000000000000
0000000000344400000000000000000000000000
0000000000344400000000000000000000000000
0000000000303300000000000000000000000000
0000000000303300000000000000000000000000
0000000000333300000000000000000000000000
0000000000003000000000000000000000000000
0000000000003000000000000000000000000000
0000000000003444000000000000000000000000
0000000000003444000000000000000000000000
0000000000003444000000000000000000000000
0000000000003333333333333333333333333330
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000003000000000000030000000000000
0000000000003000000000000030000000000000
0000000000003111000000000030000000000000
0000000000003111000000000030000000000000
0000000000003111000000000030000000000000
0000333333333333333333333330000000000000
0000300000000000000000000030000000000000
0000300000000000000000000030000000000000
0000300000000000000000000030000000000000
0000300000000000000000000030000000000000
0000300000000000000000000030000000000000
0000300000000000000000000030000000000000
0000300044400000000000000030000000000000
0000300044400000000000000030000000000000
0000300044400000000000000030000000000000
0000333333333333333333333333333330000000
0000000000000000003000000000000030000000
0000000000000000003000000000000030000000
0000000000000000003000000000000030000000
0000000000000000003000000000000030000000
0000000000000000003000000000000030000000
0000000000000000003333333333333330000000
0000000000000000000000000000000000000000

2
src/data/map/default.obj
View file

@ -16,7 +16,7 @@
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000200020000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000
0000000000000000000000000000000000000000

BIN
src/data/map/grass.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Before After
Before After

2
src/ei/engine/effects/Particles.java
View file

@ -46,7 +46,7 @@ public class Particles extends Entity{
{{1.0f,0.0f,1.0f},{1.0f,0.0f,0.0f}}
};
private int maxParticles = 1000;
private int maxParticles = 300;
private boolean enabled = true;
private Particle particle[];
private int col; // Current Color Selection

14
src/ei/game/scene/Map.java
View file

@ -103,19 +103,19 @@ public class Map {
for(int j=0; j<hight ;j++){
switch(mapData[i][j]){
case MAP_GRASS:
mapNode.add(getPosSprite(i,j,"data/map/grass.png"));
mapNode.add(getPosSprite(i,j,"data/map/grass.png", 7));
break;
case MAP_SAND:
mapNode.add(getPosSprite(i,j,"data/map/sand.jpg"));
mapNode.add(getPosSprite(i,j,"data/map/sand.png", 7));
break;
case MAP_REDMUD:
mapNode.add(getPosSprite(i,j,"data/map/redmud.jpg"));
mapNode.add(getPosSprite(i,j,"data/map/redmud.jpg", 0));
break;
case MAP_ASFALT:
mapNode.add(getPosSprite(i,j,"data/map/asfalt.png"));
mapNode.add(getPosSprite(i,j,"data/map/asfalt.png", 6));
break;
case MAP_PARKING:
mapNode.add(getPosSprite(i,j,parking[parkingIndex]));
mapNode.add(getPosSprite(i,j,parking[parkingIndex], 0));
parkingIndex++;
if(parkingIndex >= parking.length){
parkingIndex = 0;
@ -142,10 +142,10 @@ public class Map {
}
}
private Entity getPosSprite(int x, int y, String file){
private Entity getPosSprite(int x, int y, String file, int overlap){
Sprite s = new Sprite("MapPos("+x+","+y+")", file);
s.setLocation(new Vector3f(x*POS_SIZE,y*POS_SIZE,0));
s.setSize(new Vector2f(POS_SIZE,POS_SIZE));
s.setSize(new Vector2f((overlap*2)+POS_SIZE, (overlap*2)+POS_SIZE));
return s;
}