• R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revision650 (tree)
Time2022-07-05 00:40:51
Authorhgtterry

Log Message

Equity_ME 040722 Blender

Change Summary

Incremental Difference

--- Equity_ME/Equity_ME/Equity_ME.cpp (revision 649)
+++ Equity_ME/Equity_ME/Equity_ME.cpp (revision 650)
@@ -242,6 +242,12 @@
242242 return 1;
243243 }
244244
245+ case ID_IMPORT_BLENDERBLEND:
246+ {
247+ App->CL_Import->Assimp_Loader("Blender *.blend\0*.blend\0", "Blender");
248+ return 1;
249+ }
250+
245251 // ------------------------------------------------------- Export
246252 case ID_EXPORT_WAVEFRONTOBJ:
247253 {
--- Equity_ME/Equity_ME/ME_FileView.cpp (revision 649)
+++ Equity_ME/Equity_ME/ME_FileView.cpp (revision 650)
@@ -175,7 +175,7 @@
175175 tvinsert.hParent = GD_ProjectFolder;
176176 tvinsert.hInsertAfter = TVI_LAST;
177177 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;
179179 tvinsert.item.iImage = 2;
180180 tvinsert.item.iSelectedImage = 3;
181181 GD_ModelFolder = (HTREEITEM)SendDlgItemMessage(App->ListPanel, IDC_TREE1, TVM_INSERTITEM, 0, (LPARAM)&tvinsert);
@@ -300,3 +300,17 @@
300300 MoreFoldersD(); // Folders under root
301301 ExpandRoot();
302302 }
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+}
--- Equity_ME/Equity_ME/ME_FileView.h (revision 649)
+++ Equity_ME/Equity_ME/ME_FileView.h (revision 650)
@@ -13,6 +13,7 @@
1313 void Get_Selection(LPNMHDR lParam);
1414 void SelectItem(HTREEITEM TreeItem);
1515 void Delete_AllItems();
16+ void Change_Level_Name(void);
1617
1718 HTREEITEM Add_Group(char *SFileName, int Index);
1819
--- Equity_ME/Equity_ME/ME_Import.cpp (revision 649)
+++ Equity_ME/Equity_ME/ME_Import.cpp (revision 650)
@@ -77,6 +77,8 @@
7777 ////Set_Equity();
7878 Ogre::Root::getSingletonPtr()->renderOneFrame();
7979
80+ App->CL_FileView->Change_Level_Name();
81+
8082 App->Say_Win("Model Loaded");
8183
8284 return 1;
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Show on old repository browser