diff --git a/doomsday/postbuild/bundleapp.sh b/doomsday/postbuild/bundleapp.sh index 11ada82bc7..a530e449cd 100755 --- a/doomsday/postbuild/bundleapp.sh +++ b/doomsday/postbuild/bundleapp.sh @@ -53,7 +53,7 @@ $CP tools/texc/texc $APPDIR/Resources $CP tools/md2tool/md2tool $APPDIR/Resources # Tests -GLTEST=tests/glsandbox/test_glsandbox.app +GLTEST=tests/test_glsandbox/test_glsandbox.app if [ -e $GLTEST ]; then $CP libgui/libdeng_gui*dylib $GLTEST/Contents/Frameworks fi diff --git a/doomsday/tests/test_glsandbox/testwindow.cpp b/doomsday/tests/test_glsandbox/testwindow.cpp index f9c04114f8..6c73878903 100644 --- a/doomsday/tests/test_glsandbox/testwindow.cpp +++ b/doomsday/tests/test_glsandbox/testwindow.cpp @@ -89,7 +89,7 @@ DENG2_OBSERVES(Bank, Load) atlas->setTotalSize(Vector2ui(256, 256)); atlas->setMagFilter(gl::Nearest); - imageBank.add(Path("rtt.cube", '.'), "/data/graphics/testpic.png"); + imageBank.add("rtt.cube", "/data/graphics/testpic.png"); //imageBank.loadAll(); imageBank.audienceForLoad += this; } @@ -119,7 +119,7 @@ DENG2_OBSERVES(Bank, Load) // Textures. testpic.setAutoGenMips(true); - imageBank.load(Path("rtt.cube", '.')); + imageBank.load("rtt.cube"); //testpic.setImage(imageBank.image("rtt/cube")); //testpic.setImage(QImage(":/images/testpic.png")); testpic.setWrapT(gl::RepeatMirrored); @@ -225,10 +225,10 @@ DENG2_OBSERVES(Bank, Load) cv.renderTarget().setClearColor(Vector4f(.2f, .2f, .2f, 0)); } - void bankLoaded(Path const &path) + void bankLoaded(DotPath const &path) { LOG_INFO("Bank item \"%s\" loaded") << path; - if(path == "rtt/cube") + if(path == "rtt.cube") { DENG2_ASSERT_IN_MAIN_THREAD();