- Timestamp:
- 05/23/08 18:29:47 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp
r2702 r2703 835 835 swap(p->mDynamicObjects[idx], p->mDynamicObjects.back()); 836 836 p->mDynamicObjects.pop_back(); 837 /*if (mCurrentDynamicObjectIdx >= 0) { 838 preprocessor->ScheduleUpdateDynamicObjects(); 839 }*/ 837 //preprocessor->ScheduleUpdateDynamicObjects(); 840 838 } 841 839 } … … 1113 1111 mUseSpatialFilter = tmp; 1114 1112 1115 //mLogWriter = new LogWriter("myfile.out");1116 1117 1113 mShowRenderCost = false; 1118 1114 mShowPvsSizes = false; … … 1127 1123 mShowWeightedTriangles = false; 1128 1124 mShowDistribution = 15; 1129 mCurrentDynamicObjectIdx = -1;1130 1125 1131 1126 mSpatialFilterSize = 0.01; … … 1156 1151 connect(mControlWidget, SIGNAL(ComputeGVS(void)), this, SLOT(ComputeGVS(void))); 1157 1152 connect(mControlWidget, SIGNAL(ReplayViewPoints(void)), this, SLOT(ReplayViewPoints(void))); 1158 connect(mControlWidget, SIGNAL( LoadObject(void)), this, SLOT(LoadObject(void)));1153 connect(mControlWidget, SIGNAL(NextObject(void)), this, SLOT(NextObject(void))); 1159 1154 1160 1155 connect(mControlWidget, SIGNAL(SetSceneCut(int)), this, SLOT(SetSceneCut(int))); … … 1215 1210 1216 1211 mControlWidget->show(); 1212 1213 LoadObjects(); 1217 1214 } 1218 1215 … … 1266 1263 1267 1264 1268 void QtGlRendererWidget::LoadObject() 1269 { 1270 string filename("../data/teapot.bn"); 1271 //string filename("../data/cube.obj"); 1272 1273 cout << "Loading model << " << filename << endl; 1274 1275 ++ mCurrentDynamicObjectIdx; 1265 void QtGlRendererWidget::LoadObjects() 1266 { 1267 LoadObject("../data/teapot.bn"); 1268 LoadObject("../data/bunny.bn"); 1269 LoadObject("../data/horse.bn"); 1270 } 1271 1272 1273 void QtGlRendererWidget::NextObject() 1274 { 1275 cout << "*********\n**** next object!!!!!!!!!!!! " << endl; 1276 mPlacer->NextObject(); 1277 } 1278 1279 1280 void QtGlRendererWidget::LoadObject(const string &filename) 1281 { 1282 cout << "Loading model " << filename << endl; 1276 1283 1277 1284 SceneGraphLeaf *leaf = … … 1286 1293 cerr << "Loading failed" << endl; 1287 1294 1288 updateGL();1295 //updateGL(); 1289 1296 } 1290 1297 … … 2378 2385 button = new QPushButton("Load object", vbox); 2379 2386 vbox->layout()->addWidget(button); 2380 connect(button, SIGNAL(clicked()), SIGNAL(LoadObject())); 2387 connect(button, SIGNAL(clicked()), SIGNAL(NextObject())); 2388 //connect(button, SIGNAL(clicked()), SIGNAL(LoadObject())); 2381 2389 2382 2390 /*cb = new QCheckBox("Stats", vbox);
Note: See TracChangeset
for help on using the changeset viewer.