Compare commits
No commits in common. "2fe75b99ca34f7d7033ff6e17f73934287d55f71" and "cf5ff81d187a9ef00ad9240561b95328b0923059" have entirely different histories.
2fe75b99ca
...
cf5ff81d18
File diff suppressed because one or more lines are too long
|
@ -29,7 +29,6 @@ public class RenderEngine {
|
||||||
private List<SpriteSheetTexture> textureSpriteList = new ArrayList();
|
private List<SpriteSheetTexture> textureSpriteList = new ArrayList();
|
||||||
|
|
||||||
private BufferedImage missingTextureImage;
|
private BufferedImage missingTextureImage;
|
||||||
private IntBuffer imageDataB1 = GLAllocation.createDirectIntBuffer(0x100000);
|
|
||||||
|
|
||||||
public RenderEngine(GameSettings var2) {
|
public RenderEngine(GameSettings var2) {
|
||||||
this.options = var2;
|
this.options = var2;
|
||||||
|
@ -305,14 +304,15 @@ public class RenderEngine {
|
||||||
|
|
||||||
for (int i = 0; i < textureList.size(); i++) {
|
for (int i = 0; i < textureList.size(); i++) {
|
||||||
TextureFX texturefx = (TextureFX) textureList.get(i);
|
TextureFX texturefx = (TextureFX) textureList.get(i);
|
||||||
texturefx.anaglyphEnabled = this.options.anaglyph;
|
texturefx.anaglyphEnabled = options.anaglyph;
|
||||||
texturefx.onTick();
|
texturefx.onTick();
|
||||||
texturefx.bindImage(this);
|
|
||||||
int tileSize = 16 * 16 * 4;
|
int tileSize = 16 * 16 * 4;
|
||||||
imageData.clear();
|
imageData.clear();
|
||||||
imageData.put(texturefx.imageData);
|
imageData.put(texturefx.imageData);
|
||||||
imageData.position(0).limit(tileSize);
|
imageData.position(0).limit(tileSize);
|
||||||
GL11.glTexSubImage2D(3553, 0, (texturefx.iconIndex % 16) * 16, (texturefx.iconIndex / 16) * 16, 16, 16, 6408, 5121, imageData);
|
texturefx.bindImage(this);
|
||||||
|
GL11.glTexSubImage2D(3553 /* GL_TEXTURE_2D */, 0, (texturefx.iconIndex % 16) * 16, (texturefx.iconIndex / 16) * 16, 16, 16,
|
||||||
|
6408 /* GL_RGBA */, 5121 /* GL_UNSIGNED_BYTE */, imageData);
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glBindTexture(GL11.GL_TEXTURE_2D, getTexture("/terrain.png"));
|
GL11.glBindTexture(GL11.GL_TEXTURE_2D, getTexture("/terrain.png"));
|
||||||
|
@ -320,15 +320,11 @@ public class RenderEngine {
|
||||||
SpriteSheetTexture sp = textureSpriteList.get(i);
|
SpriteSheetTexture sp = textureSpriteList.get(i);
|
||||||
sp.update();
|
sp.update();
|
||||||
int w = 16;
|
int w = 16;
|
||||||
int tileSize = (w * sp.iconTileSize) * (w * sp.iconTileSize) * 4;
|
for(int j = 0; j < 5; ++j) {
|
||||||
//for(int j = 0; j < 5; ++j) {
|
GL11.glTexSubImage2D(3553 /* GL_TEXTURE_2D */, j, (sp.iconIndex % 16) * w, (sp.iconIndex / 16) * w, w * sp.iconTileSize, w * sp.iconTileSize,
|
||||||
imageDataB1.clear();
|
6408 /* GL_RGBA */, 5121 /* GL_UNSIGNED_BYTE */, sp.grabFrame(j));
|
||||||
imageDataB1.put(sp.grabFrame(0));
|
|
||||||
imageDataB1.position(0).limit(tileSize);
|
|
||||||
GL11.glTexSubImage2D(3553, 0, (sp.iconIndex % 16) * w, (sp.iconIndex / 16) * w, w * sp.iconTileSize, w * sp.iconTileSize,
|
|
||||||
6408, 5121, imageDataB1);
|
|
||||||
w /= 2;
|
w /= 2;
|
||||||
//}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
23265
web/js/app.js
23265
web/js/app.js
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
BIN
web/resources.mc
BIN
web/resources.mc
Binary file not shown.
Loading…
Reference in New Issue
Block a user