diff --git a/MshViewer/main.cpp b/MshViewer/main.cpp index 1dbf1f1..6062a71 100644 --- a/MshViewer/main.cpp +++ b/MshViewer/main.cpp @@ -20,25 +20,7 @@ int main(int argc, char** argv) else scene = OpenGLController::getInstance(); - - goto openGL; - - try { - Object obj("..\\Release\\Msh\\cubeTex.msh"); - } - catch (std::invalid_argument e) - { - std::cout << e.what() << std::endl; - } - - system("pause"); - - - return 0; - -openGL: - - scene->loadMsh("..\\Release\\Msh\\multipleModels.msh"); + scene->loadMsh("..\\Release\\Msh\\multiModTex.msh"); do { scene->updateScene(); diff --git a/Release/Msh/128x128Braun.tga b/Release/Msh/128x128Braun.tga new file mode 100644 index 0000000..8acefbf Binary files /dev/null and b/Release/Msh/128x128Braun.tga differ diff --git a/Release/Msh/128x128Grau.tga b/Release/Msh/128x128Grau.tga new file mode 100644 index 0000000..0c3096a Binary files /dev/null and b/Release/Msh/128x128Grau.tga differ diff --git a/Release/Msh/128x128Gruen.tga b/Release/Msh/128x128Gruen.tga new file mode 100644 index 0000000..73b9f4b Binary files /dev/null and b/Release/Msh/128x128Gruen.tga differ diff --git a/Release/Msh/128x128Rot.tga b/Release/Msh/128x128Rot.tga new file mode 100644 index 0000000..12f6cb9 Binary files /dev/null and b/Release/Msh/128x128Rot.tga differ diff --git a/Release/Msh/multiModTex.msh b/Release/Msh/multiModTex.msh new file mode 100644 index 0000000..32e70dc Binary files /dev/null and b/Release/Msh/multiModTex.msh differ