Move assets into assets/ directory

diff --git a/assets/TexturesCom_MetalGalvanized0045_1_seamless_S.tga b/assets/TexturesCom_MetalGalvanized0045_1_seamless_S.tga
new file mode 100644 (file)
index 0000000..5520e55
Binary files /dev/null and b/assets/TexturesCom_MetalGalvanized0045_1_seamless_S.tga differ

diff --git a/assets/level01.tga b/assets/level01.tga
new file mode 100644 (file)
index 0000000..a86d22e
Binary files /dev/null and b/assets/level01.tga differ

diff --git a/assets/playercharacter.3ds b/assets/playercharacter.3ds
new file mode 100644 (file)
index 0000000..9694b79
Binary files /dev/null and b/assets/playercharacter.3ds differ

diff --git a/assets/wall01.3ds b/assets/wall01.3ds
new file mode 100644 (file)
index 0000000..1b728af
Binary files /dev/null and b/assets/wall01.3ds differ

diff --git a/assets/wall01side.tga b/assets/wall01side.tga
new file mode 100644 (file)
index 0000000..9132f17
Binary files /dev/null and b/assets/wall01side.tga differ

diff --git a/level.c b/level.c
index 31be493b2bd979f8d668f306a0499aa62b9fbef2..0917319801ec62f309d12ac5ef08f96502c84da6 100644 (file)
--- a/level.c
+++ b/level.c
@@ -29,7 +29,7 @@ static const char* replaceFileExtension(const AiString path, const char* ext);
 
 
 void initLevel() {
-       const AiScene* sceneData = importScene("out/assets/wall01.3ds");
+       const AiScene* sceneData = importScene("assets/wall01.3ds");
        blockWall01.sceneData = sceneData;
        if (sceneData != NULL) {
                const unsigned int numTextures = sceneData->mNumMeshes;
@@ -49,8 +49,8 @@ void initLevel() {
                                                 NULL, NULL, NULL, NULL, NULL, NULL) == AI_SUCCESS) {
                                const char* textureFile = replaceFileExtension(originalTexturePath, ".tga");
                                size_t textureFileLength = strlen(textureFile);
-                               char* texturePath = malloc(strlen("out/assets/") + textureFileLength + 1);
-                               strcpy(texturePath, "out/assets/");
+                               char* texturePath = malloc(strlen("assets/") + textureFileLength + 1);
+                               strcpy(texturePath, "assets/");
                                strncat(texturePath, textureFile, textureFileLength);
                                TgaImage* textureImage = readTga(texturePath);
                                if (textureImage == NULL) {
@@ -74,7 +74,7 @@ void initLevel() {
                glBindTexture(GL_TEXTURE_2D, 0);
        }
        
-       buildLevelFromImage(readTga("out/assets/level01.tga"));
+       buildLevelFromImage(readTga("assets/level01.tga"));
 }
 
 void buildLevelFromImage(TgaImage* image) {

diff --git a/player.c b/player.c
index dfe41f3e12116cd345b8483ec3b40175de9494a0..c06a05d982e6c906985442fca7675698010cab48 100644 (file)
--- a/player.c
+++ b/player.c
@@ -11,7 +11,7 @@ static AiVector3D playerPos;
 
 
 void initPlayer() {
-       playerCharacter.sceneData = importScene("out/assets/playercharacter.3ds");
+       playerCharacter.sceneData = importScene("assets/playercharacter.3ds");
        // TODO import textures
 }