lauchmelder/NESEmulator
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

rendering is now kind of working

Browse source
This commit is contained in:
Lauchmelder 2021-10-29 17:34:17 +02:00
parent 9039fa0ccf
commit 306516394b
4 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NES Emulator/bus.c
View file

@ -34,7 +34,7 @@ struct Bus* createBus(SDL_Renderer* renderer)
memset(bus->ram, 0x00, 0x18);
// Create and insert cartridge
bus->cartridge = createCartridge(bus, "roms/nestest.nes");
bus->cartridge = createCartridge(bus, "roms/donkeykong.nes");
// Create CPU and attach it
bus->cpu = createCPU(bus);

11
NES Emulator/main.c
View file

@ -9,7 +9,7 @@ int main(int argc, char** argv)
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Window* window = SDL_CreateWindow("NES Emulator", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1400, 800, SDL_WINDOW_SHOWN);
SDL_Window* window = SDL_CreateWindow("NES Emulator", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1400, 900, SDL_WINDOW_SHOWN);
if (window == NULL)
{
fprintf(stderr, "Failed to create SDL_Window.\n");
@ -78,6 +78,15 @@ int main(int argc, char** argv)
target.x = 256 + 10 + 10;
SDL_RenderCopy(renderer, tableTexture, NULL, &target);
tableTexture = getRenderedNameTableTexture(bus->ppu, 0);
target.x = 10;
target.y = 256 + 10 + 10 + 10 + 256;
SDL_RenderCopy(renderer, tableTexture, NULL, &target);
tableTexture = getRenderedNameTableTexture(bus->ppu, 1);
target.x = 256 + 10 + 10;
SDL_RenderCopy(renderer, tableTexture, NULL, &target);
tableTexture = getScreenTexture(bus->ppu);
target.x = 10 + 256 + 10 + 256 + 10;
target.y = 10;

44
NES Emulator/ppu.c
View file

@ -30,6 +30,7 @@ struct PPU* createPPU(struct Bus* parent)
{
ppu->nameTables[i] = ppu->nameTables[0] + ((size_t)0x0400 * i);
ppu->nameTableTextures[i] = SDL_CreateTexture(parent->screen, SDL_PIXELFORMAT_RGB332, SDL_TEXTUREACCESS_STREAMING, 32, 32);
ppu->renderedNameTableTextures[i] = SDL_CreateTexture(parent->screen, SDL_PIXELFORMAT_RGB24, SDL_TEXTUREACCESS_STREAMING, 256, 240);
}
@ -93,7 +94,10 @@ void destroyPPU(struct PPU* ppu)
free(ppu->paletteIndexes);
for (int i = 0; i < 2; i++)
{
SDL_DestroyTexture(ppu->renderedNameTableTextures[i]);
SDL_DestroyTexture(ppu->nameTableTextures[i]);
}
free(ppu->nameTables[0]);
free(ppu);
@ -257,13 +261,13 @@ int tickPPU(struct PPU* ppu)
ppu->loPatternFIFO.lo = ppu->tileData.tile.lo;
}
ppu->tileData.nametable = ppu->nameTables[0][((size_t)0x2000 + (size_t)0x400 * ppu->ppuCtrl.nametable) + (size_t)0x20* tileY + tileX];
ppu->tileData.nametable = ppu->nameTables[ppu->ppuCtrl.nametable][(size_t)32 * tileY + tileX];
break;
}
case Attribute:
{
ppu->tileData.attribute = ppu->nameTables[0][0x3C0 + ((tileY >> 2) * 8) + (tileX >> 2)];
ppu->tileData.attribute = ppu->nameTables[ppu->ppuCtrl.nametable][0x3C0 + ((tileY >> 2) * 8) + (tileX >> 2)];
break;
}
@ -280,7 +284,7 @@ int tickPPU(struct PPU* ppu)
}
}
ppu->remainingCycles = 1;
ppu->remainingCycles = 2;
ppu->fetchingPhase = (ppu->fetchingPhase + 1) % FetchingPhaseSize;
}
@ -343,3 +347,37 @@ SDL_Texture* getScreenTexture(struct PPU* ppu)
return ppu->screen;
}
SDL_Texture* getRenderedNameTableTexture(struct PPU* ppu, int index)
{
SDL_Texture* target = ppu->renderedNameTableTextures[index];
int pitch;
struct Pixel* pixels;
SDL_LockTexture(target, NULL, &pixels, &pitch);
Byte patternTable = 0x1000 * ppu->ppuCtrl.bgTile;
for (int y = 0; y < 30; y++)
{
for (int x = 0; x < 32; x++)
{
Byte offset = ppu->nameTables[index][y * 32 + x];
for (int row = 0; row < 8; row++)
{
Byte dataHi = readCartridgePPU(ppu->bus->cartridge, patternTable + offset * 16 + row + 8);
Byte dataLo = readCartridgePPU(ppu->bus->cartridge, patternTable + offset * 16 + row);
for (int bit = 0; bit < 8; bit++)
{
Byte color = (((dataHi << bit) & 0x80) >> 6) | (((dataLo << bit) & 0x80) >> 7);
pixels[y * (256 * 8) + row * 256 + x * 8 + bit].r = 50 * color;
pixels[y * (256 * 8) + row * 256 + x * 8 + bit].g = 50 * color;
pixels[y * (256 * 8) + row * 256 + x * 8 + bit].b = 50 * color;
}
}
}
}
SDL_UnlockTexture(target);
return target;
}

2
NES Emulator/ppu.h
View file

@ -108,6 +108,7 @@ struct PPU
Byte* nameTables[2];
SDL_Texture* nameTableTextures[2];
SDL_Texture* renderedNameTableTextures[2];
Byte mirroring;
Byte* paletteIndexes;
@ -208,5 +209,6 @@ int tickPPU(struct PPU* ppu);
SDL_Texture* getNameTableTexture(struct PPU* ppu, int index);
SDL_Texture* getScreenTexture(struct PPU* ppu);
SDL_Texture* getRenderedNameTableTexture(struct PPU* ppu, int index);
#endif // _PPU_H_