OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revision567 (tree)
Time2022-03-13 19:38:17
Authorhgtterry

Log Message

Equity_ME 130322 Top Bar Class

Change Summary

Incremental Difference

--- Equity_ME/Equity_ME/Base_Group.cpp (revision 566)
+++ Equity_ME/Equity_ME/Base_Group.cpp (revision 567)
@@ -4,6 +4,8 @@
44
55 Base_Group::Base_Group()
66 {
7+ GroupName[0] = 0;
8+ MaterialName[0] = 0;
79 }
810
911
--- Equity_ME/Equity_ME/Base_Group.h (revision 566)
+++ Equity_ME/Equity_ME/Base_Group.h (revision 567)
@@ -4,5 +4,8 @@
44 public:
55 Base_Group();
66 ~Base_Group();
7+
8+ char GroupName[255];
9+ char MaterialName[255];
710 };
811
--- Equity_ME/Equity_ME/ME_App.cpp (revision 566)
+++ Equity_ME/Equity_ME/ME_App.cpp (revision 567)
@@ -35,6 +35,7 @@
3535 CL_Import = nullptr;
3636 CL_FileIO = nullptr;
3737 CL_Model = nullptr;
38+ CL_TopBar = nullptr;
3839
3940 hInst = nullptr;
4041
@@ -65,6 +66,7 @@
6566 CL_Import = new ME_Import();
6667 CL_FileIO = new ME_FileIO();
6768 CL_Model = new ME_Model();
69+ CL_TopBar = new ME_TopBar();
6870
6971 SetBrushes_Fonts();
7072 return 1;
--- Equity_ME/Equity_ME/ME_App.h (revision 566)
+++ Equity_ME/Equity_ME/ME_App.h (revision 567)
@@ -31,6 +31,7 @@
3131 #include "ME_Import.h"
3232 #include "ME_FileIO.h"
3333 #include "ME_Model.h"
34+#include "ME_TopBar.h"
3435
3536 class ME_App
3637 {
@@ -46,7 +47,7 @@
4647 ME_Import* CL_Import; // Importer Class [050322]
4748 ME_FileIO* CL_FileIO; // Windows Open/Save Routines [050322]
4849 ME_Model* CL_Model; // Main Model Class [050322]
49-
50+ ME_TopBar* CL_TopBar; // Top Bar and Tabs [1350322]
5051 bool InitApp(void);
5152 bool SetMainWin_Centre(void);
5253
--- Equity_ME/Equity_ME/ME_Assimp.cpp (revision 566)
+++ Equity_ME/Equity_ME/ME_Assimp.cpp (revision 567)
@@ -149,28 +149,28 @@
149149 {
150150 aiMesh* mesh = pScene->mMeshes[Count];
151151
152- App->CL_Vm_Model->Create_S_MeshGroup(Count);
152+ App->CL_Model->Group[Count] = new Base_Group();
153153
154154 _itoa(Count, GroupNum, 10);
155155 strcpy(GroupName, "Group_");
156156 strcat(GroupName, GroupNum);
157- strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->GroupName, GroupName);
157+ strcpy(App->CL_Model->Group[Count]->GroupName, GroupName);
158158
159159 strcpy(MaterialName, "Material_");
160160 strcat(MaterialName, GroupNum);
161- strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->MaterialName, MaterialName);
161+ strcpy(App->CL_Model->Group[Count]->MaterialName, MaterialName);
162162
163163 ////---------------
164164
165- App->CL_Vm_Model->S_MeshGroup[Count]->GroupVertCount = 0;
166- App->CL_Vm_Model->S_MeshGroup[Count]->MaterialIndex = -1;
165+ //App->CL_Vm_Model->S_MeshGroup[Count]->GroupVertCount = 0;
166+ //App->CL_Vm_Model->S_MeshGroup[Count]->MaterialIndex = -1;
167167
168- App->CL_Vm_Model->S_MeshGroup[Count]->MaterialIndex = Count;//= mesh->mMaterialIndex;
168+ //App->CL_Vm_Model->S_MeshGroup[Count]->MaterialIndex = Count;//= mesh->mMaterialIndex;
169169
170- strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, "No_Texture");
170+ //strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, "No_Texture");
171171
172- App->CL_Vm_Model->S_MeshGroup[Count]->HasBones = mesh->HasBones();
173- App->CL_Vm_Model->S_MeshGroup[Count]->BoneCount = mesh->mNumBones;
172+ //App->CL_Vm_Model->S_MeshGroup[Count]->HasBones = mesh->HasBones();
173+ //App->CL_Vm_Model->S_MeshGroup[Count]->BoneCount = mesh->mNumBones;
174174
175175 /*if (App->S_MeshGroup[Count]->HasBones == 1)
176176 {
@@ -178,17 +178,17 @@
178178 }*/
179179
180180 // Get Texture Path/Name
181- aiString texPath;
182- aiMaterial* mtl = pScene->mMaterials[mesh->mMaterialIndex];
183- if (AI_SUCCESS == mtl->GetTexture(aiTextureType_DIFFUSE, 0, &texPath))
184- {
185- strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, texPath.C_Str());
186- }
187- else
188- {
189- strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, "No_Texture");
190- //App->CL_Model_Data->S_MeshGroup[Count]->MaterialIndex = -1;
191- }
181+ //aiString texPath;
182+ //aiMaterial* mtl = pScene->mMaterials[mesh->mMaterialIndex];
183+ //if (AI_SUCCESS == mtl->GetTexture(aiTextureType_DIFFUSE, 0, &texPath))
184+ //{
185+ // strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, texPath.C_Str());
186+ //}
187+ //else
188+ //{
189+ // strcpy(App->CL_Vm_Model->S_MeshGroup[Count]->Text_FileName, "No_Texture");
190+ // //App->CL_Model_Data->S_MeshGroup[Count]->MaterialIndex = -1;
191+ //}
192192
193193 Count++;
194194 }
--- Equity_ME/Equity_ME/ME_Model.h (revision 566)
+++ Equity_ME/Equity_ME/ME_Model.h (revision 567)
@@ -22,6 +22,9 @@
2222 */
2323
2424 #pragma once
25+
26+#include "Base_Group.h"
27+
2528 class ME_Model
2629 {
2730 public:
@@ -28,6 +31,8 @@
2831 ME_Model();
2932 ~ME_Model();
3033
34+ Base_Group* Group[100];
35+
3136 void Set_Groupt_Count(int Count);
3237 int Get_Groupt_Count();
3338
--- Equity_ME/Equity_ME/ME_TopBar.cpp (nonexistent)
+++ Equity_ME/Equity_ME/ME_TopBar.cpp (revision 567)
@@ -0,0 +1,36 @@
1+/*
2+Copyright (c) 2022 Equity_ME Model Editor -- Inflanite Software W.T.Flanigan H.C.Flanigan
3+
4+This software is provided 'as-is', without any express or implied
5+warranty. In no event will the authors be held liable for any damages
6+arising from the use of this software.
7+
8+Permission is granted to anyone to use this software for any purpose,
9+including commercial applications, and to alter it and redistribute it
10+freely, subject to the following restrictions:
11+
12+1. The origin of this software must not be misrepresented; you must not
13+claim that you wrote the original software. If you use this software
14+in a product, an acknowledgment in the product documentation would be
15+appreciated but is not required.
16+
17+2. Altered source versions must be plainly marked as such, and must not be
18+misrepresented as being the original software.
19+
20+3. This notice may not be removed or altered from any source
21+distribution.
22+*/
23+
24+#include "stdafx.h"
25+#include "ME_App.h"
26+#include "ME_TopBar.h"
27+
28+
29+ME_TopBar::ME_TopBar()
30+{
31+}
32+
33+
34+ME_TopBar::~ME_TopBar()
35+{
36+}
--- Equity_ME/Equity_ME/ME_TopBar.h (nonexistent)
+++ Equity_ME/Equity_ME/ME_TopBar.h (revision 567)
@@ -0,0 +1,31 @@
1+/*
2+Copyright (c) 2022 Equity_ME Model Editor -- Inflanite Software W.T.Flanigan H.C.Flanigan
3+
4+This software is provided 'as-is', without any express or implied
5+warranty. In no event will the authors be held liable for any damages
6+arising from the use of this software.
7+
8+Permission is granted to anyone to use this software for any purpose,
9+including commercial applications, and to alter it and redistribute it
10+freely, subject to the following restrictions:
11+
12+1. The origin of this software must not be misrepresented; you must not
13+claim that you wrote the original software. If you use this software
14+in a product, an acknowledgment in the product documentation would be
15+appreciated but is not required.
16+
17+2. Altered source versions must be plainly marked as such, and must not be
18+misrepresented as being the original software.
19+
20+3. This notice may not be removed or altered from any source
21+distribution.
22+*/
23+
24+#pragma once
25+class ME_TopBar
26+{
27+public:
28+ ME_TopBar();
29+ ~ME_TopBar();
30+};
31+
Show on old repository browser