profan
/
chipd8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: profan:d8e79f06582b46ad1e9825db503f955b0889ef9e
Branches Tags
profan:master
..
compare: profan:1aff62163a07aa6788acdef21a31e7ee09772c35
Branches Tags
profan:master

No commits in common. "d8e79f06582b46ad1e9825db503f955b0889ef9e" and "1aff62163a07aa6788acdef21a31e7ee09772c35" have entirely different histories.
d8e79f0658 ... 1aff62163a

2 changed files with 20 additions and 55 deletions
Show Stats Expand all files Collapse all files

20
source/app.d
View File

@ -214,9 +214,7 @@ struct Chip8Status {
Assembly ass_; Assembly ass_;
// loaded program // loaded program
const(char)*[string] string_cache;
const (char)* loaded_program; const (char)* loaded_program;
string loaded_program_str;
// mem editor // mem editor
// MemoryEditor mem_editor_; // MemoryEditor mem_editor_;
@ -267,7 +265,8 @@ struct Chip8Status {
import std.file : read; import std.file : read;
auto buf = read(loaded_program_str); loaded_program = "chip8_picture.ch8";
auto buf = read("programs/chip8_picture.ch8");
emu_.load(0x200, buf); // do ze load yes, will copy all the data in emu_.load(0x200, buf); // do ze load yes, will copy all the data in
ass_.setRange(cast(ushort)0x200, cast(ushort)(0x200 + cast(ushort)buf.length)); ass_.setRange(cast(ushort)0x200, cast(ushort)(0x200 + cast(ushort)buf.length));
ass_.reset(); ass_.reset();
@ -312,22 +311,9 @@ struct Chip8Status {
resetShortcut(); resetShortcut();
} }
if (igBeginMenu("Load")) { if (igMenuItem("Load", "CTRL+L")) {
import std.file;
auto dir_iterator = dirEntries("", "*.ch8", SpanMode.breadth);
foreach (DirEntry e; dir_iterator) {
import std.string : toStringz;
const (char)* c_str;
if (!(e.name in string_cache)) c_str = toStringz(e.name);
else c_str = string_cache[e.name];
if (igMenuItem(c_str)) {
loaded_program_str = e.name;
loaded_program = c_str;
loadShortcut(); loadShortcut();
} }
}
igEndMenu();
}
if (igMenuItem("Debug", "CTRL+D")) { if (igMenuItem("Debug", "CTRL+D")) {
debugShortcut(); debugShortcut();

21
source/window.d
View File

@ -29,7 +29,6 @@ struct Window {
SDL_Window* window; SDL_Window* window;
SDL_GLContext context; SDL_GLContext context;
version(Windows) {
extern(Windows) nothrow @nogc extern(Windows) nothrow @nogc
static void openGLCallbackFunction( static void openGLCallbackFunction(
GLenum source, GLenum type, GLenum source, GLenum type,
@ -48,26 +47,6 @@ struct Window {
} }
} // openGLCallbackFunction } // openGLCallbackFunction
} else {
extern(C) nothrow @nogc
static void openGLCallbackFunction(
GLenum source, GLenum type,
GLuint id, GLenum severity,
GLsizei length, const (GLchar*) message, // TODO: look at why it's GLchar* for non-windows and the other works on windows..
void* userParam)
{
printf("Message: %s \nSource: %s \nType: %s \nID: %d \nSeverity: %s\n\n",
message, to!(char*)(source), to!(char*)(type), id, to!(char*)(severity));
if (severity == GL_DEBUG_SEVERITY_HIGH) {
printf("Aborting...\n");
import core.stdc.stdlib : exit;
exit(-1);
}
} // openGLCallbackFunction
}
void createWindow(int w, int h, const char* title = "Chipd8 Emu") { void createWindow(int w, int h, const char* title = "Chipd8 Emu") {
assert(w > 0, "window width must be > 0"); assert(w > 0, "window width must be > 0");