diff options
| author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-21 00:59:44 +0200 |
|---|---|---|
| committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-21 00:59:44 +0200 |
| commit | 14833f2e5bddab2ff0ac637fe1340ade94eb88ae (patch) | |
| tree | e36353df0d1c648a4e7eac3fe5931c0465ac6068 | |
| parent | ca56469cbb3ebf77dba433da9b23698ff5138a3d (diff) | |
Moved resource files.
| -rw-r--r-- | application.cpp | 10 | ||||
| -rw-r--r-- | fonts/VeraMono.ttf (renamed from VeraMono.ttf) | bin | 49224 -> 49224 bytes | |||
| -rw-r--r-- | foo.png | bin | 1435 -> 0 bytes | |||
| -rw-r--r-- | foo2.png | bin | 1024 -> 0 bytes | |||
| -rw-r--r-- | shaders/bullet_fragment.glsl (renamed from bullet_fragment.glsl) | 0 | ||||
| -rw-r--r-- | shaders/bullet_vertex.glsl (renamed from bullet_vertex.glsl) | 0 | ||||
| -rw-r--r-- | textures/background.png (renamed from background.png) | bin | 13359 -> 13359 bytes | |||
| -rw-r--r-- | textures/shot1.png (renamed from foo4.png) | bin | 5967 -> 5967 bytes |
8 files changed, 5 insertions, 5 deletions
diff --git a/application.cpp b/application.cpp index 87797b1..f7ddaae 100644 --- a/application.cpp +++ b/application.cpp @@ -141,10 +141,10 @@ void Application::run() { elapsed = 0; paused = false; - font = new FTPixmapFont("VeraMono.ttf"); + font = new FTPixmapFont("fonts/VeraMono.ttf"); font->FaceSize(12); - background = new TextureSDL("background.png"); - texture = new TextureSDL("foo4.png"); + background = new TextureSDL("textures/background.png"); + texture = new TextureSDL("textures/shot1.png"); shader = new GLShaderProgram(); patterns.push_back(new BulletPattern()); @@ -153,8 +153,8 @@ void Application::run() { } patterns.push_back(new BulletPattern2(9000)); - GLFragmentShader shader1("bullet_fragment.glsl"); - GLVertexShader shader2("bullet_vertex.glsl"); + GLFragmentShader shader1("shaders/bullet_fragment.glsl"); + GLVertexShader shader2("shaders/bullet_vertex.glsl"); shader->attach(shader1); shader->attach(shader2); shader->link(); diff --git a/VeraMono.ttf b/fonts/VeraMono.ttf Binary files differindex 139f0b4..139f0b4 100644 --- a/VeraMono.ttf +++ b/fonts/VeraMono.ttf diff --git a/foo.png b/foo.png Binary files differdeleted file mode 100644 index c87d1f1..0000000 --- a/foo.png +++ /dev/null diff --git a/foo2.png b/foo2.png Binary files differdeleted file mode 100644 index 7673659..0000000 --- a/foo2.png +++ /dev/null diff --git a/bullet_fragment.glsl b/shaders/bullet_fragment.glsl index 5e8becd..5e8becd 100644 --- a/bullet_fragment.glsl +++ b/shaders/bullet_fragment.glsl diff --git a/bullet_vertex.glsl b/shaders/bullet_vertex.glsl index 0843be2..0843be2 100644 --- a/bullet_vertex.glsl +++ b/shaders/bullet_vertex.glsl diff --git a/background.png b/textures/background.png Binary files differindex a97cc05..a97cc05 100644 --- a/background.png +++ b/textures/background.png diff --git a/foo4.png b/textures/shot1.png Binary files differindex 7c9b56f..7c9b56f 100644 --- a/foo4.png +++ b/textures/shot1.png |
