• R/O
  • SSH
  • HTTPS

gdx64: Commit


Commit MetaInfo

Revision265 (tree)
Time2020-01-13 23:50:15
Authorhgtterry

Log Message

Basic Shapes 1.9 Textures 130120

Change Summary

Incremental Difference

--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Assimp.cpp (revision 264)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Assimp.cpp (revision 265)
@@ -88,7 +88,7 @@
8888 }
8989 /// else
9090 {
91- ///LoadTextures();
91+ LoadTextures();
9292 }
9393
9494 /// App->Cl_Model->Create_BondingBox_Model();
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_ImGui.cpp (revision 264)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_ImGui.cpp (revision 265)
@@ -109,34 +109,38 @@
109109 if (StartPos2 == 0)
110110 {
111111 ImGui::SetWindowPos("Model Data", ImVec2(400, 200));
112- ImGui::SetWindowSize(ImVec2(350, 90));
112+ ImGui::SetWindowSize(ImVec2(350, 190));
113113 StartPos2 = 1;
114114 }
115115
116- ImGui::Spacing();
117- //ImGui::Text("Path and File Name:- %s", App->Cl_Model->Path_FileName);
118- ImGui::Text("Model Folder:- %s", App->Cl_Model->Model_FullPath);
119- ImGui::Text("Textures Path:- %s", App->Cl_Model->Texture_FolderPath);
120- ImGui::Text("File Name:- %s", App->Cl_Model->FileName);
121- ImGui::Text("Just Name:- %s", App->Cl_Model->JustName);
122- ImGui::Spacing();
123- ImGui::Separator();
116+ ImGui::Text("Path and File Name:- %s", App->Cl_Model->Path_FileName);
124117
125- //------------------
126- ImGui::Spacing();
127- ImGui::Text("Has Mesh:- %i", App->Cl_Model->HasMesh);
128- ImGui::Text("Has Motions:- %i", App->Cl_Model->HasMotions);
118+ if (ImGui::CollapsingHeader("Details"))
119+ {
120+ ImGui::Spacing();
121+ ImGui::Text("Model Folder:- %s", App->Cl_Model->Model_FullPath);
122+ ImGui::Text("Textures Path:- %s", App->Cl_Model->Texture_FolderPath);
123+ ImGui::Text("File Name:- %s", App->Cl_Model->FileName);
124+ ImGui::Text("Just Name:- %s", App->Cl_Model->JustName);
125+ ImGui::Spacing();
126+ ImGui::Separator();
129127
130- ImGui::Text("Group Count:- %i", App->Cl_Model->GroupCount);
131- ImGui::Text("Texture Count:- %i", App->Cl_Model->TextureCount);
132- ImGui::Text("Motion Count:- %i", App->Cl_Model->MotionCount);
133- ImGui::Separator();
134- //------------------
135- ImGui::Spacing();
136- ImGui::Text("Vertice Count:- %i", App->Cl_Model->VertCount);
137- ImGui::Text("Face Count:- %i", App->Cl_Model->FaceCount);
138- ImGui::Separator();
128+ //------------------
129+ ImGui::Spacing();
130+ ImGui::Text("Has Mesh:- %i", App->Cl_Model->HasMesh);
131+ ImGui::Text("Has Motions:- %i", App->Cl_Model->HasMotions);
139132
133+ ImGui::Text("Group Count:- %i", App->Cl_Model->GroupCount);
134+ ImGui::Text("Texture Count:- %i", App->Cl_Model->TextureCount);
135+ ImGui::Text("Motion Count:- %i", App->Cl_Model->MotionCount);
136+ ImGui::Separator();
137+ //------------------
138+ ImGui::Spacing();
139+ ImGui::Text("Vertice Count:- %i", App->Cl_Model->VertCount);
140+ ImGui::Text("Face Count:- %i", App->Cl_Model->FaceCount);
141+ ImGui::Separator();
142+ }
143+
140144 //------------------
141145 if (ImGui::CollapsingHeader("Textures"))
142146 {
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Importer.cpp (revision 264)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Importer.cpp (revision 265)
@@ -229,6 +229,8 @@
229229 return 0;
230230 }
231231
232+ App->Cl_Right_Groups->Update_Dialog(0);
233+
232234 /// App->Cl_ToOgre->Init_Model();
233235
234236 /*App->CL_Model_Data->Model_Type = LoadedFile_Assimp;
Show on old repository browser