Offthread gfx #22

Merged
merged 16 commits into from Jan 24, 2016

fix some typos

  • Loading branch information...
taisel committed Jan 23, 2016
commit f23fa375f362d9b4dfcd5f95d075de1924ef73c8
@@ -1316,10 +1316,12 @@ else {
this.writePalette16Color(address, palette);
}
GameBoyAdvanceGraphicsRenderer.prototype.readPalette16 = function (address) {
+ address <<= 1;
address &= 0x3FE;
return this.paletteRAM[address] | (this.paletteRAM[address | 1] << 8);
}
GameBoyAdvanceGraphicsRenderer.prototype.readPalette32 = function (address) {
+ address <<= 2;
address &= 0x3FC;
return this.paletteRAM[address] | (this.paletteRAM[address | 1] << 8) | (this.paletteRAM[address | 2] << 16) | (this.paletteRAM[address | 3] << 24);
}
@@ -1207,12 +1207,12 @@ GameBoyAdvanceRendererProxy.prototype.writePalette32 = function (address, data)
}
GameBoyAdvanceRendererProxy.prototype.readPalette16 = function (address) {
address = address | 0;
- var data = this.renderer.readPalette16(address | 0) | 0;
+ var data = this.renderer.readPalette16(address >> 1) | 0;
return data | 0;
}
GameBoyAdvanceRendererProxy.prototype.readPalette32 = function (address) {
address = address | 0;
- var data = this.renderer.readPalette32(address | 0) | 0;
+ var data = this.renderer.readPalette32(address >> 2) | 0;
return data | 0;
}
GameBoyAdvanceRendererProxy.prototype.readVRAM8 = function (address) {
@@ -731,7 +731,7 @@ else {
address <<= 2;
address &= 0x1FFFC;
this.VRAM[address] = data & 0xFF;
- this.VRAM[address + 1 = (data >> 8) & 0xFF;
+ this.VRAM[address + 1] = (data >> 8) & 0xFF;
this.VRAM[address + 2] = (data >> 16) & 0xFF;
this.VRAM[address + 3] = data >>> 24;
this.pushCommand(0x40000 | address, data | 0);
@@ -31,7 +31,19 @@ importScripts("../IodineGBA/core/sound/Channel4.js");
importScripts("../IodineGBA/core/CPU/ARM.js");
importScripts("../IodineGBA/core/CPU/THUMB.js");
importScripts("../IodineGBA/core/CPU/CPSR.js");
+importScripts("../IodineGBA/core/graphics/RendererProxy.js");
importScripts("../IodineGBA/core/graphics/RendererShim.js");
+importScripts("../IodineGBA/core/graphics/Renderer.js");
+importScripts("../IodineGBA/core/graphics/BGTEXT.js");
+importScripts("../IodineGBA/core/graphics/BG2FrameBuffer.js");
+importScripts("../IodineGBA/core/graphics/BGMatrix.js");
+importScripts("../IodineGBA/core/graphics/AffineBG.js");
+importScripts("../IodineGBA/core/graphics/ColorEffects.js");
+importScripts("../IodineGBA/core/graphics/Mosaic.js");
+importScripts("../IodineGBA/core/graphics/OBJ.js");
+importScripts("../IodineGBA/core/graphics/OBJWindow.js");
+importScripts("../IodineGBA/core/graphics/Window.js");
+importScripts("../IodineGBA/core/graphics/Compositor.js");
importScripts("../IodineGBA/core/memory/DMA0.js");
importScripts("../IodineGBA/core/memory/DMA1.js");
importScripts("../IodineGBA/core/memory/DMA2.js");