mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 16:02:50 +02:00
Code Issues Projects Releases Wiki Activity

Start to abstract model

Browse Source
This commit is contained in:
Will
2013-12-05 16:17:41 +01:00
parent bf1c7df8bb
commit 6afadafa1e
22 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/g3d_viewer/main.cpp
View File

@@ -1280,9 +1280,8 @@ void MainWindow::loadModel(string path) {
if(timer) timer->Stop();
delete model;
Model *tmpModel= new ModelGl();
if(renderer) renderer->loadTheModel(tmpModel, modelPath);
model= tmpModel;
model = NULL;
model = renderer? renderer->newModel(rsGlobal, modelPath): NULL;
statusbarText = getModelInfo();
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0) + " anim value: " + floatToStr(anim) + " zoom: " + floatToStr(zoom) + " rotX: " + floatToStr(rotX) + " rotY: " + floatToStr(rotY);