A2_2

ranveeraggarwal · Oct 24, 2014 · 9fb88c2 · 9fb88c2
1 parent 408e1b7
commit 9fb88c2
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 #TRANSFORMER
-The report for this bot can be found at http://www.cse.iitb.ac.in/~ranveer/graphics_2_1/
+The report for this bot can be found at http://www.cse.iitb.ac.in/~ranveer/graphics_2_2/
 
 ##Movements
 The components of the transformer's body are mapped to keys. Pressing one of these keys will activate the corresponding component.

diff --git a/gl_framework.cpp b/gl_framework.cpp
@@ -6,58 +6,58 @@ int LoadGLTextures()
     /* load an image file directly as a new OpenGL texture */
     texture[0] = SOIL_load_OGL_texture
         (
-        "texture0.jpg",
+        "textures/texture0.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
 
     texture[1] = SOIL_load_OGL_texture
         (
-        "texture1.jpg",
+        "textures/texture1.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
 
     texture[2] = SOIL_load_OGL_texture
         (
-        "texture_ground.jpg",
+        "textures/texture_ground.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
     texture[3] = SOIL_load_OGL_texture
         (
-        "texture_night.jpg",
+        "textures/texture_night.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
     texture[4] = SOIL_load_OGL_texture
         (
-        "texture_sea.jpg",
+        "textures/texture_sea.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
     texture[5] = SOIL_load_OGL_texture
         (
-        "night.jpg",
+        "textures/night.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
     texture[6] = SOIL_load_OGL_texture
         (
-        "cmap.png",
+        "textures/cmap.png",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y
         );
     texture[7] = SOIL_load_OGL_texture
         (
-        "tyre.jpg",
+        "textures/tyre.jpg",
         SOIL_LOAD_AUTO,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_INVERT_Y

diff --git a/cmap.png → textures/cmap.png b/cmap.png → textures/cmap.png
diff --git a/night.jpg → textures/night.jpg b/night.jpg → textures/night.jpg
diff --git a/panorama.jpg → textures/panorama.jpg b/panorama.jpg → textures/panorama.jpg
diff --git a/skybox.jpg → textures/skybox.jpg b/skybox.jpg → textures/skybox.jpg
diff --git a/texture0.jpg → textures/texture0.jpg b/texture0.jpg → textures/texture0.jpg
diff --git a/texture1.jpg → textures/texture1.jpg b/texture1.jpg → textures/texture1.jpg
diff --git a/texture_ground.jpg → textures/texture_ground.jpg b/texture_ground.jpg → textures/texture_ground.jpg
diff --git a/texture_night.jpg → textures/texture_night.jpg b/texture_night.jpg → textures/texture_night.jpg
diff --git a/texture_sea.jpg → textures/texture_sea.jpg b/texture_sea.jpg → textures/texture_sea.jpg
diff --git a/tyre.jpg → textures/tyre.jpg b/tyre.jpg → textures/tyre.jpg