added shaders to data folder. split data folder into textures and sha…

…ders.
R-Rudolph · Oct 17, 2014 · 0ec3740 · 0ec3740
1 parent 0fecd16
commit 0ec3740
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 8 deletions.
diff --git a/MovingCube.cpp b/MovingCube.cpp
@@ -271,7 +271,7 @@ void init_MovingCubes()
 
   cubes_M_att_coord=new Attribute_vbo(*new VertexBufferObject(coords,3,sizeof(coords)),"coord3d",*simpleProgram);
   cubes_M_att_texcoord=new Attribute_vbo(*new VertexBufferObject(texcoords,2,sizeof(texcoords)),"tex_coord",*simpleProgram);
-  cubes_M_att_texture=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "ip.png"), GL_TEXTURE0, "texture", *simpleProgram);
+  cubes_M_att_texture=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "textures/ip.png"), GL_TEXTURE0, "texture", *simpleProgram);
   cubes_M_elems = new glElement(elems,sizeof(elems));
   cubes_M_att_coord->enable();
   cubes_M_att_texcoord->enable();

diff --git a/MovingCube.hpp b/MovingCube.hpp
@@ -6,7 +6,7 @@
 #include "sniffer.hpp"
 #include "gframework/graphicsframework.hpp"
 #include "NetworkEntities.hpp"
-#include "Ressources.hpp"
+#include "resources.hpp"
 
 class MovingCube
 {

diff --git a/NetworkEntities.cpp b/NetworkEntities.cpp
@@ -237,9 +237,9 @@ void networkEntityLoadData()
     };
   netent_M_att_coord=new Attribute_vbo(*new VertexBufferObject(coords,3,sizeof(coords)),"coord3d",*simpleProgram);
   netent_M_att_texcoord=new Attribute_vbo(*new VertexBufferObject(texcoords,2,sizeof(texcoords)),"tex_coord",*simpleProgram);
-  netent_M_att_texture=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "netentitity.png"), GL_TEXTURE0, "texture", *simpleProgram);
-  netent_M_att_texture_sink=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "local.png"), GL_TEXTURE0, "texture", *simpleProgram);
-  netent_M_att_texture_external=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "external.png"), GL_TEXTURE0, "texture", *simpleProgram);
+  netent_M_att_texture=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "textures/netentitity.png"), GL_TEXTURE0, "texture", *simpleProgram);
+  netent_M_att_texture_sink=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "textures/local.png"), GL_TEXTURE0, "texture", *simpleProgram);
+  netent_M_att_texture_external=new Attribute_texture(*new Texture(NETWORK_VISUALIZER_RESSOURCE_PATH "textures/external.png"), GL_TEXTURE0, "texture", *simpleProgram);
   netent_M_elems = new glElement(elems,sizeof(elems));
 }
 
diff --git a/NetworkEntities.hpp b/NetworkEntities.hpp
@@ -7,7 +7,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>	
 #include "gframework/graphicsframework.hpp"
-#include "Ressources.hpp"
+#include "resources.hpp"
 
 class NetworkEntity
 {

diff --git a/shader/simple.fs.c → data/shader/simple.fs.c b/shader/simple.fs.c → data/shader/simple.fs.c
diff --git a/shader/simple.vs.c → data/shader/simple.vs.c b/shader/simple.vs.c → data/shader/simple.vs.c
diff --git a/data/external.png → data/textures/external.png b/data/external.png → data/textures/external.png
diff --git a/data/ip.png → data/textures/ip.png b/data/ip.png → data/textures/ip.png
diff --git a/data/local.png → data/textures/local.png b/data/local.png → data/textures/local.png
diff --git a/data/netentitity.png → data/textures/netentitity.png b/data/netentitity.png → data/textures/netentitity.png
diff --git a/main.cpp b/main.cpp
@@ -84,8 +84,8 @@ void updateCam()
 
 int init_resources()
 {
-  simpleVS= new Shader("shader/simple.vs.c",GL_VERTEX_SHADER);
-  simpleFS= new Shader("shader/simple.fs.c",GL_FRAGMENT_SHADER);
+  simpleVS= new Shader(NETWORK_VISUALIZER_RESSOURCE_PATH "shader/simple.vs.c",GL_VERTEX_SHADER);
+  simpleFS= new Shader(NETWORK_VISUALIZER_RESSOURCE_PATH "shader/simple.fs.c",GL_FRAGMENT_SHADER);
   simpleProgram = new SProgram(*simpleVS,*simpleFS);
   uniform_proj=uniform_init("proj",*simpleProgram);
   uniform_pos=uniform_init("obj_pos",*simpleProgram);

diff --git a/Ressources.hpp → resources.hpp b/Ressources.hpp → resources.hpp