diff --git a/pics/portal.png b/assets/portal.png similarity index 100% rename from pics/portal.png rename to assets/portal.png diff --git a/pics/teleporter.png b/assets/teleporter.png similarity index 100% rename from pics/teleporter.png rename to assets/teleporter.png diff --git a/pics/tile01.png b/assets/tile01.png similarity index 100% rename from pics/tile01.png rename to assets/tile01.png diff --git a/pics/tile02.png b/assets/tile02.png similarity index 100% rename from pics/tile02.png rename to assets/tile02.png diff --git a/pics/tile03.png b/assets/tile03.png similarity index 100% rename from pics/tile03.png rename to assets/tile03.png diff --git a/pics/tile05.png b/assets/tile05.png similarity index 100% rename from pics/tile05.png rename to assets/tile05.png diff --git a/pics/tile06.png b/assets/tile06.png similarity index 100% rename from pics/tile06.png rename to assets/tile06.png diff --git a/pics/tile07.png b/assets/tile07.png similarity index 100% rename from pics/tile07.png rename to assets/tile07.png diff --git a/pics/tile08.png b/assets/tile08.png similarity index 100% rename from pics/tile08.png rename to assets/tile08.png diff --git a/pics/tile09.png b/assets/tile09.png similarity index 100% rename from pics/tile09.png rename to assets/tile09.png diff --git a/pics/tile10.png b/assets/tile10.png similarity index 100% rename from pics/tile10.png rename to assets/tile10.png diff --git a/pics/tile11.png b/assets/tile11.png similarity index 100% rename from pics/tile11.png rename to assets/tile11.png diff --git a/pics/tile12.png b/assets/tile12.png similarity index 100% rename from pics/tile12.png rename to assets/tile12.png diff --git a/pics/tile13.png b/assets/tile13.png similarity index 100% rename from pics/tile13.png rename to assets/tile13.png diff --git a/pics/tile15.png b/assets/tile15.png similarity index 100% rename from pics/tile15.png rename to assets/tile15.png diff --git a/pics/tile16.png b/assets/tile16.png similarity index 100% rename from pics/tile16.png rename to assets/tile16.png diff --git a/pics/tile17.png b/assets/tile17.png similarity index 100% rename from pics/tile17.png rename to assets/tile17.png diff --git a/pics/tile30.png b/assets/tile30.png similarity index 100% rename from pics/tile30.png rename to assets/tile30.png diff --git a/pics/tile31.png b/assets/tile31.png similarity index 100% rename from pics/tile31.png rename to assets/tile31.png diff --git a/pics/tile32.png b/assets/tile32.png similarity index 100% rename from pics/tile32.png rename to assets/tile32.png diff --git a/charset.png b/charset.png deleted file mode 100644 index 464f732..0000000 Binary files a/charset.png and /dev/null differ diff --git a/meson.build b/meson.build index d047015..e4b80ea 100644 --- a/meson.build +++ b/meson.build @@ -5,12 +5,8 @@ catch2 = dependency('catch2-with-main') fmt = dependency('fmt') json = dependency('nlohmann_json') sfml = dependency('sfml') -sdl2 = dependency('sdl2') -sdl2main = dependency('sdl2main') -dependencies = [ - fmt, json, sfml - ] +dependencies = [fmt, json, sfml] executable('runtests', [ 'dbc.cpp', @@ -19,36 +15,9 @@ executable('runtests', [ ], dependencies: dependencies + [catch2]) -executable('raycaster', [ - 'dbc.cpp', - 'matrix.cpp', - 'raycaster.cpp', - ], - dependencies: dependencies) - -executable('raycaster_pixels', [ - 'dbc.cpp', - 'matrix.cpp', - 'raycaster_pixels.cpp', - ], - dependencies: dependencies) - -executable('timcaster', [ - './scratchpad/timcaster.cpp', - ], - dependencies: dependencies + [sdl2, sdl2main]) - executable('sfmlcaster', [ 'dbc.cpp', 'matrix.cpp', 'sfmlcaster.cpp', ], dependencies: dependencies) - -executable('fenstercaster', [ - 'dbc.cpp', - 'matrix.cpp', - 'miniaudio.cpp', - 'fenscaster.cpp' - ], - dependencies: dependencies) diff --git a/fenscaster.cpp b/scratchpad/fenscaster.cpp similarity index 100% rename from fenscaster.cpp rename to scratchpad/fenscaster.cpp diff --git a/fenster/fenster.h b/scratchpad/fenster/fenster.h similarity index 100% rename from fenster/fenster.h rename to scratchpad/fenster/fenster.h diff --git a/pycaster.py b/scratchpad/pycaster.py similarity index 100% rename from pycaster.py rename to scratchpad/pycaster.py diff --git a/raycaster.cpp b/scratchpad/raycaster.cpp similarity index 100% rename from raycaster.cpp rename to scratchpad/raycaster.cpp diff --git a/raycaster_pixels.cpp b/scratchpad/raycaster_pixels.cpp similarity index 100% rename from raycaster_pixels.cpp rename to scratchpad/raycaster_pixels.cpp diff --git a/scratchpad/raycaster_sprites.cpp b/scratchpad/raycaster_sprites.cpp index 255dc30..e9194dd 100644 --- a/scratchpad/raycaster_sprites.cpp +++ b/scratchpad/raycaster_sprites.cpp @@ -135,14 +135,14 @@ int main(int /*argc*/, char */*argv*/[]) //load some textures unsigned long tw, th, error = 0; - error |= loadImage(texture[0], tw, th, "pics/eagle.png"); - error |= loadImage(texture[1], tw, th, "pics/redbrick.png"); - error |= loadImage(texture[2], tw, th, "pics/purplestone.png"); - error |= loadImage(texture[3], tw, th, "pics/greystone.png"); - error |= loadImage(texture[4], tw, th, "pics/bluestone.png"); - error |= loadImage(texture[5], tw, th, "pics/mossy.png"); - error |= loadImage(texture[6], tw, th, "pics/wood.png"); - error |= loadImage(texture[7], tw, th, "pics/colorstone.png"); + error |= loadImage(texture[0], tw, th, "assets/eagle.png"); + error |= loadImage(texture[1], tw, th, "assets/redbrick.png"); + error |= loadImage(texture[2], tw, th, "assets/purplestone.png"); + error |= loadImage(texture[3], tw, th, "assets/greystone.png"); + error |= loadImage(texture[4], tw, th, "assets/bluestone.png"); + error |= loadImage(texture[5], tw, th, "assets/mossy.png"); + error |= loadImage(texture[6], tw, th, "assets/wood.png"); + error |= loadImage(texture[7], tw, th, "assets/colorstone.png"); if(error) { std::cout << "error loading images" << std::endl; return 1; } //load some sprite textures diff --git a/scratchpad/raycaster_textured.cpp b/scratchpad/raycaster_textured.cpp index e41cf6b..3dca1b0 100644 --- a/scratchpad/raycaster_textured.cpp +++ b/scratchpad/raycaster_textured.cpp @@ -107,14 +107,14 @@ int main(int /*argc*/, char */*argv*/[]) #else //generate some textures unsigned long tw, th; - loadImage(texture[0], tw, th, "pics/eagle.png"); - loadImage(texture[1], tw, th, "pics/redbrick.png"); - loadImage(texture[2], tw, th, "pics/purplestone.png"); - loadImage(texture[3], tw, th, "pics/greystone.png"); - loadImage(texture[4], tw, th, "pics/bluestone.png"); - loadImage(texture[5], tw, th, "pics/mossy.png"); - loadImage(texture[6], tw, th, "pics/wood.png"); - loadImage(texture[7], tw, th, "pics/colorstone.png"); + loadImage(texture[0], tw, th, "assets/eagle.png"); + loadImage(texture[1], tw, th, "assets/redbrick.png"); + loadImage(texture[2], tw, th, "assets/purplestone.png"); + loadImage(texture[3], tw, th, "assets/greystone.png"); + loadImage(texture[4], tw, th, "assets/bluestone.png"); + loadImage(texture[5], tw, th, "assets/mossy.png"); + loadImage(texture[6], tw, th, "assets/wood.png"); + loadImage(texture[7], tw, th, "assets/colorstone.png"); #endif //start the main loop diff --git a/sfmlcaster.cpp b/sfmlcaster.cpp index 65331f5..154606f 100644 --- a/sfmlcaster.cpp +++ b/sfmlcaster.cpp @@ -123,15 +123,15 @@ void load_textures() { texture[i].resize(texWidth * texHeight); } - loadImage(texture[0], "pics/tile16.png"); - loadImage(texture[1], "pics/tile02.png"); - loadImage(texture[2], "pics/tile03.png"); - loadImage(texture[3], "pics/tile32.png"); - loadImage(texture[4], "pics/tile05.png"); - loadImage(texture[5], "pics/tile17.png"); - loadImage(texture[6], "pics/tile10.png"); - loadImage(texture[7], "pics/tile01.png"); - loadImage(texture[8], "pics/portal.png"); + loadImage(texture[0], "assets/tile16.png"); + loadImage(texture[1], "assets/tile02.png"); + loadImage(texture[2], "assets/tile03.png"); + loadImage(texture[3], "assets/tile32.png"); + loadImage(texture[4], "assets/tile05.png"); + loadImage(texture[5], "assets/tile17.png"); + loadImage(texture[6], "assets/tile10.png"); + loadImage(texture[7], "assets/tile01.png"); + loadImage(texture[8], "assets/portal.png"); } void draw_sfml_rect(sf::RenderWindow &window, sf::Vector2f pos, sf::Vector2f size, uint8_t color) {