Pārlūkot izejas kodu

Better names for some Mesh methods

Marko Pintera 11 gadi atpakaļ
vecāks
revīzija
0678fdcf36

+ 3 - 3
BansheeCore/Include/BsMesh.h

@@ -58,12 +58,12 @@ namespace BansheeEngine
 		/**
 		 * @copydoc MeshBase::getVertexData
 		 */
-		virtual SPtr<VertexData> _getVertexData() const;
+		virtual SPtr<VertexData> getVertexData() const;
 
 		/**
-		 * @copydoc MeshBase::getIndexData
+		 * @copydoc MeshBase::getIndexBuffer
 		 */
-		virtual SPtr<IndexBufferCore> _getIndexBuffer() const;
+		virtual SPtr<IndexBufferCore> getIndexBuffer() const;
 
 		/**
 		 * @brief	Returns a dummy mesh, containing just one triangle. Don't modify the returned mesh.

+ 4 - 4
BansheeCore/Include/BsMeshBase.h

@@ -97,14 +97,14 @@ namespace BansheeEngine
 		 *  
 		 * @note	Core thread only. Internal method.
 		 */
-		virtual SPtr<VertexData> _getVertexData() const = 0;
+		virtual SPtr<VertexData> getVertexData() const = 0;
 
 		/**
 		 * @brief	Get index data used for rendering.
 		 *  
 		 * @note	Core thread only. Internal method.
 		 */
-		virtual SPtr<IndexBufferCore> _getIndexBuffer() const = 0;
+		virtual SPtr<IndexBufferCore> getIndexBuffer() const = 0;
 
 		/**
 		 * @brief	Returns an offset into the vertex buffers that is returned
@@ -115,7 +115,7 @@ namespace BansheeEngine
 		 * 			
 		 *			Core thread only. Internal method.
 		 */
-		virtual UINT32 _getVertexOffset() const { return 0; }
+		virtual UINT32 getVertexOffset() const { return 0; }
 
 		/**
 		 * @brief	Returns an offset into the index buffer that is returned
@@ -126,7 +126,7 @@ namespace BansheeEngine
 		 * 			
 		 *			Core thread only. Internal method.
 		 */
-		virtual UINT32 _getIndexOffset() const { return 0; }
+		virtual UINT32 getIndexOffset() const { return 0; }
 
 		/**
 		 * @brief	Called whenever this mesh starts being used on the GPU.

+ 2 - 2
BansheeCore/Include/BsMeshHeap.h

@@ -167,12 +167,12 @@ namespace BansheeEngine
 		/**
 		 * @brief	Gets internal vertex data for all the meshes.
 		 */
-		SPtr<VertexData> _getVertexData() const;
+		SPtr<VertexData> getVertexData() const;
 
 		/**
 		 * @brief	Gets internal index data for all the meshes.
 		 */
-		SPtr<IndexBufferCore> _getIndexBuffer() const;
+		SPtr<IndexBufferCore> getIndexBuffer() const;
 
 		/**
 		 * @brief	Returns the offset in vertices from the start of the buffer

+ 2 - 2
BansheeCore/Include/BsTransientMesh.h

@@ -48,12 +48,12 @@ namespace BansheeEngine
 		/**
 		 * @copydoc MeshBase::getVertexOffset
 		 */
-		virtual UINT32 _getVertexOffset() const;
+		virtual UINT32 getVertexOffset() const;
 
 		 /**
 		 * @copydoc MeshBase::getIndexOffset
 		 */
