From 0fd3a7f9c8e7f98cdf06ed8d9e31de91c9e2e8bb Mon Sep 17 00:00:00 2001 From: Anakin Date: Tue, 8 Nov 2016 10:25:10 +0100 Subject: [PATCH] next step: draw each model with it's own texture, added new example mesh --- MshViewer/main.cpp | 20 +------------------- Release/Msh/128x128Braun.tga | Bin 0 -> 49196 bytes Release/Msh/128x128Grau.tga | Bin 0 -> 49196 bytes Release/Msh/128x128Gruen.tga | Bin 0 -> 49196 bytes Release/Msh/128x128Rot.tga | Bin 0 -> 49196 bytes Release/Msh/multiModTex.msh | Bin 0 -> 9140 bytes 6 files changed, 1 insertion(+), 19 deletions(-) create mode 100644 Release/Msh/128x128Braun.tga create mode 100644 Release/Msh/128x128Grau.tga create mode 100644 Release/Msh/128x128Gruen.tga create mode 100644 Release/Msh/128x128Rot.tga create mode 100644 Release/Msh/multiModTex.msh 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 0000000000000000000000000000000000000000..8acefbf2fcd8c773aec4b415536035b7c861a49d GIT binary patch literal 49196 zcmeIuO9_Bb07b!zDJ-EIGblU|1%H^p97cB`W^glylVFl6Uw7`*Nq3n50RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5*BFOauw Q+54lcWuBUIC}ZE|0WeKSKmY&$ literal 0 HcmV?d00001 diff --git a/Release/Msh/128x128Grau.tga b/Release/Msh/128x128Grau.tga new file mode 100644 index 0000000000000000000000000000000000000000..0c3096a7c368d062d1fd34d58815ae9b189defe1 GIT binary patch literal 49196 zcmeIuy9tC)07b!zRoH}fq3}Rf@Q3AC$p!}2X`(fl%;8ipNtL%FN9vr{-vkH{AV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK;UzM SJT24OZDlUwui5)DbZu_7kc}Mx literal 0 HcmV?d00001 diff --git a/Release/Msh/128x128Gruen.tga b/Release/Msh/128x128Gruen.tga new file mode 100644 index 0000000000000000000000000000000000000000..73b9f4b72ef1c44dcfd9403da8d52d9f1220f841 GIT binary patch literal 49196 zcmeIuO9_Qg07cQGU$L>&ERBhc7m1EdAo9@O>}LSYbdE{9!nonW-s)Ie4f?U;0`RO?=g;(LU!g0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly@B@K( R+m^i?x#m1|=a6IR;|4I|$j1Nx literal 0 HcmV?d00001 diff --git a/Release/Msh/multiModTex.msh b/Release/Msh/multiModTex.msh new file mode 100644 index 0000000000000000000000000000000000000000..32e70dca54a9ff08ca5297fc34b0223b933a4e94 GIT binary patch literal 9140 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 a6rgWWS_+=;i_q_l#;LumI-7r{6#oOB8+i%< literal 0 HcmV?d00001