diff --git a/resource/bare.texture b/resource/bare.texture index 961c8a56a6535f69a7ab757192a17c7bd250b019..875517c9c47e4d1e2e66073f4a3fb1419fb1dabc 100644 Binary files a/resource/bare.texture and b/resource/bare.texture differ diff --git a/resource/fresnel.texture b/resource/fresnel.texture index afa58650e0da43f7e7f89561736d274a26067a42..3b3a0a64460139c867c960a0086803848075cf23 100644 Binary files a/resource/fresnel.texture and b/resource/fresnel.texture differ diff --git a/resource/ssh.texture b/resource/ssh.texture index a351f650a098d557a5c03476ad955eddf11cb676..089725e4b448f056bc4a47865931e830c864cbf9 100644 Binary files a/resource/ssh.texture and b/resource/ssh.texture differ diff --git a/src/main_testing.cpp b/src/main_testing.cpp index 2115281cbd711a4927d385bd4dc80ec00b036911..a17401213a979cc40d010063bcd3283d7774fd8c 100644 --- a/src/main_testing.cpp +++ b/src/main_testing.cpp @@ -25,22 +25,29 @@ int main(int argc, char** argv) { std::string img_path = rsc_path + "images\\"; std::string font_path = top_path + "include\\imgui\\misc\\fonts\\"; std::string shd_path = top_path + "shaders\\"; + /* int tex_offscreen_left = 0; int tex_offscreen_right = 450; int tex_offscreen_bottom = 450; int tex_offscreen_top = 450; + */ + int tex_offscreen_left = 0; + int tex_offscreen_right = 600; + int tex_offscreen_bottom = 600; + int tex_offscreen_top = 600; int texwidth = WIDTH + tex_offscreen_left + tex_offscreen_right; int texheight = HEIGHT + tex_offscreen_bottom + tex_offscreen_top; Toolbox tb(WIDTH, HEIGHT, texwidth, texheight, tex_offscreen_left, tex_offscreen_right, tex_offscreen_bottom, tex_offscreen_top, shd_path); WaveHandler waves(tb); - waves.initialize(rsc_path + "damp_exp", rsc_path + "ft_palette"); + //waves.initialize(rsc_path + "damp_exp", rsc_path + "ft_palette"); + waves.initialize(rsc_path + "bare", rsc_path + "ft_palette"); waves.generate_and_transfer_textures(tb); InputHandler ioHandler; GuiHandler guiHandler(0.15f); guiHandler.init(tb, img_path, font_path); - SlimBlockchainHandler bch(tb, MSTATE::PLACE, rsc_path + "damp_exp", rsc_path + "damp_exp"); + SlimBlockchainHandler bch(tb, MSTATE::PLACE, rsc_path + "ssh", rsc_path + "fresnel"); DrawingHandler drah(tb); /*Scale the gui*/