-		virtual UINT32 _getIndexOffset() const;
+		virtual UINT32 getIndexOffset() const;
 
 		 /**
 		 * @copydoc MeshBase::notifyUsedOnGPU

+ 2 - 2
BansheeCore/Source/BsMesh.cpp

@@ -263,14 +263,14 @@ namespace BansheeEngine
 		return meshData;
 	}
 
-	std::shared_ptr<VertexData> Mesh::_getVertexData() const
+	std::shared_ptr<VertexData> Mesh::getVertexData() const
 	{
 		THROW_IF_NOT_CORE_THREAD;
 
 		return mVertexData;
 	}
 
-	SPtr<IndexBufferCore> Mesh::_getIndexBuffer() const
+	SPtr<IndexBufferCore> Mesh::getIndexBuffer() const
 	{
 		THROW_IF_NOT_CORE_THREAD;
 

+ 2 - 2
BansheeCore/Source/BsMeshHeap.cpp

@@ -531,12 +531,12 @@ namespace BansheeEngine
 		mFreeEventQueries.push(idx);
 	}
 
-	SPtr<VertexData> MeshHeap::_getVertexData() const
+	SPtr<VertexData> MeshHeap::getVertexData() const
 	{
 		return mVertexData;
 	}
 
-	SPtr<IndexBufferCore> MeshHeap::_getIndexBuffer() const
+	SPtr<IndexBufferCore> MeshHeap::getIndexBuffer() const
 	{
 		return mIndexBuffer;
 	}

+ 3 - 3
BansheeCore/Source/BsRenderer.cpp

@@ -97,7 +97,7 @@ namespace BansheeEngine
 		else
 			return;
 
-		std::shared_ptr<VertexData> vertexData = mesh->_getVertexData();
+		std::shared_ptr<VertexData> vertexData = mesh->getVertexData();
 
 		rs.setVertexDeclaration(vertexData->vertexDeclaration);
 		auto vertexBuffers = vertexData->getBuffers();
@@ -128,12 +128,12 @@ namespace BansheeEngine
 		SubMesh subMesh = meshProxy.subMesh;
 		rs.setDrawOperation(subMesh.drawOp);
 
-		SPtr<IndexBufferCore> indexBuffer = mesh->_getIndexBuffer();
+		SPtr<IndexBufferCore> indexBuffer = mesh->getIndexBuffer();
 
 		UINT32 indexCount = subMesh.indexCount;
 
 		rs.setIndexBuffer(indexBuffer);
-		rs.drawIndexed(subMesh.indexOffset + mesh->_getIndexOffset(), indexCount, mesh->_getVertexOffset(), vertexData->vertexCount);
+		rs.drawIndexed(subMesh.indexOffset + mesh->getIndexOffset(), indexCount, mesh->getVertexOffset(), vertexData->vertexCount);
 
 		mesh->_notifyUsedOnGPU();
 	}

+ 4 - 4
BansheeCore/Source/BsTransientMesh.cpp

@@ -33,20 +33,20 @@ namespace BansheeEngine
 
 	SPtr<VertexData> TransientMesh::_getVertexData() const
 	{
-		return mParentHeap->_getVertexData();
+		return mParentHeap->getVertexData();
 	}
 
 	SPtr<IndexBufferCore> TransientMesh::_getIndexBuffer() const
 	{
-		return mParentHeap->_getIndexBuffer();
+		return mParentHeap->getIndexBuffer();
 	}
 
-	UINT32 TransientMesh::_getVertexOffset() const
+	UINT32 TransientMesh::getVertexOffset() const
 	{
 		return mParentHeap->getVertexOffset(mId);
 	}
 
-	UINT32 TransientMesh::_getIndexOffset() const
+	UINT32 TransientMesh::getIndexOffset() const
 	{
 		return mParentHeap->getIndexOffset(mId);
 	}

+ 5 - 5
BansheeEditor/Source/BsGizmoManager.cpp

@@ -773,7 +773,7 @@ namespace BansheeEngine
 		else
 			return;
 
-		std::shared_ptr<VertexData> vertexData = mesh->_getVertexData();
+		std::shared_ptr<VertexData> vertexData = mesh->getVertexData();
 
 		rs.setVertexDeclaration(vertexData->vertexDeclaration);
 		auto vertexBuffers = vertexData->getBuffers();
@@ -781,7 +781,7 @@ namespace BansheeEngine
 		SPtr<VertexBufferCore> vertBuffers[1] = { vertexBuffers.begin()->second };
 		rs.setVertexBuffers(0, vertBuffers, 1);
 
-		SPtr<IndexBufferCore> indexBuffer = mesh->_getIndexBuffer();
+		SPtr<IndexBufferCore> indexBuffer = mesh->getIndexBuffer();
 		rs.setIndexBuffer(indexBuffer);
 
 		rs.setDrawOperation(DOT_TRIANGLE_LIST);
@@ -811,13 +811,13 @@ namespace BansheeEngine
 			{
 				Renderer::setPass(*mIconMaterial.proxy, passIdx);
 
-				UINT32 curIndexOffset = mesh->_getIndexOffset();
+				UINT32 curIndexOffset = mesh->getIndexOffset();
 				for (auto curRenderData : *renderData)
 				{
 					mIconMaterial.mTexture[passIdx].set(curRenderData.texture);
 					rs.bindGpuParams(GPT_FRAGMENT_PROGRAM, mIconMaterial.mFragParams[passIdx]);
 
-					rs.drawIndexed(curIndexOffset, curRenderData.count * 6, mesh->_getVertexOffset(), curRenderData.count * 4);
+					rs.drawIndexed(curIndexOffset, curRenderData.count * 6, mesh->getVertexOffset(), curRenderData.count * 4);
 					curIndexOffset += curRenderData.count * 6;
 				}
 			}
@@ -834,7 +834,7 @@ namespace BansheeEngine
 				mAlphaPickingMaterial.mTexture.set(curRenderData.texture);
 				rs.bindGpuParams(GPT_FRAGMENT_PROGRAM, mAlphaPickingMaterial.mFragParams);
 
-				rs.drawIndexed(curIndexOffset, curRenderData.count * 6, mesh->_getVertexOffset(), curRenderData.count * 4);
+				rs.drawIndexed(curIndexOffset, curRenderData.count * 6, mesh->getVertexOffset(), curRenderData.count * 4);
 				curIndexOffset += curRenderData.count * 6;
 
 			}