Skip to content

Commit

Permalink
Tests|GLSandbox: Updated for DotPath, source folder name
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed May 17, 2013
1 parent 036c4a9 commit 82f3a7b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doomsday/postbuild/bundleapp.sh
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions doomsday/tests/test_glsandbox/testwindow.cpp
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 82f3a7b

Please sign in to comment.