|
|
@@ -1,5 +1,9 @@
|
|
|
#include "CmMesh.h"
|
|
|
#include "CmMeshRTTI.h"
|
|
|
+#include "CmMeshData.h"
|
|
|
+#include "CmVector2.h"
|
|
|
+#include "CmVector3.h"
|
|
|
+#include "CmDebug.h"
|
|
|
#include "CmHardwareBufferManager.h"
|
|
|
|
|
|
namespace CamelotEngine
|
|
|
@@ -19,11 +23,143 @@ namespace CamelotEngine
|
|
|
delete mIndexData;
|
|
|
}
|
|
|
|
|
|
- void Mesh::prepare(MeshDataPtr meshData)
|
|
|
+ void Mesh::setMeshData(MeshDataPtr meshData)
|
|
|
{
|
|
|
mMeshData = meshData;
|
|
|
}
|
|
|
|
|
|
+ MeshDataPtr Mesh::getMeshData()
|
|
|
+ {
|
|
|
+ MeshDataPtr meshData(new MeshData());
|
|
|
+
|
|
|
+ meshData->declaration = mVertexData->vertexDeclaration->clone();
|
|
|
+
|
|
|
+ for(UINT32 i = 0; i < mSubMeshes.size(); i++)
|
|
|
+ {
|
|
|
+ MeshData::SubMeshData subMesh;
|
|
|
+ subMesh.indexCount = mSubMeshes[i].indexCount;
|
|
|
+ subMesh.indexOffset = mSubMeshes[i].indexOffset;
|
|
|
+
|
|
|
+ meshData->subMeshes.push_back(subMesh);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(mIndexData)
|
|
|
+ {
|
|
|
+ meshData->indexCount = mIndexData->indexCount - mIndexData->indexStart;
|
|
|
+ meshData->index = new int[meshData->indexCount];
|
|
|
+
|
|
|
+ UINT16* idxData = static_cast<UINT16*>(mIndexData->indexBuffer->lock(HardwareBuffer::HBL_READ_ONLY));
|
|
|
+
|
|
|
+ for(UINT32 i = 0; i < mIndexData->indexCount; i++)
|
|
|
+ mMeshData->index[i] = (UINT32)idxData[i];
|
|
|
+
|
|
|
+ mIndexData->indexBuffer->unlock();
|
|
|
+ }
|
|
|
+
|
|
|
+ if(mVertexData)
|
|
|
+ {
|
|
|
+ meshData->vertexCount = mVertexData->vertexCount - mVertexData->vertexStart;
|
|
|
+
|
|
|
+ UINT16 maxBufferIdx = mVertexData->vertexBufferBinding->getLastBoundIndex();
|
|
|
+ for(UINT16 i = 0; i < maxBufferIdx; i++)
|
|
|
+ {
|
|
|
+ if(!mVertexData->vertexBufferBinding->isBufferBound(i))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ HardwareVertexBufferPtr vertexBuffer = mVertexData->vertexBufferBinding->getBuffer(i);
|
|
|
+ UINT32 vertexSize = vertexBuffer->getVertexSize();
|
|
|
+ UINT8* vertDataIter = static_cast<UINT8*>(vertexBuffer->lock(HardwareBuffer::HBL_READ_ONLY));
|
|
|
+
|
|
|
+ std::shared_ptr<MeshData::VertexData> vertexData(new MeshData::VertexData(meshData->vertexCount, i));
|
|
|
+ meshData->vertexBuffers[i] = vertexData;
|
|
|
+
|
|
|
+ UINT32 numElements = mVertexData->vertexDeclaration->getElementCount();
|
|
|
+ for(UINT32 j = 0; j < numElements; j++)
|
|
|
+ {
|
|
|
+ const VertexElement* element = mVertexData->vertexDeclaration->getElement(j);
|
|
|
+ VertexElementSemantic semantic = element->getSemantic();
|
|
|
+ UINT32 offset = element->getOffset();
|
|
|
+ UINT32 elemSize = element->getSize();
|
|
|
+
|
|
|
+ UINT8* dest = nullptr;
|
|
|
+ switch(semantic)
|
|
|
+ {
|
|
|
+ case VES_POSITION:
|
|
|
+ vertexData->vertex = new Vector3[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->vertex;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_DIFFUSE:
|
|
|
+ vertexData->color = new Color[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->color;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_NORMAL:
|
|
|
+ vertexData->normal = new Vector3[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->normal;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_TANGENT:
|
|
|
+ vertexData->tangent = new Vector3[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->tangent;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_BITANGENT:
|
|
|
+ vertexData->bitangent = new Vector3[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->bitangent;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_TEXTURE_COORDINATES:
|
|
|
+ if(element->getIndex() == 0)
|
|
|
+ {
|
|
|
+ vertexData->uv0 = new Vector2[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->uv0;
|
|
|
+ }
|
|
|
+ else if(element->getIndex() == 1)
|
|
|
+ {
|
|
|
+ vertexData->uv1 = new Vector2[mMeshData->vertexCount];
|
|
|
+ dest = (UINT8*)vertexData->uv1;
|
|
|
+ }
|
|
|
+
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ LOGWRN("Vertex declaration contains semantic (" + toString(semantic) + ") but mesh data can't store it.");
|
|
|
+
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(dest != nullptr)
|
|
|
+ {
|
|
|
+ for(UINT32 k = 0; k < mVertexData->vertexCount; k++)
|
|
|
+ memcpy(&dest[k * elemSize], &vertDataIter[k * vertexSize + offset], elemSize);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ vertexBuffer->unlock();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return nullptr;
|
|
|
+ }
|
|
|
+
|
|
|
+ RenderOperation Mesh::getRenderOperation(UINT32 subMeshIdx) const
|
|
|
+ {
|
|
|
+ if(subMeshIdx < 0 || subMeshIdx >= mSubMeshes.size())
|
|
|
+ {
|
|
|
+ CM_EXCEPT(InvalidParametersException, "Invalid sub-mesh index ("
|
|
|
+ + toString(subMeshIdx) + "). Number of sub-meshes available: " + toString(mSubMeshes.size()));
|
|
|
+ }
|
|
|
+
|
|
|
+ // TODO - BIG TODO - Completely ignores subMeshIdx and always renders the entire thing
|
|
|
+ RenderOperation ro;
|
|
|
+ ro.indexData = mIndexData;
|
|
|
+ ro.vertexData = mVertexData;
|
|
|
+ ro.useIndexes = true;
|
|
|
+ ro.operationType = RenderOperation::OT_TRIANGLE_LIST;
|
|
|
+
|
|
|
+ return ro;
|
|
|
+ }
|
|
|
+
|
|
|
void Mesh::loadImpl()
|
|
|
{
|
|
|
if(mMeshData == nullptr)
|
|
|
@@ -32,7 +168,7 @@ namespace CamelotEngine
|
|
|
}
|
|
|
|
|
|
// Submeshes
|
|
|
- for(int i = 0; i < mMeshData->subMeshes.size(); i++)
|
|
|
+ for(UINT32 i = 0; i < mMeshData->subMeshes.size(); i++)
|
|
|
mSubMeshes.push_back(SubMesh(mMeshData->subMeshes[i].indexOffset, mMeshData->subMeshes[i].indexCount));
|
|
|
|
|
|
// Indices
|
|
|
@@ -46,7 +182,7 @@ namespace CamelotEngine
|
|
|
|
|
|
UINT16* idxData = static_cast<UINT16*>(mIndexData->indexBuffer->lock(HardwareBuffer::HBL_NORMAL));
|
|
|
|
|
|
- for(int i = 0; i < mIndexData->indexCount; i++)
|
|
|
+ for(UINT32 i = 0; i < mIndexData->indexCount; i++)
|
|
|
{
|
|
|
idxData[i] = (UINT16)mMeshData->index[i];
|
|
|
}
|
|
|
@@ -59,105 +195,94 @@ namespace CamelotEngine
|
|
|
mVertexData->vertexStart = 0;
|
|
|
mVertexData->vertexCount = mMeshData->vertexCount;
|
|
|
|
|
|
-
|
|
|
- //mVertexData->vertexDeclaration = mMeshData->declaration.clone();
|
|
|
- //VertexDeclaration* decl = mVertexData->vertexDeclaration;
|
|
|
- //decl->removeAllElements();
|
|
|
-
|
|
|
- //size_t offset = 0;
|
|
|
- //decl->addElement(0, offset, VET_FLOAT3, VES_POSITION);
|
|
|
- //offset += VertexElement::getTypeSize(VET_FLOAT3);
|
|
|
- //decl->addElement(0, offset, VET_FLOAT2, VES_TEXTURE_COORDINATES);
|
|
|
- //offset += VertexElement::getTypeSize(VET_FLOAT2);
|
|
|
-
|
|
|
- //decl->addElement(0, offset, VET_COLOUR, VES_DIFFUSE);
|
|
|
- //offset += VertexElement::getTypeSize(VET_COLOUR);
|
|
|
-
|
|
|
- //HardwareVertexBufferPtr vertexBuffer = HardwareBufferManager::instance().createVertexBuffer(
|
|
|
- // mVertexData->vertexDeclaration->getVertexSize(0),
|
|
|
- // mVertexData->vertexCount,
|
|
|
- // HardwareBuffer::HBU_STATIC_WRITE_ONLY);
|
|
|
+ mVertexData->vertexDeclaration = mMeshData->declaration->clone();
|
|
|
|
|
|
- //mVertexData->vertexBufferBinding->setBinding(0, vertexBuffer);
|
|
|
-
|
|
|
- //size_t vertexSize = vertexBuffer->getVertexSize();
|
|
|
- //char* vertBufferData = static_cast<char*>(vertexBuffer->lock(HardwareBuffer::HBL_NORMAL));
|
|
|
-
|
|
|
- //size_t posSize = VertexElement::getTypeSize(VET_FLOAT3);
|
|
|
- //size_t uvSize = VertexElement::getTypeSize(VET_FLOAT2);
|
|
|
-
|
|
|
- //Vector3 position(-5.0f, -5.0f, -5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //Vector2 uv(0.0f, 0.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(-5.0f, 5.0f, -5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(0.0f, 1.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(5.0f, 5.0f, -5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(1.0f, 1.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(5.0f, -5.0f, -5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(1.0f, 0.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(-5.0f, -5.0f, 5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(0.0f, 0.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(5.0f, -5.0f, 5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(1.0f, 0.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(5.0f, 5.0f, 5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(1.0f, 1.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
-
|
|
|
- //position = Vector3(-5.0f, 5.0f, 5.0f);
|
|
|
- //memcpy(vertBufferData, &position, posSize);
|
|
|
- //vertBufferData += posSize;
|
|
|
-
|
|
|
- //uv = Vector2(0.0f, 1.0f);
|
|
|
- //memcpy(vertBufferData, &uv, uvSize);
|
|
|
- //vertBufferData += uvSize;
|
|
|
-
|
|
|
- //vertexBuffer->unlock();
|
|
|
+ for(auto iter = mMeshData->vertexBuffers.begin(); iter != mMeshData->vertexBuffers.end(); ++iter)
|
|
|
+ {
|
|
|
+ int streamIdx = iter->first;
|
|
|
+
|
|
|
+ HardwareVertexBufferPtr vertexBuffer = HardwareBufferManager::instance().createVertexBuffer(
|
|
|
+ mVertexData->vertexDeclaration->getVertexSize(streamIdx),
|
|
|
+ mVertexData->vertexCount,
|
|
|
+ HardwareBuffer::HBU_STATIC_WRITE_ONLY);
|
|
|
+
|
|
|
+ mVertexData->vertexBufferBinding->setBinding(streamIdx, vertexBuffer);
|
|
|
+
|
|
|
+ UINT32 vertexSize = vertexBuffer->getVertexSize();
|
|
|
+ UINT8* vertBufferData = static_cast<UINT8*>(vertexBuffer->lock(HardwareBuffer::HBL_NORMAL));
|
|
|
+
|
|
|
+ UINT32 numElements = mVertexData->vertexDeclaration->getElementCount();
|
|
|
+
|
|
|
+ for(UINT32 j = 0; j < numElements; j++)
|
|
|
+ {
|
|
|
+ const VertexElement* element = mVertexData->vertexDeclaration->getElement(j);
|
|
|
+ VertexElementSemantic semantic = element->getSemantic();
|
|
|
+ UINT32 offset = element->getOffset();
|
|
|
+ UINT32 elemSize = element->getSize();
|
|
|
+
|
|
|
+ std::shared_ptr<MeshData::VertexData> vertexData = mMeshData->vertexBuffers[streamIdx];
|
|
|
+
|
|
|
+ UINT8* source = nullptr;
|
|
|
+ switch(semantic)
|
|
|
+ {
|
|
|
+ case VES_POSITION:
|
|
|
+ if(vertexData->vertex)
|
|
|
+ source = (UINT8*)vertexData->vertex;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_DIFFUSE:
|
|
|
+ if(vertexData->color)
|
|
|
+ source = (UINT8*)vertexData->color;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_NORMAL:
|
|
|
+ if(vertexData->normal)
|
|
|
+ source = (UINT8*)vertexData->normal;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_TANGENT:
|
|
|
+ if(vertexData->tangent)
|
|
|
+ source = (UINT8*)vertexData->tangent;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_BITANGENT:
|
|
|
+ if(vertexData->bitangent)
|
|
|
+ source = (UINT8*)vertexData->bitangent;
|
|
|
+
|
|
|
+ break;
|
|
|
+ case VES_TEXTURE_COORDINATES:
|
|
|
+ if(element->getIndex() == 0)
|
|
|
+ {
|
|
|
+ if(vertexData->uv0)
|
|
|
+ source = (UINT8*)vertexData->uv0;
|
|
|
+ }
|
|
|
+ else if(element->getIndex() == 1)
|
|
|
+ {
|
|
|
+ if(vertexData->uv1)
|
|
|
+ source = (UINT8*)vertexData->uv1;
|
|
|
+ }
|
|
|
+
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(source != nullptr)
|
|
|
+ {
|
|
|
+ for(UINT32 k = 0; k < mVertexData->vertexCount; k++)
|
|
|
+ memcpy(&vertBufferData[k * vertexSize + offset], &source[k * elemSize], elemSize);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LOGWRN("Vertex declaration contains semantic (" + toString(semantic) + ") but mesh doesn't have data for it. Data for the semantic will be zeroed out.");
|
|
|
+
|
|
|
+ for(UINT32 k = 0; k < mVertexData->vertexCount; k++)
|
|
|
+ memset(&vertBufferData[k * vertexSize + offset], 0, elemSize);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ vertexBuffer->unlock();
|
|
|
+ }
|
|
|
|
|
|
mMeshData = nullptr;
|
|
|
}
|
Marko Pintera