diff --git a/MshViewer/main.cpp b/MshViewer/main.cpp index e2828374a89405eca08df682552bb8c71561db2f..1dbf1f165999f3064c04871b3d40230fb3e755be 100644 --- a/MshViewer/main.cpp +++ b/MshViewer/main.cpp @@ -38,7 +38,7 @@ int main(int argc, char** argv) openGL: - scene->loadMsh("..\\Release\\Msh\\houseWOnull.msh"); + scene->loadMsh("..\\Release\\Msh\\multipleModels.msh"); do { scene->updateScene(); diff --git a/Release/MshViewer.exe b/Release/MshViewer.exe index 22943e79ccfb82fd4a8cd5fd7481a7ab629d5aa5..705beaa167bc35cd56f0c2f5776c783e0f851ce0 100644 Binary files a/Release/MshViewer.exe and b/Release/MshViewer.exe differ diff --git a/Release/Shader/FragmentTextureShader.mv2shdr b/Release/Shader/TextureShader.frag similarity index 100% rename from Release/Shader/FragmentTextureShader.mv2shdr rename to Release/Shader/TextureShader.frag diff --git a/Release/Shader/VertexTextureShader.mv2shdr b/Release/Shader/TextureShader.vert similarity index 86% rename from Release/Shader/VertexTextureShader.mv2shdr rename to Release/Shader/TextureShader.vert index 5776ae83128c5e0791ee877fe3a933a69a106152..739ced016af5cedb63c67d050f05ca2e2db4fe4e 100644 --- a/Release/Shader/VertexTextureShader.mv2shdr +++ b/Release/Shader/TextureShader.vert @@ -13,7 +13,7 @@ uniform mat4 MVP; void main(){ // Output position of the vertex, in clip space : MVP * position - gl_Position = MVP * vec4(vertexPosition_modelspace,1); + gl_Position = MVP * vec4(vertexPosition_modelspace, 1); UV = vertexUV;