OSDN Git Service
(root)
/
qtgeoviewer
/
QtGeoViewer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OBJ読み込み処理速度改善
[qtgeoviewer/QtGeoViewer.git]
/
Src
/
LibQtGeoViewerCore
/
Format
/
Obj
/
ObjMesh.cpp
diff --git
a/Src/LibQtGeoViewerCore/Format/Obj/ObjMesh.cpp
b/Src/LibQtGeoViewerCore/Format/Obj/ObjMesh.cpp
index
7a550ef
..
e1f9c05
100644
(file)
--- a/
Src/LibQtGeoViewerCore/Format/Obj/ObjMesh.cpp
+++ b/
Src/LibQtGeoViewerCore/Format/Obj/ObjMesh.cpp
@@
-148,14
+148,14
@@
const std::vector<ObjMaterial>* ObjMesh::GetPrimaryMaterials(void) const
void ObjMesh::CopyVerts(BaseMesh& o_mesh) const
{
void ObjMesh::CopyVerts(BaseMesh& o_mesh) const
{
- o_mesh.m_Verts = m_
Position
s;
+ o_mesh.m_Verts = m_
Vert
s;
o_mesh.m_Normals = m_Normals;
o_mesh.m_UVs = m_UVs;
}
void ObjMesh::SwapVerts(BaseMesh& o_mesh)
{
o_mesh.m_Normals = m_Normals;
o_mesh.m_UVs = m_UVs;
}
void ObjMesh::SwapVerts(BaseMesh& o_mesh)
{
- o_mesh.m_Verts.swap(m_
Position
s);
+ o_mesh.m_Verts.swap(m_
Vert
s);
o_mesh.m_Normals.swap(m_Normals);
o_mesh.m_UVs.swap(m_UVs);
}
o_mesh.m_Normals.swap(m_Normals);
o_mesh.m_UVs.swap(m_UVs);
}