PLY Loader.

captainys · Dec 9, 2024 · 6ed6656 · 6ed6656
1 parent ea5e265
commit 6ed6656
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 0 deletions.
diff --git a/src/ysgebl/src/kernel/ysshellext.cpp b/src/ysgebl/src/kernel/ysshellext.cpp
@@ -796,6 +796,27 @@ YSRESULT YsShellExt::SetVertexPosition(VertexHandle vtHd,const YsVec3 &pos)
 	return ModifyVertexPosition(vtHd,pos);
 }
 
+YSRESULT YsShellExt::SetVertexNormal(VertexHandle vtHd,const YsVec3 &nom)
+{
+	auto *vtx=YsShell::GetVertex(vtHd);
+	if(nullptr!=vtx)
+	{
+		vtx->SetNormal(nom);
+		return YSOK;
+	}
+	return YSERR;
+}
+
+YsVec3 YsShellExt::GetVertexNormal(VertexHandle vtHd) const
+{
+	auto *vtx=YsShell::GetVertex(vtHd);
+	if(nullptr!=vtx)
+	{
+		return vtx->GetNormal();
+	}
+	return YsVec3::Origin();
+}
+
 YSRESULT YsShellExt::SetVertexRoundFlag(YsShellVertexHandle vtHd,YSBOOL round)
 {
 	VertexAttrib *vtAttrib=GetVertexAttrib(vtHd);

diff --git a/src/ysgebl/src/kernel/ysshellext.h b/src/ysgebl/src/kernel/ysshellext.h
@@ -1243,6 +1243,12 @@ class YsShellExt : protected YsShell
 	/*! This function moves vertex. */
 	YSRESULT SetVertexPosition(VertexHandle VtHd,const YsVec3 &NewPos);
 
+	/*! Vertex normal is not undo/redo target. */
+	YSRESULT SetVertexNormal(VertexHandle vtHd,const YsVec3 &nom);
+
+	/*! Vertex normal is not undo/redo target. */
+	YsVec3 GetVertexNormal(VertexHandle vtHd) const;
+
 	/*! This function sets ROUND flag of the vertex. */
 	YSRESULT SetVertexRoundFlag(YsShellVertexHandle vtHd,YSBOOL round);
 

diff --git a/src/ysgebl/src/kernel/ysshellextio.cpp b/src/ysgebl/src/kernel/ysshellextio.cpp
@@ -2162,6 +2162,11 @@ YSRESULT YsShellExtPlyReader::ReadOneLine(YsShellExt &shl,YsString &str)
 			{
 				auto vtHd=shl.AddVertex(vtx);
 				state.vtHdList.push_back(vtHd);
+				if(true==nomSet)
+				{
+					state.vertexHasNormal=true;
+					shl.SetVertexNormal(vtHd,nom);
+				}
 				--state.nVtxLeft;
 			}
 			else
@@ -2261,6 +2266,18 @@ YSRESULT YsShellExtPlyReader::ReadOneLine(YsShellExt &shl,YsString &str)
 				}
 				plHd=shl.AddPolygon(plVtHd);
 
+
+				if(true==texCoordSet && plVtHd.size()*2<=texCoord.size())
+				{
+					YsArray <YsShell::TexCoordHandle> plTxHd;
+					for(size_t i=0; i+1<texCoord.size(); i+=2)
+					{
+						YsVec2 pos(texCoord[i],texCoord[i+1]);
+						plTxHd.push_back(shl.AddTexCoord(pos));
+						shl.SetPolygonTexCoord(plHd,plTxHd);
+					}
+				}
+
 				YsColor col;
 				col.SetIntRGBA(red,green,blue,alpha);
 				if(7==rgbSet)
@@ -2279,7 +2296,16 @@ YSRESULT YsShellExtPlyReader::ReadOneLine(YsShellExt &shl,YsString &str)
 }
 void YsShellExtPlyReader::EndRead(YsShellExt &shl)
 {
+	if(0<state.textureFileName.size())
+	{
+		shl.AddMetaData(YsString("TextureFile"),state.textureFileName);
+	}
+	if(true==state.vertexHasNormal)
+	{
+		shl.AddMetaData(YsString("VertexHasNormal"),YsString("1"));
+	}
 }
+
 YSRESULT YsShellExtPlyReader::ReadPly(YsShellExt &shl,YsTextInputStream &inStream,const ReadOption &option)
 {
 	YSRESULT res=YSOK;

diff --git a/src/ysgebl/src/kernel/ysshellextio.h b/src/ysgebl/src/kernel/ysshellextio.h
@@ -349,13 +349,16 @@ class YsShellExtPlyReader
 		YsString textureFileName;
 		YsArray <YsShell::VertexHandle> vtHdList;
 
+		bool vertexHasNormal=false;
+
 		void Initialize(void)
 		{
 			inHeader=true;
 			definingVertex=false;
 			definingPolygon=false;
 			nVtxLeft=0;
 			nFaceLeft=0;
+			vertexHasNormal=false;
 		}
 	};
 	class PlyOptions