Equity_ME 040722 Blender
Equity_ME/Equity_ME/Equity_ME.aps (diff)
Equity_ME/Equity_ME/Equity_ME.cpp (diff) Equity_ME/Equity_ME/Equity_ME.rc (diff) Equity_ME/Equity_ME/ME_FileView.cpp (diff)
Equity_ME/Equity_ME/ME_FileView.h (diff) Equity_ME/Equity_ME/ME_Import.cpp (diff) Equity_ME/Equity_ME/resource.h (diff)| @@ -242,6 +242,12 @@ | ||
| 242 | 242 | return 1; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | + case ID_IMPORT_BLENDERBLEND: | |
| 246 | + { | |
| 247 | + App->CL_Import->Assimp_Loader("Blender *.blend\0*.blend\0", "Blender"); | |
| 248 | + return 1; | |
| 249 | + } | |
| 250 | + | |
| 245 | 251 | // ------------------------------------------------------- Export |
| 246 | 252 | case ID_EXPORT_WAVEFRONTOBJ: |
| 247 | 253 | { |
| @@ -175,7 +175,7 @@ | ||
| 175 | 175 | tvinsert.hParent = GD_ProjectFolder; |
| 176 | 176 | tvinsert.hInsertAfter = TVI_LAST; |
| 177 | 177 | tvinsert.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE; |
| 178 | - tvinsert.item.pszText = "Test";// App->SBC_Project->Level_File_Name; | |
| 178 | + tvinsert.item.pszText = App->CL_Model->FileName; | |
| 179 | 179 | tvinsert.item.iImage = 2; |
| 180 | 180 | tvinsert.item.iSelectedImage = 3; |
| 181 | 181 | GD_ModelFolder = (HTREEITEM)SendDlgItemMessage(App->ListPanel, IDC_TREE1, TVM_INSERTITEM, 0, (LPARAM)&tvinsert); |
| @@ -300,3 +300,17 @@ | ||
| 300 | 300 | MoreFoldersD(); // Folders under root |
| 301 | 301 | ExpandRoot(); |
| 302 | 302 | } |
| 303 | + | |
| 304 | +// ************************************************************************* | |
| 305 | +// * Change_Level_Name Terry Bernie * | |
| 306 | +// ************************************************************************* | |
| 307 | +void ME_FileView::Change_Level_Name(void) | |
| 308 | +{ | |
| 309 | + TVITEM Sitem; | |
| 310 | + Sitem.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE; | |
| 311 | + Sitem.hItem = GD_ModelFolder; | |
| 312 | + Sitem.pszText = App->CL_Model->FileName; | |
| 313 | + Sitem.iImage = 3; | |
| 314 | + Sitem.iSelectedImage = 3; | |
| 315 | + SendDlgItemMessage(App->ListPanel, IDC_TREE1, TVM_SETITEM, 0, (LPARAM)(const LPTVITEM)&Sitem); | |
| 316 | +} |
| @@ -13,6 +13,7 @@ | ||
| 13 | 13 | void Get_Selection(LPNMHDR lParam); |
| 14 | 14 | void SelectItem(HTREEITEM TreeItem); |
| 15 | 15 | void Delete_AllItems(); |
| 16 | + void Change_Level_Name(void); | |
| 16 | 17 | |
| 17 | 18 | HTREEITEM Add_Group(char *SFileName, int Index); |
| 18 | 19 |
| @@ -77,6 +77,8 @@ | ||
| 77 | 77 | ////Set_Equity(); |
| 78 | 78 | Ogre::Root::getSingletonPtr()->renderOneFrame(); |
| 79 | 79 | |
| 80 | + App->CL_FileView->Change_Level_Name(); | |
| 81 | + | |
| 80 | 82 | App->Say_Win("Model Loaded"); |
| 81 | 83 | |
| 82 | 84 | return 1; |